Update niri, add mpd

7 files changed, 49 insertions, 28 deletions

diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
new file mode 100644
index 0000000..7023345
--- /dev/null
+++ b/.config/mpd/mpd.conf
@@ -0,0 +1,21 @@
+music_directory    "nfs://lab.home.arpa/data/media/music"
+state_file         "~/.local/state/mpd/state"
+sticker_file       "~/.config/mpd/sticker.sql"
+
+database {
+  plugin "proxy"
+  host "lab.home.arpa"
+	keepalive "yes"
+}
+
+# audio_output {
+# 	type "pulse"
+# 	name "pulse"
+# }
+
+# music_directory "/mnt/music"
+#
+# database {
+# 	plugin "simple"
+# 	path "/home/natecox/.config/mpd/mpd.db"
+# }
diff --git a/.config/mpd/mpd.db b/.config/mpd/mpd.db
new file mode 100644
index 0000000..476646d
--- /dev/null
+++ b/.config/mpd/mpd.db
diff --git a/.config/mpd/sticker.sql b/.config/mpd/sticker.sql
new file mode 100644
index 0000000..259b4ce
--- /dev/null
+++ b/.config/mpd/sticker.sql
diff --git a/.config/niri/cfg/input.kdl b/.config/niri/cfg/input.kdl
index 721161c..6f4f041 100644
--- a/.config/niri/cfg/input.kdl
+++ b/.config/niri/cfg/input.kdl
@@ -8,7 +8,7 @@ input {
             // uncomment the line below and change the layout accordingly.
             layout "us,us"
 						variant "colemak_dh_iso,"
-						options "grp:win_space_toggle,lv3:ralt_alt,caps:swapescape"
+						options "grp:win_space_toggle,lv3:ralt_alt"
         }
         numlock // Enable numlock on startup
     }
diff --git a/.config/niri/cfg/keybinds.kdl b/.config/niri/cfg/keybinds.kdl
index 21563cd..2d16c3a 100644
--- a/.config/niri/cfg/keybinds.kdl
+++ b/.config/niri/cfg/keybinds.kdl
@@ -1,5 +1,4 @@
 binds {
-
     // ────────────── Keybindings ──────────────
     // https://github.com/YaLTeR/niri/wiki/Configuration:-Key-Bindings
 
@@ -35,6 +34,11 @@ binds {
     // ─── Window Movement and Focus ───
     Mod+Q                               { close-window; }
 
+		Mod+BracketLeft											{ consume-or-expel-window-left; }
+    Mod+BracketRight										{ consume-or-expel-window-right; }
+    Mod+Comma														{ consume-window-into-column; }
+    Mod+Period													{ expel-window-from-column; }
+
     Mod+Left                            { focus-column-left; }
     Mod+H                               { focus-column-left; }
     Mod+Right                           { focus-column-right; }
diff --git a/.config/niri/cfg/rules.kdl b/.config/niri/cfg/rules.kdl
index 825bac4..c533507 100644
--- a/.config/niri/cfg/rules.kdl
+++ b/.config/niri/cfg/rules.kdl
@@ -1,6 +1,3 @@
-workspace "web"
-workspace "term"
-
 window-rule {
 		open-maximized true
 		geometry-corner-radius 12
@@ -20,27 +17,6 @@ window-rule {
 	 open-focused false
 }
 
-window-rule {
-	match app-id="helium-browser"
-	open-on-workspace "web"
-}
-
-window-rule {
-	match app-id="kitty"
-	open-on-workspace "term"
-}
-
-window-rule {
-	match	app-id="foot"
-	open-on-workspace "term"
-}
-
-window-rule {
-    match app-id=r#"^org\.wezfurlong\.wezterm$"#
-    // default-column-width {}
-		open-on-workspace "term"
-}
-
 layer-rule {
 		match namespace="^noctalia-wallpaper*"
 		place-within-backdrop true
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c8e588d..a60ea79 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -12,7 +12,14 @@
   :config (which-key-mode))
 
 (use-package evil
-	:ensure t)
+	:ensure t
+	:config
+	(evil-mode))
+
+(use-package evil-commentary
+	:ensure t
+	:config
+	(evil-commentary-mode))
 
 (use-package vterm
 	:ensure t)
@@ -83,10 +90,22 @@
 (use-package magit
   :ensure t)
 
+(use-package yaml-mode
+	:ensure t
+	:mode ("\\.yaml" "\\.yml"))
+
+(use-package caddyfile-mode
+	:ensure t)
+
 (use-package rust-mode
   :ensure t
   :hook (rust-mode . eglot-ensure))
 
+(use-package zig-mode
+	:ensure t
+	:mode ("\\.zig")
+	:hook (zig-mode . eglot-ensure))
+
 (use-package hl-line-mode
   ;; use the builtin current-line highlighter
   :hook ((prog-mode) (text-mode) (org-agenda-mode)))
@@ -131,12 +150,13 @@
 
   :custom
   (use-short-answers t)
-  (dired-listing-switches "-AL --group-directories-first")
   (tab-width 2)
   (custom-file (concat user-emacs-directory "custom.el"))
   (display-line-numbers 'relative)
+	(dired-listing-switches "-al --group-directories-first")
 	(backup-directory-alist '(("." . "~/.emacs.d/backups")))
 	(auto-save-default nil)
+	(inhibit-startup-screen t)
 
   :config
   (when (file-exists-p custom-file)