Add neovim as submodule

.bashrc

@@ -0,0 +1,23 @@
+# /etc/skel/.bashrc
+#
+# This file is sourced by all *interactive* bash shells on startup,
+# including some apparently interactive shells such as scp and rcp
+# that can't tolerate any output.  So make sure this doesn't display
+# anything or bad things will happen !
+
+
+# Test for an interactive shell.  There is no need to set anything
+# past this point for scp and rcp, and it's important to refrain from
+# outputting anything in those cases.
+if [[ $- != *i* ]] ; then
+	# Shell is non-interactive.  Be done now!
+	return
+fi
+
+
+# Put your fun stuff here.
+
+# https://wiki.gentoo.org/wiki/Fish#fish_as_a_default_shell_with_bash_as_the_login_shell
+# Use fish in place of bash
+# keep this line at the bottom of ~/.bashrc
+[ -x /bin/fish ] && SHELL=/bin/fish exec fish

.config/kitty/kitty.conf

@@ -6,12 +6,6 @@ bold_italic_font Iosevka Term SS15 Bold Italic
 
 font_size 14
 
-symbol_map U+23FB-U+23FE,U+2B58,U+E200-U+E2A9,U+E0A0-U+E0A3,U+E0B0-U+E0BF,U+E0C0-U+E0C8,U+E0CC-U+E0CF,U+E0D0-U+E0D2,U+E0D4,U+E700-U+E7C5,U+F000-U+F2E0,U+2665,U+26A1,U+F400-U+F4A8,U+F67C,U+E000-U+E00A,U+F300-U+F313,U+E5FA-U+E62B Symbols Nerd Font Mono
-
-# Performance
-
-sync_to_monitor yes
-
 # shell stuff
 shell_integration enabled
 

.config/kitty/open-actions.conf

@@ -7,3 +7,14 @@ action launch --type=overlay kitty +kitten icat --hold ${FILE_PATH}
 protocol file
 mime inode/directory
 action launch --type=os-window --cwd $FILE_PATH
+
+# Open any file with a fragment in vim, fragments are generated
+# by the hyperlink_grep kitten and nothing else so far.
+protocol file
+fragment_matches [0-9]+
+action launch --type=overlay --cwd=current nvim +${FRAGMENT} ${FILE_PATH}
+
+# Open text files without fragments in the editor
+protocol file
+mime text/*
+action launch --type=overlay --cwd=current ${EDITOR} ${FILE_PATH}

.config/nvim

@@ -0,0 +1 @@
+Subproject commit 2c98923861d2954c646f764bf68a56c408c32d2e

.config/sway/conf.d/keybinds

@@ -5,7 +5,7 @@ set $left h
 set $down j
 set $up k
 set $right l
-set $term kitty -1
+set $term kitty -1 /bin/fish
 set $menu fuzzel
 
 # my keybinds

.config/waybar/style.css

@@ -54,6 +54,7 @@ window#waybar {
 
 #clock {
   color: @foreground;
+  font-weight: bold;
 }
 
 #battery {

.config/waybar/sway-modules.json

@@ -1,72 +1,97 @@
 {
-  "sway/workspaces": {
-    "show_special": true,
-    "on-click": "activate"
-  },
-  "sway/window": {
-    "max-length": 50
-  },
-  "tray": {
-    "spacing": 10
-  },
-  "cpu": {
-    "format": " {load}",
-    "format-alt": " {usage}% @ {avg_frequency}GHz"
-  },
-  "memory": {
-    "format": "󰍛 {used:0.1f}G / {total:0.1f}G",
-    "format-alt": "󰓡 Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G"
-  },
-  "network": {
-    "format-wifi": " {essid} ({signalStrength}%)",
-    "format-ethernet": "󰈀 {ifname}",
-    "format-linked": " {ifname}",
-    "format-disconnected": "󰌙 Disconnected",
-    "format-alt": "󰩟 {ifname}: {ipaddr}/{cidr}",
-    "tooltip-format": "{ifname} via {gwaddr}"
-  },
-  "battery": {
-    "states": {
-      "good": 75,
-      "warning": 15,
-      "critical": 5
-    },
-    "format": "{icon} {capacity}%",
-    "format-charging": "󰉁 {capacity}%",
-    "format-plugged": " {capacity}%",
-    "format-alt": "{icon} ETA: {time}",
-    "format-icons": ["", "", "", "", ""]
-  },
-  "clock": {
-    "format": "{:󰅐 %H:%M   %m-%d}",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-  },
-  "custom/notification": {
-    "tooltip": true,
-    "format": "{icon}",
-    "format-icons": {
-      "notification": " <span foreground='red'><sup></sup></span> <span weight=\"bold\">Unread</span>",
-      "none": "  <span style=\"italic\">Empty</span>",
-      "dnd-notification": "  <span style=\"italic\">DND on</span>",
-      "dnd-none": "  <span style=\"italic\">DND on</span>"
-    },
-    "return-type": "json",
-    "exec-if": "which swaync-client",
-    "exec": "swaync-client -swb",
-    "on-click": "swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "escape": true
-  },
-  "custom/player": {
-    "format": "{icon} <span style=\"italic\">{}</span>",
-    "format-icons": {
-      "Playing": "󰎈 ",
-      "Paused": "󰏤 "
-    },
-    "return-type": "json",
-    "exec": "playerctl -a metadata --format '{\"text\": \"{{playerName}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(title)}} - {{markup_escape(album)}}\", \"class\": \"{{status}}\", \"alt\": \"{{status}}\" }' -F",
-    "max-length": 40,
-    "on-click": "playerctl play-pause",
-    "on-click-right": "pavucontrol"
-  }
+	"sway/workspaces": {
+		"show_special": true,
+		"on-click": "activate"
+	},
+	"sway/window": {
+		"max-length": 50
+	},
+	"tray": {
+		"spacing": 10
+	},
+	"cpu": {
+		"format": " {load}",
+		"format-alt": " {usage}% @ {avg_frequency}GHz"
+	},
+	"memory": {
+		"format": "󰍛 {used:0.1f} / {total:0.1f}G",
+		"format-alt": "󰓡 Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G"
+	},
+	"network": {
+		"format-wifi": " {essid} ({signalStrength}%)",
+		"format-ethernet": "󰈀 {ifname}",
+		"format-linked": " {ifname}",
+		"format-disconnected": "󰌙 Disconnected",
+		"format-alt": "󰩟 {ifname}: {ipaddr}/{cidr}",
+		"tooltip-format": "{ifname} via {gwaddr}"
+	},
+	"battery": {
+		"states": {
+			"good": 75,
+			"warning": 15,
+			"critical": 5
+		},
+		"format": "{icon} {capacity}%",
+		"format-charging": "󰉁 {capacity}%",
+		"format-plugged": " {capacity}%",
+		"format-alt": "{icon} ETA: {time}",
+		"format-icons": [
+			"",
+			"",
+			"",
+			"",
+			""
+		]
+	},
+	"clock": {
+		"format": "{:󰅐 %H:%M}",
+		"format-alt": "{: %m-%d}",
+		"tooltip-format": "<tt><small>{calendar}</small></tt>",
+		"calendar": {
+			"mode": "year",
+			"mode-mon-col": 3,
+			"on-scroll": 1,
+			"on-click-right": "mode",
+			"format": {
+				"months": "<span color='#98971a'><b>{}</b></span>",
+				"days": "<span color='#ebdbb2'><b>{}</b></span>",
+				"weeks": "<span color='#458588'><b>W{}</b></span>",
+				"weekdays": "<span color='#d79921'><b>{}</b></span>",
+				"today": "<span color='#d65d0e'><b><u>{}</u></b></span>"
+			}
+		},
+		"actions": {
+			"on-click-right": "mode",
+			"on-scroll-down": "shift_up",
+			"on-scroll-up": "shift_down"
+		}
+	},
+	"custom/notification": {
+		"tooltip": true,
+		"format": "{icon}",
+		"format-icons": {
+			"notification": " <span foreground='red'><sup></sup></span> <span weight=\"bold\">Unread</span>",
+			"none": "  <span style=\"italic\">Empty</span>",
+			"dnd-notification": "  <span style=\"italic\">DND on</span>",
+			"dnd-none": "  <span style=\"italic\">DND on</span>"
+		},
+		"return-type": "json",
+		"exec-if": "which swaync-client",
+		"exec": "swaync-client -swb",
+		"on-click": "swaync-client -t -sw",
+		"on-click-right": "swaync-client -d -sw",
+		"escape": true
+	},
+	"custom/player": {
+		"format": "{icon} <span style=\"italic\">{}</span>",
+		"format-icons": {
+			"Playing": "󰎈 ",
+			"Paused": "󰏤 "
+		},
+		"return-type": "json",
+		"exec": "playerctl -a metadata --format '{\"text\": \"{{playerName}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{markup_escape(title)}} - {{markup_escape(album)}}\", \"class\": \"{{status}}\", \"alt\": \"{{status}}\" }' -F",
+		"max-length": 40,
+		"on-click": "playerctl play-pause",
+		"on-click-right": "pavucontrol"
+	}
 }

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".config/nvim"]
+	path = .config/nvim
+	url = git@github.com:rywng/config.nvim.git

.zshrc

@@ -42,9 +42,8 @@ if  ! command -v bat &> /dev/null ; then
 	zinit light sharkdp/bat
 fi
 
-zinit as"program" make'!' atclone'./direnv hook zsh > zhook.zsh' \
-    atpull'%atclone' pick"direnv" src"zhook.zsh" for \
-        direnv/direnv
+zinit ice from"gh-r" as"program" mv"direnv* -> direnv"
+zinit light direnv/direnv
 
 autoload -Uz _zinit
 (( ${+_comps} )) && _comps[zinit]=_zinit