From c02131de93a6ee30c4efad68a618e5fca025f490 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 8 Sep 2026 23:17:09 +0200 Subject: [PATCH 001/100] Really fix wallpaper path passed to swaybg --- ruysch-graphical.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 32d7af2..b267899 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -36,7 +36,7 @@ etc = { "niri/config.kdl".text = '' spawn-at-startup "${pkgs.swaybg}/bin/swaybg" "--image" \ - "~/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies" + "/home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies" spawn-at-startup "${pkgs.ironbar}/bin/ironbar" spawn-at-startup "${pkgs.wl-gammarelay-rs}/bin/wl-gammarelay-rs" spawn-at-startup "${pkgs.swayidle}/bin/swayidle" "timeout" "600" \ From 6c18caeb4316a928074c60769b35841fdd2eb138 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 9 Sep 2026 10:32:45 +0200 Subject: [PATCH 002/100] Fix Hyprlock wallpaper path & disable keyboard layout indicator for now --- graphical.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/graphical.nix b/graphical.nix index 337a9bd..4a8d738 100644 --- a/graphical.nix +++ b/graphical.nix @@ -72,7 +72,7 @@ etc."xdg/hypr/hyprlock.conf".text = '' background { - path = /etc/nixos/assets/wallpaper-macos-swirlies + path = /home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies blur_passes = 4 blur_size = 4 contrast = 1.0 @@ -120,13 +120,13 @@ # Keyboard layout indicator. # TODO: Why does this not work anymore? - label { - halign = center - valign = center - position = 0, -600 + # label { + # halign = center + # valign = center + # position = 0, -600 - text = $LAYOUT[!,Keyboard layout: български,Keyboard layout: Ελληνικά] - } + # text = $LAYOUT[!,Keyboard layout: български,Keyboard layout: Ελληνικά] + # } ''; }; } From bcd5dd8708aca97bd432c8b3826a0e22aa07c840 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 10 Sep 2026 10:22:21 +0200 Subject: [PATCH 003/100] Make Signal window 75% width --- ruysch-graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index b267899..173a54e 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -223,6 +223,7 @@ window-rule { match app-id="firefox" is-floating=false match app-id="jetbrains-rustrover" is-floating=false + match app-id="signal" is-floating=false match app-id="spotify" is-floating=false match app-id="sublime_merge" is-floating=false From 83d396e212e08539768be45f69e5da9c3d3bbbf8 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 10 Sep 2026 10:25:04 +0200 Subject: [PATCH 004/100] Update nixpkgs & nixpkgs-unstable --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d638034..3ae1b56 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1788807765, - "narHash": "sha256-J9oC0bKnkXUrMegqRTXVkyDFJ0gn2U/Qpoo9HgGMQmA=", + "lastModified": 1788921488, + "narHash": "sha256-8+xWRxEkD6l217cIUdRxfeUGS9lQX0hVtUuNVsBaDzk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "93108a538f079596c9a16c72cf03e9322782b6dd", + "rev": "6aefcda9401be8acc2b74244fb3b37520ea1f0a8", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1788752844, - "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=", + "lastModified": 1788881743, + "narHash": "sha256-2V9GZGvPfrNzxFozhI9dcqV+c3QdA8YZrvAAzqEB+dI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc5d91f840324650bac8c379428c7037a416959a", + "rev": "d6524aaca2ff07876657ae2b323f24be4874944b", "type": "github" }, "original": { From 3a98c2efed9d082ae696c3fbc7042cf4ffd1c760 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 10 Sep 2026 17:30:08 +0200 Subject: [PATCH 005/100] Imply stable pkgs for systemPackages in ruysch-graphical by default --- ruysch-graphical.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 173a54e..4bd00f8 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -2,12 +2,12 @@ { environment = { - systemPackages = [ + systemPackages = with pkgs; [ + cartero + darktable + loupe + signal-desktop pkgs-unstable.jetbrains.rust-rover - pkgs.cartero - pkgs.darktable - pkgs.loupe - pkgs.signal-desktop ]; persistence = { From d27602e67bd4f20ec7b9dd24f8d8c8e68cc2fa24 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 10 Sep 2026 17:30:45 +0200 Subject: [PATCH 006/100] Add dconf-editor as dconf GUI --- graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/graphical.nix b/graphical.nix index 4a8d738..7f7152c 100644 --- a/graphical.nix +++ b/graphical.nix @@ -5,6 +5,7 @@ environment.systemPackages = with pkgs; [ adwaita-icon-theme + dconf-editor overskride spotify sublime-merge From 0ff8ec3488187878d3fec87ef0e717f7c5a66df4 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 10 Sep 2026 17:31:48 +0200 Subject: [PATCH 007/100] Set GTK accent colour & Nautilus dir views in dconf --- graphical.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graphical.nix b/graphical.nix index 7f7152c..439e8ee 100644 --- a/graphical.nix +++ b/graphical.nix @@ -28,7 +28,11 @@ font-name = "Fira Sans Condensed 11"; monospace-font-name = "Fira Mono 10"; }; + "org/gnome/desktop/interface".accent-color = "purple"; "org/gnome/desktop/wm/preferences".button-layout = ""; + "org/gnome/nautilus/icon-view".default-zoom-level = "large"; + "org/gnome/nautilus/list-view".default-zoom-level = "small"; + "org/gnome/nautilus/preferences".default-folder-viewer = "list-view"; "org/gnome/terminal/legacy".default-show-menubar = false; }; } ]; From 5a26c04d687cfc22b8adfd884170700a62006fb3 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 14 Sep 2026 11:25:27 +0200 Subject: [PATCH 008/100] Map side buttons to middle click on Logitech MX Vertical --- ruysch-graphical.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 4bd00f8..03c5177 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -284,4 +284,16 @@ ''; }; }; + + services.evdevremapkeys = { + enable = true; + settings.devices = [ { + input_name = "Logitech MX Vertical"; + output_name = "mx-vertical-remapped"; + remappings = { + BTN_EXTRA = [ "BTN_MIDDLE" ]; + BTN_SIDE = [ "BTN_MIDDLE" ]; + }; + } ]; + }; } From e05bf512e8c81e3787fa3792881f38bcf5c7fd14 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 14 Sep 2026 11:31:11 +0200 Subject: [PATCH 009/100] Update nixpkgs, nixpkgs-unstable, nix-index-database --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3ae1b56..d7ba55a 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1788680125, - "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=", + "lastModified": 1789286446, + "narHash": "sha256-xVstyCdg0DpzjyrEacm72VJAIP9DMhfWJdPDzhWxHuo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "116ad1c2adb642405ef8916f6a94c8626f971344", + "rev": "a74e173407559083a412ea89a1cc58ea389c3b65", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1788921488, - "narHash": "sha256-8+xWRxEkD6l217cIUdRxfeUGS9lQX0hVtUuNVsBaDzk=", + "lastModified": 1789114715, + "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6aefcda9401be8acc2b74244fb3b37520ea1f0a8", + "rev": "21a67dc470149f337cecafbe965d8d252a390518", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1788881743, - "narHash": "sha256-2V9GZGvPfrNzxFozhI9dcqV+c3QdA8YZrvAAzqEB+dI=", + "lastModified": 1789149629, + "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6524aaca2ff07876657ae2b323f24be4874944b", + "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", "type": "github" }, "original": { From b5e31cf1939027de418cc1acc9866ef30bb1d170 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 15 Sep 2026 14:13:23 +0200 Subject: [PATCH 010/100] Add Python 3 to Ruysch system packages --- ruysch.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ruysch.nix b/ruysch.nix index 917f1dd..414ffdc 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -114,6 +114,7 @@ systemPackages = with pkgs; [ claude-code minio-client + python3 ]; persistence."/mnt/persistent-data".directories = [ From f65c2be5ead26f19c00bd84f4f8e31af9e60cbb2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 15 Sep 2026 14:22:53 +0200 Subject: [PATCH 011/100] Update nixpkgs & nixpkgs-unstable --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d7ba55a..205f2cf 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1789114715, - "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", + "lastModified": 1789344334, + "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21a67dc470149f337cecafbe965d8d252a390518", + "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789149629, - "narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=", + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "type": "github" }, "original": { From c9863fe93d0ea9000dfb0abe8f90fa261dc4adce Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 15 Sep 2026 15:40:21 +0200 Subject: [PATCH 012/100] Extract binaries used in Niri & NWG Bar into variables --- ruysch-graphical.nix | 122 +++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 56 deletions(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 03c5177..a66404d 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -33,14 +33,34 @@ ]; }; - etc = { + etc = let + bluetoothctl = "${pkgs.bluez}/bin/bluetoothctl"; + brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl"; + busctl = "${pkgs.systemd}/bin/busctl"; + emote = "${pkgs.emote}/bin/emote"; + firefox = "${pkgs.firefox}/bin/firefox"; + gnome-terminal = "${pkgs.gnome-terminal}/bin/gnome-terminal"; + hyprlock = "${pkgs.hyprlock}/bin/hyprlock"; + ironbar = "${pkgs.ironbar}/bin/ironbar"; + loginctl = "${pkgs.systemd}/bin/loginctl"; + nautilus = "${pkgs.nautilus}/bin/nautilus"; + nmcli = "${pkgs.networkmanager}/bin/nmcli"; + nwg-bar = "${pkgs.nwg-bar}/bin/nwg-bar"; + pactl = "${pkgs.pulseaudio}/bin/pactl"; + playerctl = "${pkgs.playerctl}/bin/playerctl"; + rofi = "${pkgs.rofi}/bin/rofi"; + swaybg = "${pkgs.swaybg}/bin/swaybg"; + swayidle = "${pkgs.swayidle}/bin/swayidle"; + systemctl = "${pkgs.systemd}/bin/systemctl"; + wl-gammarelay-rs = "${pkgs.wl-gammarelay-rs}/bin/wl-gammarelay-rs"; + wlr-randr = "${pkgs.wlr-randr}/bin/wlr-randr"; + in { "niri/config.kdl".text = '' - spawn-at-startup "${pkgs.swaybg}/bin/swaybg" "--image" \ + spawn-at-startup "${swaybg}" "--image" \ "/home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies" - spawn-at-startup "${pkgs.ironbar}/bin/ironbar" - spawn-at-startup "${pkgs.wl-gammarelay-rs}/bin/wl-gammarelay-rs" - spawn-at-startup "${pkgs.swayidle}/bin/swayidle" "timeout" "600" \ - "${pkgs.hyprlock}/bin/hyprlock" + spawn-at-startup "${ironbar}" + spawn-at-startup "${wl-gammarelay-rs}" + spawn-at-startup "${swayidle}" "timeout" "600" "${hyprlock}" @@ -97,71 +117,67 @@ binds { Super+Q { close-window; } - Super+W { spawn "${pkgs.rofi}/bin/rofi" "-show" "drun"; } - Super+E { spawn "${pkgs.gnome-terminal}/bin/gnome-terminal"; } - Super+R { spawn "${pkgs.nautilus}/bin/nautilus"; } + Super+W { spawn "${rofi}" "-show" "drun"; } + Super+E { spawn "${gnome-terminal}"; } + Super+R { spawn "${nautilus}"; } - Super+T { spawn "${pkgs.firefox}/bin/firefox"; } - Super+Shift+T { spawn "${pkgs.firefox}/bin/firefox" "--private-window"; } + Super+T { spawn "${firefox}"; } + Super+Shift+T { spawn "${firefox}" "--private-window"; } Super+A { center-column; } Super+S { switch-preset-column-width; } Super+D { toggle-window-floating; } Super+U allow-when-locked=true { - spawn "${pkgs.pulseaudio}/bin/pactl" "set-sink-volume" "@DEFAULT_SINK@" "-2%" + spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" } Super+I allow-when-locked=true { - spawn "${pkgs.pulseaudio}/bin/pactl" "set-sink-volume" "@DEFAULT_SINK@" "+2%" + spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "+2%" } Super+Shift+I allow-when-locked=true { - spawn "${pkgs.pulseaudio}/bin/pactl" "set-sink-volume" "@DEFAULT_SINK@" "100%" + spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "100%" } Super+O allow-when-locked=true { - spawn "${pkgs.pulseaudio}/bin/pactl" "set-sink-mute" "@DEFAULT_SINK@" "toggle" + spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" } - Super+P allow-when-locked=true { - spawn "${pkgs.wlr-randr}/bin/wlr-randr" "--output" "eDP-1" "--toggle" - } + Super+P allow-when-locked=true { spawn "${wlr-randr}" "--output" "eDP-1" "--toggle"; } // TODO: Replace with toggle script. - Super+H { spawn "${pkgs.networkmanager}/bin/nmcli" "connection" "up" "airvpn-serbia"; } - Super+Shift+H { - spawn "${pkgs.networkmanager}/bin/nmcli" "connection" "down" "airvpn-serbia" - } + Super+H { spawn "${nmcli}" "connection" "up" "airvpn-serbia"; } + Super+Shift+H { spawn "${nmcli}" "connection" "down" "airvpn-serbia"; } - Super+J { spawn "${pkgs.emote}/bin/emote"; } + Super+J { spawn "${emote}"; } // TODO: Put this in linux-utils as Nix package. // Super+K allow-when-locked=true { spawn "wl-gammarelay-toggle-temperature"; } Super+K allow-when-locked=true { - spawn "${pkgs.systemd}/bin/busctl" "--user" "set-property" "rs.wl-gammarelay" "/" \ - "rs.wl.gammarelay" "Temperature" "q" "4500" + spawn "${busctl}" "--user" "set-property" "rs.wl-gammarelay" "/" "rs.wl.gammarelay" \ + "Temperature" "q" "4500" } Super+Shift+K allow-when-locked=true { - spawn "${pkgs.systemd}/bin/busctl" "--user" "set-property" "rs.wl-gammarelay" "/" \ - "rs.wl.gammarelay" "Temperature" "q" "6500" + spawn "${busctl}" "--user" "set-property" "rs.wl-gammarelay" "/" "rs.wl.gammarelay" \ + "Temperature" "q" "6500" } // TODO: Set up session-based locking like on Arch. - // Super+L { spawn "${pkgs.systemd}/bin/loginctl" "lock-session"; } - Super+L { spawn "${pkgs.hyprlock}/bin/hyprlock"; } + // Super+L { spawn "${loginctl}" "lock-session"; } + Super+L { spawn "${hyprlock}"; } // I.e. the Non-Screeching Earwarmers. - Super+B { spawn "${pkgs.bluez}/bin/bluetoothctl" "connect" "58:18:62:1F:E3:33"; } - Super+Shift+B { spawn "${pkgs.bluez}/bin/bluetoothctl" "disconnect" "58:18:62:1F:E3:33"; } + Super+B { spawn "${bluetoothctl}" "connect" "58:18:62:1F:E3:33"; } + Super+Shift+B { spawn "${bluetoothctl}" "disconnect" "58:18:62:1F:E3:33"; } - Super+M { spawn "${pkgs.playerctl}/bin/playerctl" "play-pause"; } - Super+Comma { spawn "${pkgs.playerctl}/bin/playerctl" "previous"; } - Super+Period { spawn "${pkgs.playerctl}/bin/playerctl" "next"; } + Super+M { spawn "${playerctl}" "play-pause"; } + Super+Comma { spawn "${playerctl}" "previous"; } + Super+Period { spawn "${playerctl}" "next"; } - // TODO: Turn in to Nix package. + // TODO: Turn into Nix package. // Super+BracketLeft allow-when-locked=true { spawn "ddc-brightness" "down"; } // Super+BracketRight allow-when-locked=true { spawn "ddc-brightness" "up"; } // Super+Shift+BracketRight allow-when-locked=true { spawn "ddc-brightness" "max"; } Super+Tab { toggle-overview; } Super+Space { switch-layout "next"; } - Super+Escape { spawn "${pkgs.nwg-bar}/bin/nwg-bar"; } + Super+Escape { spawn "${nwg-bar}"; } Super+F11 { fullscreen-window; } Super+Left { focus-column-left; } @@ -192,30 +208,24 @@ // TODO: Add back rectangle screenshot selection. Print { screenshot; } Super+Print { screenshot-window; } + + // Special function keys. - XF86MonBrightnessDown allow-when-locked=true { - spawn "${pkgs.brightnessctl}/bin/brightnessctl" "set" "10%-" - } - XF86MonBrightnessUp allow-when-locked=true { - spawn "${pkgs.brightnessctl}/bin/brightnessctl" "set" "+10%" - } + XF86MonBrightnessDown allow-when-locked=true { spawn "${brightnessctl}" "set" "10%-"; } + XF86MonBrightnessUp allow-when-locked=true { spawn "${brightnessctl}" "set" "+10%"; } XF86AudioLowerVolume allow-when-locked=true { - spawn "${pkgs.pulseaudio}/bin/pactl" "set-sink-volume" "@DEFAULT_SINK@" "-2%" + spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" } XF86AudioRaiseVolume allow-when-locked=true { - spawn "${pkgs.pulseaudio}/bin/pactl" "set-sink-volume" "@DEFAULT_SINK@" "+2%" + spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "+2%" } XF86AudioMute allow-when-locked=true { - spawn "${pkgs.pulseaudio}/bin/pactl" "set-sink-mute" "@DEFAULT_SINK@" "toggle" + spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" } - XF86AudioPlay allow-when-locked=true { - spawn "${pkgs.playerctl}/bin/playerctl" "play-pause" - } - XF86AudioPause allow-when-locked=true { - spawn "${pkgs.playerctl}/bin/playerctl" "play-pause" - } + XF86AudioPlay allow-when-locked=true { spawn "${playerctl}" "play-pause"; } + XF86AudioPause allow-when-locked=true { spawn "${playerctl}" "play-pause"; } } @@ -240,7 +250,7 @@ "nwg-bar/bar.json".text = '' [ { "label": "_Lock", - "exec": "${pkgs.systemd}/bin/loginctl lock-session", + "exec": "${loginctl} lock-session", "icon": "/usr/local/share/icons/kernelmaft/scalable/system-lock-screen-symbolic.svg" }, { "label": "Log out", @@ -248,19 +258,19 @@ "icon": "/usr/local/share/icons/kernelmaft/scalable/system-log-out-symbolic.svg" }, { "label": "_Suspend", - "exec": "${pkgs.systemd}/bin/systemctl suspend", + "exec": "${systemctl} suspend", "icon": "/usr/local/share/icons/kernelmaft/scalable/system-suspend-symbolic.svg" }, { "label": "_Hibernate", - "exec": "${pkgs.systemd}/bin/systemctl hibernate", + "exec": "${systemctl} hibernate", "icon": "/usr/local/share/icons/kernelmaft/scalable/system-suspend-symbolic.svg" }, { "label": "Shut down", - "exec": "${pkgs.systemd}/bin/systemctl poweroff", + "exec": "${systemctl} poweroff", "icon": "/usr/local/share/icons/kernelmaft/scalable/system-shutdown-symbolic.svg" }, { "label": "Reboot", - "exec": "${pkgs.systemd}/bin/systemctl reboot", + "exec": "${systemctl} reboot", "icon": "/usr/local/share/icons/kernelmaft/scalable/system-restart-symbolic.svg" } ] ''; From 9e0be3decdc5259fa278620d6b84e1083187aa96 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 15 Sep 2026 17:42:21 +0200 Subject: [PATCH 013/100] Un-float settings & add shadow to floating RustRover windows --- ruysch-graphical.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index a66404d..6a3f89a 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -230,6 +230,8 @@ + // 75% width windows. + window-rule { match app-id="firefox" is-floating=false match app-id="jetbrains-rustrover" is-floating=false @@ -240,11 +242,35 @@ default-column-width { proportion 0.75; } } + // Un-floated windows. + + window-rule { + match app-id="jetbrains-rustrover" title="^Settings – " + + open-floating false + } + + // Windows with clipped off shadows. + window-rule { match app-id="jetbrains-rustrover" is-floating=false clip-to-geometry true } + + // Floating windows with added shadow. + + window-rule { + match app-id="jetbrains-rustrover" is-floating=true + + shadow { + on + color "#0004" + softness 30 + spread 0 + offset x=0 y=0 + } + } ''; "nwg-bar/bar.json".text = '' From 7ef9085efdc731e1ec2d7d07e763a9179136bca1 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 16 Sep 2026 22:47:10 +0200 Subject: [PATCH 014/100] Update nixpkgs & nixpkgs-unstable --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 205f2cf..089da38 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1789344334, - "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", + "lastModified": 1789459628, + "narHash": "sha256-JOaadoI/IC9qEvwlnjwAhwdcWkCDqEeOJ+cOtUH/8RQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", + "rev": "b67c7a60c3732edd4b947a7df8af06215851a614", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789286504, - "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", + "lastModified": 1789546076, + "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "github" }, "original": { From 126f617be43e932dccd3a7d9774585990410e3db Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 17 Sep 2026 12:17:36 +0200 Subject: [PATCH 015/100] Vim: recognise Sublime configs as JSONC, allow trailing commas in JSONC --- common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common.nix b/common.nix index 276ec88..78d2977 100644 --- a/common.nix +++ b/common.nix @@ -116,6 +116,11 @@ " history file. let g:netrw_home = '$XDG_STATE_HOME/vim' + " Sublime settings files can have comments. + autocmd BufNewFile,BufRead *.sublime-settings set filetype=jsonc + " Most software that reads JSON with comments also accepts trailing commas. + autocmd FileType jsonc highlight link jsonTrailingCommaError Normal + set nowrap set hlsearch set tabstop=2 From e09a301e11293a8bdfee1c2b651587448c460854 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 17 Sep 2026 17:39:02 +0200 Subject: [PATCH 016/100] Update nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 089da38..71bf59d 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1789459628, - "narHash": "sha256-JOaadoI/IC9qEvwlnjwAhwdcWkCDqEeOJ+cOtUH/8RQ=", + "lastModified": 1789542786, + "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b67c7a60c3732edd4b947a7df8af06215851a614", + "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a", "type": "github" }, "original": { From c9e1d9bb6beb088e2cf708d3938c11c53ee94411 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Fri, 18 Sep 2026 17:57:51 +0200 Subject: [PATCH 017/100] Add Mako for notifications --- ruysch-graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 6a3f89a..60de106 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -43,6 +43,7 @@ hyprlock = "${pkgs.hyprlock}/bin/hyprlock"; ironbar = "${pkgs.ironbar}/bin/ironbar"; loginctl = "${pkgs.systemd}/bin/loginctl"; + mako = "${pkgs.mako}/bin/mako"; nautilus = "${pkgs.nautilus}/bin/nautilus"; nmcli = "${pkgs.networkmanager}/bin/nmcli"; nwg-bar = "${pkgs.nwg-bar}/bin/nwg-bar"; @@ -61,6 +62,7 @@ spawn-at-startup "${ironbar}" spawn-at-startup "${wl-gammarelay-rs}" spawn-at-startup "${swayidle}" "timeout" "600" "${hyprlock}" + spawn-at-startup "${mako}" From ebadcad1b279a30901061fd5bf77d7fceaacecb2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 21 Sep 2026 11:08:23 +0200 Subject: [PATCH 018/100] Rename Logitech MX Vertical evdevremapkeys device --- ruysch-graphical.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 60de106..0ab4469 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -327,7 +327,7 @@ enable = true; settings.devices = [ { input_name = "Logitech MX Vertical"; - output_name = "mx-vertical-remapped"; + output_name = "Logitech MX Vertical (remapped)"; remappings = { BTN_EXTRA = [ "BTN_MIDDLE" ]; BTN_SIDE = [ "BTN_MIDDLE" ]; From 3dacced32519b737b9548d587d4f13b7aad88b92 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 21 Sep 2026 11:08:51 +0200 Subject: [PATCH 019/100] Update nixpkgs, nixpkgs-unstable, nix-index-database --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 71bf59d..41044f8 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1789286446, - "narHash": "sha256-xVstyCdg0DpzjyrEacm72VJAIP9DMhfWJdPDzhWxHuo=", + "lastModified": 1789892076, + "narHash": "sha256-Dkg4VKPmDPqTwaiw2WH5br73tXoL1qrOO0xJnR4TlcA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a74e173407559083a412ea89a1cc58ea389c3b65", + "rev": "9ad722673ab3b3f91f02135e53775825b240b869", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1789542786, - "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=", + "lastModified": 1789885152, + "narHash": "sha256-mDNo95riUw8k0MA2Btzj/OuiMcfLKofqIliLYsLbrSY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a", + "rev": "6d663c0533ff269008fb84e45930151e37c99db9", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789546076, - "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", + "lastModified": 1789785513, + "narHash": "sha256-B44WL6h0XoLjJ41bUPJk0X5SDinLCII//6EcBLXKiJ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", + "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b", "type": "github" }, "original": { From e7a4a5df1b163dde05b0b0f92a7f5087e233e1b9 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 21 Sep 2026 11:13:40 +0200 Subject: [PATCH 020/100] Ignore Vim temporary backup files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 956d472..3113471 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /secrets + +.*.swp From 86a997a08f589f4a9f50db2c4340832082426004 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 21 Sep 2026 11:14:42 +0200 Subject: [PATCH 021/100] Load i2c-dev on machines with graphics in order to use ddcutil --- graphical.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/graphical.nix b/graphical.nix index 439e8ee..da49266 100644 --- a/graphical.nix +++ b/graphical.nix @@ -1,6 +1,9 @@ { pkgs, ... }: { + # For ddcutil. + boot.kernelModules = [ "i2c-dev" ]; + hardware.bluetooth.enable = true; environment.systemPackages = with pkgs; [ From c1cea2fc997042eb7cb4be7807cb513ec8b1c1e2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 21 Sep 2026 11:34:28 +0200 Subject: [PATCH 022/100] Use evremap instead of evdevremapkeys Cause it keeps crashing and evremap is written in Rust --- ruysch-graphical.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 0ab4469..6444664 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -323,15 +323,14 @@ }; }; - services.evdevremapkeys = { + services.evremap = { enable = true; - settings.devices = [ { - input_name = "Logitech MX Vertical"; - output_name = "Logitech MX Vertical (remapped)"; - remappings = { - BTN_EXTRA = [ "BTN_MIDDLE" ]; - BTN_SIDE = [ "BTN_MIDDLE" ]; - }; - } ]; + settings = { + device_name = "Logitech MX Vertical"; + remap = [ + { input = [ "BTN_EXTRA" ]; output = [ "BTN_MIDDLE" ]; } + { input = [ "BTN_SIDE" ]; output = [ "BTN_MIDDLE" ]; } + ]; + }; }; } From 22c730a421de3355b46489e1c62fd41b5124fb33 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 21 Sep 2026 11:44:17 +0200 Subject: [PATCH 023/100] Add ddcutil to graphical system packages --- graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphical.nix b/graphical.nix index da49266..a482cbc 100644 --- a/graphical.nix +++ b/graphical.nix @@ -9,6 +9,8 @@ environment.systemPackages = with pkgs; [ adwaita-icon-theme dconf-editor + # TODO: Consider replacing with ddcutil-service. + ddcutil overskride spotify sublime-merge From 03cfdd5c1b7cc36eee308764a3d76ae4606de367 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 21 Sep 2026 14:07:09 +0200 Subject: [PATCH 024/100] Add Blanket to graphical system packages --- graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/graphical.nix b/graphical.nix index a482cbc..0ae33fd 100644 --- a/graphical.nix +++ b/graphical.nix @@ -8,6 +8,7 @@ environment.systemPackages = with pkgs; [ adwaita-icon-theme + blanket dconf-editor # TODO: Consider replacing with ddcutil-service. ddcutil From 3082cf6d92fb38516c1c2b0a957dd1dca3795464 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 22 Sep 2026 18:22:51 +0200 Subject: [PATCH 025/100] Update nixpkgs, nixpkgs-unstable --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 41044f8..d987e68 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1789885152, - "narHash": "sha256-mDNo95riUw8k0MA2Btzj/OuiMcfLKofqIliLYsLbrSY=", + "lastModified": 1789998861, + "narHash": "sha256-62XMQD4WLdMAfdT0/8gJmPH2dKeTw908ryNloAplTr8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6d663c0533ff269008fb84e45930151e37c99db9", + "rev": "1e8bc658fc985ef27ccd66d107d767b32bb7ef98", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789785513, - "narHash": "sha256-B44WL6h0XoLjJ41bUPJk0X5SDinLCII//6EcBLXKiJ0=", + "lastModified": 1790046670, + "narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b", + "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc", "type": "github" }, "original": { From 897652f86b98a67cd2ccb3fafdb0f4b89f3c78b4 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 12:10:52 +0200 Subject: [PATCH 026/100] Enable graphical boot with Plymouth --- graphical.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/graphical.nix b/graphical.nix index 0ae33fd..193c809 100644 --- a/graphical.nix +++ b/graphical.nix @@ -1,8 +1,13 @@ { pkgs, ... }: { - # For ddcutil. - boot.kernelModules = [ "i2c-dev" ]; + boot = { + consoleLogLevel = 0; + # For ddcutil. + kernelModules = [ "i2c-dev" ]; + kernelParams = [ "splash" "quiet" ]; + plymouth.enable = true; + }; hardware.bluetooth.enable = true; From a6841e22b27009ae7f00a2cc677907e5f7523e73 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 12:11:52 +0200 Subject: [PATCH 027/100] Use wayland-logout package in nwg-bar config --- ruysch-graphical.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 6444664..9978fae 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -53,6 +53,7 @@ swaybg = "${pkgs.swaybg}/bin/swaybg"; swayidle = "${pkgs.swayidle}/bin/swayidle"; systemctl = "${pkgs.systemd}/bin/systemctl"; + wayland-logout = "${pkgs.wayland-logout}/bin/wayland-logout"; wl-gammarelay-rs = "${pkgs.wl-gammarelay-rs}/bin/wl-gammarelay-rs"; wlr-randr = "${pkgs.wlr-randr}/bin/wlr-randr"; in { @@ -282,7 +283,7 @@ "icon": "/usr/local/share/icons/kernelmaft/scalable/system-lock-screen-symbolic.svg" }, { "label": "Log out", - "exec": "wayland-logout", + "exec": "${wayland-logout}", "icon": "/usr/local/share/icons/kernelmaft/scalable/system-log-out-symbolic.svg" }, { "label": "_Suspend", From fbd6ddbf4331b542721fe5efd632b5239bd2c03b Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 12:12:34 +0200 Subject: [PATCH 028/100] Use unstable overskride package --- graphical.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphical.nix b/graphical.nix index 193c809..4dc0ee6 100644 --- a/graphical.nix +++ b/graphical.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, pkgs-unstable, ... }: { boot = { @@ -17,10 +17,10 @@ dconf-editor # TODO: Consider replacing with ddcutil-service. ddcutil - overskride spotify sublime-merge wl-clipboard + pkgs-unstable.overskride ]; programs = { From d080dfabebda080868c2994ae0418d4164fad59e Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 12:14:46 +0200 Subject: [PATCH 029/100] Use unstable Claude Code package --- ruysch.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruysch.nix b/ruysch.nix index 414ffdc..48b4bd4 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, pkgs, pkgs-unstable, ... }: { system.stateVersion = "26.05"; @@ -112,9 +112,9 @@ environment = { systemPackages = with pkgs; [ - claude-code minio-client python3 + pkgs-unstable.claude-code ]; persistence."/mnt/persistent-data".directories = [ From 075dd8e01179398c6691f834ada181d28456ead5 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 12:16:23 +0200 Subject: [PATCH 030/100] Create Claude Code config with system config --- ruysch.nix | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/ruysch.nix b/ruysch.nix index 48b4bd4..3b9c5f2 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -123,6 +123,48 @@ "/var/lib/garage" "/var/lib/postgresql" ]; + + etc."claude/settings.json".text = lib.concatStringsSep "\n" [ + "{" + + # Required by TandemDrive security policy. + + '' + "permissions": { + "deny": [ + "Read(.env)", + "Read(.env.*)", + "Read(~/.ssh/**)", + "Read(~/.gnupg/**)", + "Read(~/.config/**)", + "Read(~/Documents/**)", + "Bash(* | bash)", + "Bash(* | sh)", + "Bash(sudo *)", + "Bash(ssh *)", + "Bash(git push *)", + "Bash(git commit *)" + ], + "ask": [ + "Bash(curl *)", + "Bash(wget *)" + ], + "disableBypassPermissionsMode": "disable" + }, + '' + + # Personal config. + + '' + "disableAutoMode": "disable", + "env": { + "CLAUDE_CODE_ENABLE_AWAY_SUMMARY": "0", + "CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION": "false" + } + '' + + "}" + ]; }; services = { @@ -207,6 +249,11 @@ redis.serviceConfig.RuntimeDirectoryMode = lib.mkForce "0755"; }; + systemd.user.tmpfiles.rules = [ + # TODO: Don't persist entire .claude directory. + "L /home/rei/.claude/settings.json - - - - /etc/claude/settings.json" + ]; + systemd.tmpfiles.rules = [ "L+ /tmp/.s.PGSQL.5432 - - - - /run/postgresql/.s.PGSQL.5432" ]; From 4f0d38cd5c745446870593ec4ddd3eb0c6bbe652 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 13:13:55 +0200 Subject: [PATCH 031/100] Use adw-gtk3 as GTK3 theme --- graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphical.nix b/graphical.nix index 4dc0ee6..65f001f 100644 --- a/graphical.nix +++ b/graphical.nix @@ -12,6 +12,7 @@ hardware.bluetooth.enable = true; environment.systemPackages = with pkgs; [ + adw-gtk3 adwaita-icon-theme blanket dconf-editor @@ -37,6 +38,7 @@ "org/gnome/desktop/interface" = { font-hinting = "none"; font-name = "Fira Sans Condensed 11"; + gtk-theme = "adw-gtk3"; monospace-font-name = "Fira Mono 10"; }; "org/gnome/desktop/interface".accent-color = "purple"; From 2202f22ad1763f6985e458442278e08d8ffd3e46 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 13:14:13 +0200 Subject: [PATCH 032/100] Actually use nwg-bar config --- graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/graphical.nix b/graphical.nix index 65f001f..a93f5d4 100644 --- a/graphical.nix +++ b/graphical.nix @@ -70,6 +70,7 @@ systemd.user.tmpfiles.rules = [ "d /home/rei/.config/niri 0755 rei users" "L /home/rei/.config/niri/config.kdl - - - - /etc/niri/config.kdl" + "L /home/rei/.config/nwg-bar - - - - /etc/nwg-bar" ]; environment = { From 8d807dc4ca2fca3e1a78b80fafbca362b2a093d3 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 13:14:44 +0200 Subject: [PATCH 033/100] Show hidden files in Nautilus --- graphical.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphical.nix b/graphical.nix index a93f5d4..05fb26e 100644 --- a/graphical.nix +++ b/graphical.nix @@ -45,7 +45,10 @@ "org/gnome/desktop/wm/preferences".button-layout = ""; "org/gnome/nautilus/icon-view".default-zoom-level = "large"; "org/gnome/nautilus/list-view".default-zoom-level = "small"; - "org/gnome/nautilus/preferences".default-folder-viewer = "list-view"; + "org/gnome/nautilus/preferences" = { + default-folder-viewer = "list-view"; + show-hidden-files = true; + }; "org/gnome/terminal/legacy".default-show-menubar = false; }; } ]; From 6112653d9555ec0cd57f69f99a6e098ccbe5fee0 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 13:25:10 +0200 Subject: [PATCH 034/100] Generate Claude JSON config from Nix expression --- ruysch.nix | 66 ++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/ruysch.nix b/ruysch.nix index 3b9c5f2..a3a8ccd 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -124,47 +124,39 @@ "/var/lib/postgresql" ]; - etc."claude/settings.json".text = lib.concatStringsSep "\n" [ - "{" - + etc."claude/settings.json".source = (pkgs.formats.json {}).generate "claude-config" { # Required by TandemDrive security policy. - '' - "permissions": { - "deny": [ - "Read(.env)", - "Read(.env.*)", - "Read(~/.ssh/**)", - "Read(~/.gnupg/**)", - "Read(~/.config/**)", - "Read(~/Documents/**)", - "Bash(* | bash)", - "Bash(* | sh)", - "Bash(sudo *)", - "Bash(ssh *)", - "Bash(git push *)", - "Bash(git commit *)" - ], - "ask": [ - "Bash(curl *)", - "Bash(wget *)" - ], - "disableBypassPermissionsMode": "disable" - }, - '' - + permissions = { + deny = [ + "Read(.env)" + "Read(.env.*)" + "Read(~/.ssh/**)" + "Read(~/.gnupg/**)" + "Read(~/.config/**)" + "Read(~/Documents/**)" + "Bash(* | bash)" + "Bash(* | sh)" + "Bash(sudo *)" + "Bash(ssh *)" + "Bash(git push *)" + "Bash(git commit *)" + ]; + ask = [ + "Bash(git push *)" + "Bash(git commit *)" + ]; + disableBypassPermissionsMode = "disable"; + }; + # Personal config. - '' - "disableAutoMode": "disable", - "env": { - "CLAUDE_CODE_ENABLE_AWAY_SUMMARY": "0", - "CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION": "false" - } - '' - - "}" - ]; + disableAutoMode = "disable"; + env = { + CLAUDE_CODE_ENABLE_AWAY_SUMMARY = 0; + CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION = "false"; + }; + }; }; services = { From 2bdb9d4d87ec4182fc6a3885461f30406ad40deb Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 13:44:07 +0200 Subject: [PATCH 035/100] Set Claude theme to auto --- ruysch.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruysch.nix b/ruysch.nix index a3a8ccd..a838ea0 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -156,6 +156,8 @@ CLAUDE_CODE_ENABLE_AWAY_SUMMARY = 0; CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION = "false"; }; + # Default is dark. + theme = "auto"; }; }; From 41f7f97b2c31eac6ef2f3eecf2a84a319014241f Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 13:52:47 +0200 Subject: [PATCH 036/100] Enable GVFS for trash support in Nautilus --- graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphical.nix b/graphical.nix index 05fb26e..688dd1a 100644 --- a/graphical.nix +++ b/graphical.nix @@ -55,6 +55,8 @@ }; }; + services.gvfs.enable = true; + fonts = { packages = with pkgs; [ fira From d9db75cbd91a56149aa155d1cc4cd7f3cb684b5d Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 14:14:49 +0200 Subject: [PATCH 037/100] Remove dconf-editor as it's not useful for discovery on NixOS --- graphical.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/graphical.nix b/graphical.nix index 688dd1a..8ac2b80 100644 --- a/graphical.nix +++ b/graphical.nix @@ -15,7 +15,6 @@ adw-gtk3 adwaita-icon-theme blanket - dconf-editor # TODO: Consider replacing with ddcutil-service. ddcutil spotify From 26f822f1dc733dfbaf07cc63aaff38bff0debefa Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 23 Sep 2026 14:15:27 +0200 Subject: [PATCH 038/100] Fix Nautilus hidden files config --- graphical.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/graphical.nix b/graphical.nix index 8ac2b80..40d1327 100644 --- a/graphical.nix +++ b/graphical.nix @@ -44,11 +44,9 @@ "org/gnome/desktop/wm/preferences".button-layout = ""; "org/gnome/nautilus/icon-view".default-zoom-level = "large"; "org/gnome/nautilus/list-view".default-zoom-level = "small"; - "org/gnome/nautilus/preferences" = { - default-folder-viewer = "list-view"; - show-hidden-files = true; - }; + "org/gnome/nautilus/preferences".default-folder-viewer = "list-view"; "org/gnome/terminal/legacy".default-show-menubar = false; + "org/gtk/gtk4/settings/file-chooser".show-hidden = true; }; } ]; }; From 1b6fb3bcd56afb784ed32900c57450548229604b Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 24 Sep 2026 12:12:54 +0200 Subject: [PATCH 039/100] Set scale for other variant of LG monitors at TandemDrive too --- ruysch-graphical.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 9978fae..71d3377 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -113,8 +113,9 @@ // Internal laptop screen. output "BOE 0x0BCA Unknown" { scale 1.125; } - // LG monitor TandemDrive. + // LG monitors TandemDrive. output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } + output "LG Electronics LG Ultra HD 0x00020FF4" { scale 1.25; } From 58d80c17dafbee4e2aafd7d5bbf5953c3f2953f4 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 24 Sep 2026 12:13:42 +0200 Subject: [PATCH 040/100] Add shadow to all floating windows --- ruysch-graphical.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 71d3377..cb864e0 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -262,10 +262,10 @@ clip-to-geometry true } - // Floating windows with added shadow. + // Add shadow to floating windows. window-rule { - match app-id="jetbrains-rustrover" is-floating=true + match is-floating=true shadow { on From a6859ea139e57d16fefc198c5171817fb5c95782 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 24 Sep 2026 13:03:06 +0200 Subject: [PATCH 041/100] Add Gnome Calculator and always open it as a floating window --- graphical.nix | 1 + ruysch-graphical.nix | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/graphical.nix b/graphical.nix index 40d1327..4c6d111 100644 --- a/graphical.nix +++ b/graphical.nix @@ -17,6 +17,7 @@ blanket # TODO: Consider replacing with ddcutil-service. ddcutil + gnome-calculator spotify sublime-merge wl-clipboard diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index cb864e0..20b8f8f 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -246,6 +246,14 @@ default-column-width { proportion 0.75; } } + // Floated windows. + + window-rule { + match app-id="org.gnome.Calculator" + + open-floating true + } + // Un-floated windows. window-rule { From 2f4037fe9144efe3f70b7e8c878b71f3c578d29a Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 11:45:31 +0200 Subject: [PATCH 042/100] Formatting --- ruysch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruysch.nix b/ruysch.nix index a838ea0..bb0776e 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -109,7 +109,7 @@ hostName = "ruysch"; networkmanager.enable = true; }; - + environment = { systemPackages = with pkgs; [ minio-client From 82c502d9ead93450bd438a4fdbd110d14c7c4c61 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 11:45:55 +0200 Subject: [PATCH 043/100] Add Wireshark --- common.nix | 2 +- ruysch-graphical.nix | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common.nix b/common.nix index 78d2977..48370d5 100644 --- a/common.nix +++ b/common.nix @@ -142,7 +142,7 @@ mutableUsers = false; users.rei = { isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "wireshark" ]; openssh.authorizedKeys.keyFiles = [ assets/openssh-authorized-keys ]; }; }; diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 20b8f8f..f5ea86d 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -10,6 +10,13 @@ pkgs-unstable.jetbrains.rust-rover ]; + programs.wireshark = { + enable = true; + # Default is CLI-only package. + package = pkgs.wireshark; + usbmon.enable = true; + }; + persistence = { "/mnt/persistent-data" = { users.rei = { From 7429b8f51cfc8799518a7f39866627253424aefe Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 11:54:16 +0200 Subject: [PATCH 044/100] Move Loupe to general graphical config --- graphical.nix | 1 + ruysch-graphical.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/graphical.nix b/graphical.nix index 4c6d111..445cec7 100644 --- a/graphical.nix +++ b/graphical.nix @@ -18,6 +18,7 @@ # TODO: Consider replacing with ddcutil-service. ddcutil gnome-calculator + loupe spotify sublime-merge wl-clipboard diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index f5ea86d..93fc2a6 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -5,7 +5,6 @@ systemPackages = with pkgs; [ cartero darktable - loupe signal-desktop pkgs-unstable.jetbrains.rust-rover ]; From 570383e2da39d7de14fa7af19e329cc9f8a77007 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 11:59:44 +0200 Subject: [PATCH 045/100] Fix Wireshark config --- ruysch-graphical.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 93fc2a6..b715e76 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -1,6 +1,13 @@ { pkgs, pkgs-unstable, ... }: { + programs.wireshark = { + enable = true; + # Default is CLI-only package. + package = pkgs.wireshark; + usbmon.enable = true; + }; + environment = { systemPackages = with pkgs; [ cartero @@ -9,13 +16,6 @@ pkgs-unstable.jetbrains.rust-rover ]; - programs.wireshark = { - enable = true; - # Default is CLI-only package. - package = pkgs.wireshark; - usbmon.enable = true; - }; - persistence = { "/mnt/persistent-data" = { users.rei = { From 447fcad211108f5bf006c0a7ead13002c6d6660f Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 12:00:09 +0200 Subject: [PATCH 046/100] Add Font Awesome for broken sites --- graphical.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphical.nix b/graphical.nix index 445cec7..898c191 100644 --- a/graphical.nix +++ b/graphical.nix @@ -59,8 +59,9 @@ fonts = { packages = with pkgs; [ fira - noto-fonts + font-awesome # google-fonts + noto-fonts ]; fontconfig = { defaultFonts = { From a05e7c5fcf2556ce90a6a56cec23e167df21d5dd Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 12:11:23 +0200 Subject: [PATCH 047/100] Switch to standard NixOS I2C module, give user account access --- graphical.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/graphical.nix b/graphical.nix index 898c191..8ced427 100644 --- a/graphical.nix +++ b/graphical.nix @@ -3,13 +3,18 @@ { boot = { consoleLogLevel = 0; - # For ddcutil. - kernelModules = [ "i2c-dev" ]; kernelParams = [ "splash" "quiet" ]; plymouth.enable = true; }; - hardware.bluetooth.enable = true; + # For ddcutil. + users.users.rei.extraGroups = [ "i2c" ]; + + hardware = { + bluetooth.enable = true; + # For ddcutil. + i2c.enable = true; + }; environment.systemPackages = with pkgs; [ adw-gtk3 From 5b0c5ac23abd4f61feb24ab55aa020c5bb204932 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 12:12:50 +0200 Subject: [PATCH 048/100] Update nixpkgs, nixpkgs-unstable, nix-index-database --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d987e68..b4b214a 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1789892076, - "narHash": "sha256-Dkg4VKPmDPqTwaiw2WH5br73tXoL1qrOO0xJnR4TlcA=", + "lastModified": 1790499302, + "narHash": "sha256-Gbf/U9ptJhQh0qnDnJ/+a8MAcq1HXunbArUTHR2wNYk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9ad722673ab3b3f91f02135e53775825b240b869", + "rev": "161d7c91accd93034bb3c295224d9d895a778573", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1789998861, - "narHash": "sha256-62XMQD4WLdMAfdT0/8gJmPH2dKeTw908ryNloAplTr8=", + "lastModified": 1790533781, + "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e8bc658fc985ef27ccd66d107d767b32bb7ef98", + "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1790046670, - "narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=", + "lastModified": 1790578696, + "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc", + "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f", "type": "github" }, "original": { From d657976d4dd064594faf4fc31cc1d704c0a806e2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 12:16:30 +0200 Subject: [PATCH 049/100] Use Font Awesome for Ironbar instead --- graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/graphical.nix b/graphical.nix index 8ced427..ae991e7 100644 --- a/graphical.nix +++ b/graphical.nix @@ -64,6 +64,7 @@ fonts = { packages = with pkgs; [ fira + # Hopefully temporary, for Ironbar. font-awesome # google-fonts noto-fonts From 62904296809535a2789b3fe99d813ccbcf94c01f Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 13:18:26 +0200 Subject: [PATCH 050/100] Set Claude Code Opus 5.5 effort to high --- ruysch.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ruysch.nix b/ruysch.nix index bb0776e..6e2e3bd 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -156,6 +156,7 @@ CLAUDE_CODE_ENABLE_AWAY_SUMMARY = 0; CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION = "false"; }; + modelSettings.claude-opus-5-5.effortLevel = "high"; # Default is dark. theme = "auto"; }; From 19ef5c31e535809a701723b10e39f49ef6145dfb Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 18:04:31 +0200 Subject: [PATCH 051/100] Fix shadows for non-rectangular floating windows --- ruysch-graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index b715e76..b4b483d 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -287,6 +287,7 @@ softness 30 spread 0 offset x=0 y=0 + draw-behind-window true } } ''; From 614b0b5fcd9774ddaf0ece7d98e2bc24256b70e2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 23:28:19 +0200 Subject: [PATCH 052/100] Resolve Polkit todo, formatting --- common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.nix b/common.nix index 48370d5..3d38a37 100644 --- a/common.nix +++ b/common.nix @@ -250,12 +250,12 @@ extraConfig = '' polkit.addRule(function (action, subject) { if (subject.user == "rei") { - // TODO: Find out what the difference between AUTH_SELF and AUTH_ADMIN is. return polkit.Result.AUTH_SELF; } }); ''; }; + sudo.extraConfig = '' Defaults lecture="never" ''; From 9abf00bdad49312f2668821e908b91b0ad533d27 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 23:28:51 +0200 Subject: [PATCH 053/100] Enable Soteria as graphical Polkit agent --- graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphical.nix b/graphical.nix index ae991e7..0d7a115 100644 --- a/graphical.nix +++ b/graphical.nix @@ -159,4 +159,6 @@ # } ''; }; + + security.soteria.enable = true; } From 94b2b62537da0f1d1a2dd802c5ae53e936fef9d5 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 29 Sep 2026 23:29:14 +0200 Subject: [PATCH 054/100] Enable NetworkManager Connection Editor --- graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphical.nix b/graphical.nix index 0d7a115..5b7fdd2 100644 --- a/graphical.nix +++ b/graphical.nix @@ -34,6 +34,8 @@ firefox.enable = true; gnome-terminal.enable = true; niri.enable = true; + # Gives us NetworkManager Connection Editor. + nm-applet.enable = true; thunderbird.enable = true; dconf = { From fbd99b4aba0d0d9870a8fe1cf98ec847f459a987 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 30 Sep 2026 12:19:17 +0200 Subject: [PATCH 055/100] Update nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b4b214a..80afa0f 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1790533781, - "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=", + "lastModified": 1790635395, + "narHash": "sha256-bNyvoIyOCu7lzoCpWKWGIsHpTtERUWzqYWFPlN++WTw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442", + "rev": "7fc6f2c20af09cdcaf48b92ec3121860139ec668", "type": "github" }, "original": { From c193a3631fe4cbbf30fe66c0035050d4472a73e1 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 30 Sep 2026 14:49:20 +0200 Subject: [PATCH 056/100] Prevent nm-applet from autostarting --- graphical.nix | 127 ++++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 60 deletions(-) diff --git a/graphical.nix b/graphical.nix index 5b7fdd2..bf63747 100644 --- a/graphical.nix +++ b/graphical.nix @@ -24,6 +24,9 @@ ddcutil gnome-calculator loupe + # We don't use programs.nm-applet.enable because that also creates an enabled systemd unit for + # the applet. We just want nm-connection-editor. + networkmanagerapplet spotify sublime-merge wl-clipboard @@ -34,8 +37,6 @@ firefox.enable = true; gnome-terminal.enable = true; niri.enable = true; - # Gives us NetworkManager Connection Editor. - nm-applet.enable = true; thunderbird.enable = true; dconf = { @@ -102,64 +103,70 @@ ]; }; - etc."xdg/hypr/hyprlock.conf".text = '' - background { - path = /home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies - blur_passes = 4 - blur_size = 4 - contrast = 1.0 - brightness = 1.0 - vibrancy = 0.0 - } - - animations { - animation = fade, 0 - } - - # Clock. - - label { - halign = center - valign = center - position = 0, 140 - - # TODO: Get the letter spacing identical to the explicit font name version. - # text = $TIME - text = $TIME - text_align = center - } - - # Password textbox. - - input-field { - halign = center - valign = center - position = 0, -180 - - size = 450, 75 - placeholder_text = Password - fail_text = Incorrect - inner_color = rgb(FFFFFF) - font_color = rgb(000000) - check_color = rgb(FF9800) - outline_thickness = 0 - rounding = 10 - fade_on_empty = false - # TODO: Doesn't exist anymore, what did this use to achieve? - # fail_timeout = 500 - } - - # Keyboard layout indicator. - # TODO: Why does this not work anymore? - - # label { - # halign = center - # valign = center - # position = 0, -600 - - # text = $LAYOUT[!,Keyboard layout: български,Keyboard layout: Ελληνικά] - # } - ''; + etc = { + "xdg/autostart/nm-applet.desktop".text = '' + [Desktop Entry] + Hidden=true + ''; + "xdg/hypr/hyprlock.conf".text = '' + background { + path = /home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies + blur_passes = 4 + blur_size = 4 + contrast = 1.0 + brightness = 1.0 + vibrancy = 0.0 + } + + animations { + animation = fade, 0 + } + + # Clock. + + label { + halign = center + valign = center + position = 0, 140 + + # TODO: Get the letter spacing identical to the explicit font name version. + # text = $TIME + text = $TIME + text_align = center + } + + # Password textbox. + + input-field { + halign = center + valign = center + position = 0, -180 + + size = 450, 75 + placeholder_text = Password + fail_text = Incorrect + inner_color = rgb(FFFFFF) + font_color = rgb(000000) + check_color = rgb(FF9800) + outline_thickness = 0 + rounding = 10 + fade_on_empty = false + # TODO: Doesn't exist anymore, what did this use to achieve? + # fail_timeout = 500 + } + + # Keyboard layout indicator. + # TODO: Why does this not work anymore? + + # label { + # halign = center + # valign = center + # position = 0, -600 + + # text = $LAYOUT[!,Keyboard layout: български,Keyboard layout: Ελληνικά] + # } + ''; + }; }; security.soteria.enable = true; From ce4264db19615e15cdf1ce484a27eea98a2b84c8 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 30 Sep 2026 14:56:54 +0200 Subject: [PATCH 057/100] Enable 120 Hz for certain Dell monitor at TandemDrive office --- ruysch-graphical.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index b4b483d..e562651 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -116,10 +116,16 @@ recent-windows { off; } animations { slowdown 0.5; } gestures { hot-corners { off; }; } + + // Internal laptop screen. + output "BOE 0x0BCA Unknown" { scale 1.125; } - // LG monitors TandemDrive. + + // TandemDrive office monitors. + + output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; } output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FF4" { scale 1.25; } From 12ae24a9c18fb77067c713f9374c1bed829dc47e Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 30 Sep 2026 15:54:08 +0200 Subject: [PATCH 058/100] Don't add extra shadows to RustRover floating windows --- ruysch-graphical.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index e562651..09dd251 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -286,6 +286,9 @@ window-rule { match is-floating=true + // These already have shadows, and aren't rectangular so clipping the existing ones off + // is a pain in the arse. + exclude app-id="jetbrains-rustrover" shadow { on From a083d20f04432ec884b6b3070a7a3639270f0c2d Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 30 Sep 2026 21:52:57 +0200 Subject: [PATCH 059/100] Properly set up Thunderbird --- graphical.nix | 13 ++++++++++++- ruysch-graphical.nix | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/graphical.nix b/graphical.nix index bf63747..dee6c3c 100644 --- a/graphical.nix +++ b/graphical.nix @@ -37,7 +37,18 @@ firefox.enable = true; gnome-terminal.enable = true; niri.enable = true; - thunderbird.enable = true; + + thunderbird = { + enable = true; + policies = { + ExtensionSettings."langpack-en-GB@thunderbird.mozilla.org" = { + installation_mode = "force_installed"; + install_url = let inherit (pkgs.thunderbird) version; in + "https://releases.mozilla.org/pub/thunderbird/releases/${version}/linux-x86_64/xpi/en-GB.xpi"; + }; + RequestedLocales = [ "en-GB" ]; + }; + }; dconf = { enable = true; diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 09dd251..15530a7 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -254,6 +254,7 @@ match app-id="signal" is-floating=false match app-id="spotify" is-floating=false match app-id="sublime_merge" is-floating=false + match app-id="thunderbird" is-floating=false default-column-width { proportion 0.75; } } From 7518a41c08dc39ea992fac6855fb384009da4167 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 1 Oct 2026 12:01:21 +0200 Subject: [PATCH 060/100] Update nixpkgs, nixpkgs-unstable --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 80afa0f..1a19d96 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1790635395, - "narHash": "sha256-bNyvoIyOCu7lzoCpWKWGIsHpTtERUWzqYWFPlN++WTw=", + "lastModified": 1790750587, + "narHash": "sha256-VfjaoJ1Uyb7JZTrBgE5Jf2nhjtQPmD9KOd19HJwmZwM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fc6f2c20af09cdcaf48b92ec3121860139ec668", + "rev": "78e9c786dc08cd4f3420c2395cd977206a9b1da2", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1790578696, - "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=", + "lastModified": 1790689126, + "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f", + "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9", "type": "github" }, "original": { From 7777f94d9750221d0a5891b40c2e906e17711658 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 5 Oct 2026 10:09:57 +0200 Subject: [PATCH 061/100] Use default AirVPN for keyboard binding, remove TODO --- ruysch-graphical.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 15530a7..9dcfea7 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -159,9 +159,8 @@ Super+P allow-when-locked=true { spawn "${wlr-randr}" "--output" "eDP-1" "--toggle"; } - // TODO: Replace with toggle script. - Super+H { spawn "${nmcli}" "connection" "up" "airvpn-serbia"; } - Super+Shift+H { spawn "${nmcli}" "connection" "down" "airvpn-serbia"; } + Super+H { spawn "${nmcli}" "connection" "up" "airvpn"; } + Super+Shift+H { spawn "${nmcli}" "connection" "down" "airvpn"; } Super+J { spawn "${emote}"; } // TODO: Put this in linux-utils as Nix package. From 3e1744119006016ea4abaf50f99c9a8812759766 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 5 Oct 2026 10:10:31 +0200 Subject: [PATCH 062/100] Enable Logitech Unifying support on Ruysch --- ruysch-graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 9dcfea7..3baa668 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -1,6 +1,8 @@ { pkgs, pkgs-unstable, ... }: { + hardware.logitech.wireless.enable = true; + programs.wireshark = { enable = true; # Default is CLI-only package. From 78f2b9b58f98e402a66cff969a003aa8cd67808b Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 5 Oct 2026 10:10:56 +0200 Subject: [PATCH 063/100] Set up TV in room Social Hub in Niri --- ruysch-graphical.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 3baa668..ec3fd42 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -130,6 +130,13 @@ output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; } output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FF4" { scale 1.25; } + + // TV room Social Hub + + output "Samsung Electric Company SAMSUNG 0x01000E00" { + scale 1.5 + mode custom=true "2560x1440@60" + } From bca5b83a0a4cca05c1fb34ee6a9303cc6e44cc94 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 6 Oct 2026 11:01:08 +0200 Subject: [PATCH 064/100] Add a TandemDrive office monitor --- ruysch-graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index ec3fd42..ff40ff5 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -128,6 +128,7 @@ // TandemDrive office monitors. output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; } + output "LG Electronics LG HDR 4K 0x0005C746" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FF4" { scale 1.25; } From 4d32043c5e5de1792660cab5f3208ae93ce36a8f Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Fri, 9 Oct 2026 11:20:48 +0200 Subject: [PATCH 065/100] Un-float RustRover Git windows --- ruysch-graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index ff40ff5..dc19aeb 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -279,6 +279,8 @@ // Un-floated windows. window-rule { + match app-id="jetbrains-rustrover" title="^Conflicts$" + match app-id="jetbrains-rustrover" title="^Merge Revisions for " match app-id="jetbrains-rustrover" title="^Settings – " open-floating false From 2076d241d39e1a43fa19ab5f13df069788f28c34 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Fri, 9 Oct 2026 11:25:35 +0200 Subject: [PATCH 066/100] Update nixpkgs, nixpkgs-unstable, nix-index-database --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1a19d96..1b5c77f 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1790499302, - "narHash": "sha256-Gbf/U9ptJhQh0qnDnJ/+a8MAcq1HXunbArUTHR2wNYk=", + "lastModified": 1791105314, + "narHash": "sha256-oTM7QFgRQ+vxBpMBMc7hEYpqBtpXAzXu2xuB/tru84U=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "161d7c91accd93034bb3c295224d9d895a778573", + "rev": "e740bc4e9d8918d7819a51486d5099930c65c72e", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1790750587, - "narHash": "sha256-VfjaoJ1Uyb7JZTrBgE5Jf2nhjtQPmD9KOd19HJwmZwM=", + "lastModified": 1791426274, + "narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78e9c786dc08cd4f3420c2395cd977206a9b1da2", + "rev": "7c8764b7c7b09b34f632464276218ef9090eaa11", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1790689126, - "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=", + "lastModified": 1791456040, + "narHash": "sha256-H83yz/do+hjOO0uujHyH8RgtIQP2v7Mw+cLwcZK/xKc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9", + "rev": "e7439b6b14ad3cc35d05608ebca9bce01a25f5f8", "type": "github" }, "original": { From d1f41672ba2ec9135aa5071f2e451b0f341c4d8b Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 12 Oct 2026 21:39:43 +0200 Subject: [PATCH 067/100] Update nixpkgs, nixpkgs-unstable, nix-index-database --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1b5c77f..b020800 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1791105314, - "narHash": "sha256-oTM7QFgRQ+vxBpMBMc7hEYpqBtpXAzXu2xuB/tru84U=", + "lastModified": 1791711434, + "narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e740bc4e9d8918d7819a51486d5099930c65c72e", + "rev": "9a2dd40780eeab8543aa97c59c26f11267025616", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1791426274, - "narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=", + "lastModified": 1791662279, + "narHash": "sha256-xI8L+UwJLIg75yVJwLPsY+AUEP1teCT3FyuvodyJu2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c8764b7c7b09b34f632464276218ef9090eaa11", + "rev": "6fcc160353f63555b560f25588925133c8f61f2a", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1791456040, - "narHash": "sha256-H83yz/do+hjOO0uujHyH8RgtIQP2v7Mw+cLwcZK/xKc=", + "lastModified": 1791734076, + "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7439b6b14ad3cc35d05608ebca9bce01a25f5f8", + "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", "type": "github" }, "original": { From d5daeb5c99b9fd8c74faf1f355181e477114ac70 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 12 Oct 2026 22:17:22 +0200 Subject: [PATCH 068/100] Use Zen kernel on Ruysch --- ruysch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruysch.nix b/ruysch.nix index 6e2e3bd..b0d96b6 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -50,7 +50,7 @@ }; kernelModules = [ "kvm-amd" ]; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; }; hardware.cpu.amd.updateMicrocode = true; From 7e2dcafcacdbf1078383c5c8e34aaa8e7d3ba428 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 12 Oct 2026 23:05:27 +0200 Subject: [PATCH 069/100] Add generations cleanup commmand as shell alias --- common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common.nix b/common.nix index 3d38a37..3a7ba51 100644 --- a/common.nix +++ b/common.nix @@ -105,6 +105,13 @@ nsff = "nix-store-fuzzy-find"; nbp = "nix-build-pkg"; nd = "nix develop --command $SHELL"; + + # New commands. + + nixos-cleanup-generations = '' + zsh -c "nix-env --profile /nix/var/nix/profiles/system --delete-generations +20 && \ + /run/current-system/bin/switch-to-configuration boot" + ''; }; etc.vimrc.text = '' From 6e5d4e162e01214df463e38deac646a26dfff503 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 12 Oct 2026 23:05:56 +0200 Subject: [PATCH 070/100] Add Pipewire Volume Control as graphical system package --- graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/graphical.nix b/graphical.nix index dee6c3c..ec46369 100644 --- a/graphical.nix +++ b/graphical.nix @@ -27,6 +27,7 @@ # We don't use programs.nm-applet.enable because that also creates an enabled systemd unit for # the applet. We just want nm-connection-editor. networkmanagerapplet + pwvucontrol spotify sublime-merge wl-clipboard From 09b4296d503f9131ba3e8348d441f8efb4e81eff Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 13 Oct 2026 13:24:47 +0200 Subject: [PATCH 071/100] Add office monitor config --- ruysch-graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index dc19aeb..167790d 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -127,6 +127,7 @@ // TandemDrive office monitors. + output "Dell Inc. DELL P2715Q V48W26AB160L" { scale 1.25; } output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; } output "LG Electronics LG HDR 4K 0x0005C746" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } From 2f9fac262147d01f85f3be3058fab6ab8cf47c11 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 13 Oct 2026 15:34:21 +0200 Subject: [PATCH 072/100] Use pwvucontrol from unstable pkgs, organise graphical system pkgs --- graphical.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/graphical.nix b/graphical.nix index ec46369..324382b 100644 --- a/graphical.nix +++ b/graphical.nix @@ -17,21 +17,29 @@ }; environment.systemPackages = with pkgs; [ - adw-gtk3 - adwaita-icon-theme - blanket + # CLI programs. + # TODO: Consider replacing with ddcutil-service. ddcutil + wl-clipboard + + # Graphical programs. + + blanket gnome-calculator loupe # We don't use programs.nm-applet.enable because that also creates an enabled systemd unit for # the applet. We just want nm-connection-editor. networkmanagerapplet - pwvucontrol spotify sublime-merge - wl-clipboard pkgs-unstable.overskride + pkgs-unstable.pwvucontrol + + # Icon themes. + + adw-gtk3 + adwaita-icon-theme ]; programs = { From a0861b4c30716492400330bae4f2c59fed7800c6 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 21 Oct 2026 18:47:42 +0200 Subject: [PATCH 073/100] Formatting --- ruysch-graphical.nix | 70 ++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 167790d..8c51223 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -72,17 +72,17 @@ spawn-at-startup "${wl-gammarelay-rs}" spawn-at-startup "${swayidle}" "timeout" "600" "${hyprlock}" spawn-at-startup "${mako}" - - - + + + prefer-no-csd screenshot-path "~/screenshots/niri-%Y-%m-%d-%H:%M:%S.png" - + hotkey-overlay { skip-at-startup; } - + input { disable-power-key-handling - + keyboard { xkb { layout "us,bg(phonetic),gr" @@ -98,13 +98,13 @@ } cursor { xcursor-theme "Adwaita"; } - + layout { gaps 60 center-focused-column "on-overflow" always-center-single-column empty-workspace-above-first - + // struts { top -60; } focus-ring { off; } preset-column-widths { @@ -113,14 +113,14 @@ } insert-hint { color "#9141AC88"; } } - + overview { backdrop-color "#181821"; } recent-windows { off; } animations { slowdown 0.5; } gestures { hot-corners { off; }; } - + // Internal laptop screen. output "BOE 0x0BCA Unknown" { scale 1.125; } @@ -139,22 +139,22 @@ scale 1.5 mode custom=true "2560x1440@60" } - - - + + + binds { Super+Q { close-window; } Super+W { spawn "${rofi}" "-show" "drun"; } Super+E { spawn "${gnome-terminal}"; } Super+R { spawn "${nautilus}"; } - + Super+T { spawn "${firefox}"; } Super+Shift+T { spawn "${firefox}" "--private-window"; } - + Super+A { center-column; } Super+S { switch-preset-column-width; } Super+D { toggle-window-floating; } - + Super+U allow-when-locked=true { spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" } @@ -167,12 +167,12 @@ Super+O allow-when-locked=true { spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" } - + Super+P allow-when-locked=true { spawn "${wlr-randr}" "--output" "eDP-1" "--toggle"; } - + Super+H { spawn "${nmcli}" "connection" "up" "airvpn"; } Super+Shift+H { spawn "${nmcli}" "connection" "down" "airvpn"; } - + Super+J { spawn "${emote}"; } // TODO: Put this in linux-utils as Nix package. // Super+K allow-when-locked=true { spawn "wl-gammarelay-toggle-temperature"; } @@ -187,11 +187,11 @@ // TODO: Set up session-based locking like on Arch. // Super+L { spawn "${loginctl}" "lock-session"; } Super+L { spawn "${hyprlock}"; } - + // I.e. the Non-Screeching Earwarmers. Super+B { spawn "${bluetoothctl}" "connect" "58:18:62:1F:E3:33"; } Super+Shift+B { spawn "${bluetoothctl}" "disconnect" "58:18:62:1F:E3:33"; } - + Super+M { spawn "${playerctl}" "play-pause"; } Super+Comma { spawn "${playerctl}" "previous"; } Super+Period { spawn "${playerctl}" "next"; } @@ -200,46 +200,46 @@ // Super+BracketLeft allow-when-locked=true { spawn "ddc-brightness" "down"; } // Super+BracketRight allow-when-locked=true { spawn "ddc-brightness" "up"; } // Super+Shift+BracketRight allow-when-locked=true { spawn "ddc-brightness" "max"; } - + Super+Tab { toggle-overview; } Super+Space { switch-layout "next"; } Super+Escape { spawn "${nwg-bar}"; } Super+F11 { fullscreen-window; } - + Super+Left { focus-column-left; } Super+Right { focus-column-right; } Super+Up { focus-workspace-up; } Super+Down { focus-workspace-down; } Super+Home { focus-column-first; } Super+End { focus-column-last; } - + Super+Shift+Left { move-column-left; } Super+Shift+Right { move-column-right; } Super+Shift+Up { move-column-to-workspace-up; } Super+Shift+Down { move-column-to-workspace-down; } Super+Shift+Home { move-column-to-first; } Super+Shift+End { move-column-to-last; } - + Super+Control+Shift+Left { move-column-to-monitor-left; } Super+Control+Shift+Right { move-column-to-monitor-right; } Super+Control+Shift+Up { move-column-to-monitor-up; } Super+Control+Shift+Down { move-column-to-monitor-down; } - + Super+1 { set-column-width "40%"; } Super+2 { set-column-width "50%"; } Super+3 { set-column-width "66.667%"; } Super+4 { set-column-width "75%"; } Super+5 { set-column-width "100%"; } - + // TODO: Add back rectangle screenshot selection. Print { screenshot; } Super+Print { screenshot-window; } // Special function keys. - + XF86MonBrightnessDown allow-when-locked=true { spawn "${brightnessctl}" "set" "10%-"; } XF86MonBrightnessUp allow-when-locked=true { spawn "${brightnessctl}" "set" "+10%"; } - + XF86AudioLowerVolume allow-when-locked=true { spawn "${pactl}" "set-sink-volume" "@DEFAULT_SINK@" "-2%" } @@ -249,7 +249,7 @@ XF86AudioMute allow-when-locked=true { spawn "${pactl}" "set-sink-mute" "@DEFAULT_SINK@" "toggle" } - + XF86AudioPlay allow-when-locked=true { spawn "${playerctl}" "play-pause"; } XF86AudioPause allow-when-locked=true { spawn "${playerctl}" "play-pause"; } } @@ -302,7 +302,7 @@ // These already have shadows, and aren't rectangular so clipping the existing ones off // is a pain in the arse. exclude app-id="jetbrains-rustrover" - + shadow { on color "#0004" @@ -343,20 +343,20 @@ ''; "nwg-bar/style.css".text = '' window { background-color: black; } - + #outer-box { margin: 30px; } - + label { margin-top: 8px; color: white; } - + button { margin: 10px; padding: 14px; background-color: #333; } - + button:hover { background-color: #444; } ''; }; From 9726e6743361e1fff2ad4eefe7e3323e12a7bdc5 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 22 Oct 2026 14:16:22 +0200 Subject: [PATCH 074/100] Update impermanence, nix-index-database, nixpkgs, nixpkgs-unstable --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index b020800..55800dd 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769548169, - "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", + "lastModified": 1792503832, + "narHash": "sha256-WsqPR04nPS1bi5bYva04cJJcJyHw7x/rbaJmoXMzF04=", "owner": "nix-community", "repo": "impermanence", - "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", + "rev": "936ced36ecd25fcbd9b4789184b88aa2e4c2a901", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1791711434, - "narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=", + "lastModified": 1792309949, + "narHash": "sha256-2DAEMk8YkV8OF6N2uw9jQ016cYoNkcgnq50AShwWxNw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9a2dd40780eeab8543aa97c59c26f11267025616", + "rev": "1b4d1758fa6053c5d6284254a793134fa602fbff", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1791662279, - "narHash": "sha256-xI8L+UwJLIg75yVJwLPsY+AUEP1teCT3FyuvodyJu2Y=", + "lastModified": 1792615934, + "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6fcc160353f63555b560f25588925133c8f61f2a", + "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1791734076, - "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", + "lastModified": 1792502884, + "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", + "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", "type": "github" }, "original": { From 273fb36b641aa53675efffbc56033427d75fb9fc Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Sat, 24 Oct 2026 12:39:52 +0200 Subject: [PATCH 075/100] Add Celluloid & yt-dlp to graphical system packages --- graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphical.nix b/graphical.nix index 324382b..432e664 100644 --- a/graphical.nix +++ b/graphical.nix @@ -26,6 +26,7 @@ # Graphical programs. blanket + celluloid gnome-calculator loupe # We don't use programs.nm-applet.enable because that also creates an enabled systemd unit for @@ -35,6 +36,7 @@ sublime-merge pkgs-unstable.overskride pkgs-unstable.pwvucontrol + pkgs-unstable.yt-dlp # Icon themes. From 7e564e1c409ede959103a882d6f9767383893bb0 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 26 Oct 2026 13:52:22 +0100 Subject: [PATCH 076/100] Add hosts entry for Vivian's travel router --- ruysch.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruysch.nix b/ruysch.nix index b0d96b6..488a61b 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -108,6 +108,11 @@ networking = { hostName = "ruysch"; networkmanager.enable = true; + + hosts = { + "fdef:4d4b:17b2::1" = [ "travel-router-vivian" ]; + "10.0.0.1" = [ "travel-router-vivian" ]; + }; }; environment = { From 95268f74d186acaa2beee533cb9635de5f8d1d99 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 27 Oct 2026 17:27:37 +0100 Subject: [PATCH 077/100] Add yet another office Dell monitor to Niri config --- ruysch-graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 8c51223..1daf543 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -128,6 +128,7 @@ // TandemDrive office monitors. output "Dell Inc. DELL P2715Q V48W26AB160L" { scale 1.25; } + output "Dell Inc. DELL P2715Q V48W263V308S" { scale 1.25; } output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; } output "LG Electronics LG HDR 4K 0x0005C746" { scale 1.25; } output "LG Electronics LG Ultra HD 0x00020FEA" { scale 1.25; } From 2ad421eb061ec69601e45f3b444752c27c686005 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 27 Oct 2026 17:28:23 +0100 Subject: [PATCH 078/100] Re-enable Claude Code auto mode, disable surveys --- ruysch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruysch.nix b/ruysch.nix index 488a61b..7714672 100644 --- a/ruysch.nix +++ b/ruysch.nix @@ -156,11 +156,11 @@ # Personal config. - disableAutoMode = "disable"; env = { CLAUDE_CODE_ENABLE_AWAY_SUMMARY = 0; CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION = "false"; }; + feedbackSurveyRate = 0; modelSettings.claude-opus-5-5.effortLevel = "high"; # Default is dark. theme = "auto"; From 9e07e613f789e483d4e008978745336b7beef95d Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 28 Oct 2026 14:00:41 +0100 Subject: [PATCH 079/100] Update flake dependencies --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 55800dd..37c3841 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1792503832, - "narHash": "sha256-WsqPR04nPS1bi5bYva04cJJcJyHw7x/rbaJmoXMzF04=", + "lastModified": 1792739756, + "narHash": "sha256-s0TeXWG5Ci75Y/Hzon0Z7NrN/fG773Rc54/z6oPFszQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "936ced36ecd25fcbd9b4789184b88aa2e4c2a901", + "rev": "fa627f4c8b8e92f58f58a73d99ee4e1304e64eb2", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1792309949, - "narHash": "sha256-2DAEMk8YkV8OF6N2uw9jQ016cYoNkcgnq50AShwWxNw=", + "lastModified": 1792915725, + "narHash": "sha256-v75hPw5NJ+mRRcwUzKi2OQtVSVv1hgq6ceAlPQB2kEE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "1b4d1758fa6053c5d6284254a793134fa602fbff", + "rev": "93696586f3463024cceb089353539be95a38ae2b", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1792615934, - "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=", + "lastModified": 1793015021, + "narHash": "sha256-Ee5BWo8sh3pGt70QUdRajnaginqFmWvrtdBc4gJzhks=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36", + "rev": "718f670e845328e9c2cecdd832835712b2cbd065", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1792502884, - "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", + "lastModified": 1792773339, + "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", + "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504", "type": "github" }, "original": { From 2d6db9f95218999683ca4f8d5d28c447026cf8a2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 28 Oct 2026 14:00:52 +0100 Subject: [PATCH 080/100] Disable automatic screen lock --- ruysch-graphical.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/ruysch-graphical.nix b/ruysch-graphical.nix index 1daf543..f1a6a38 100644 --- a/ruysch-graphical.nix +++ b/ruysch-graphical.nix @@ -70,7 +70,6 @@ "/home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies" spawn-at-startup "${ironbar}" spawn-at-startup "${wl-gammarelay-rs}" - spawn-at-startup "${swayidle}" "timeout" "600" "${hyprlock}" spawn-at-startup "${mako}" From 4e39b5395bd7d5283d68cb8474162d46a5256c2e Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 28 Oct 2026 14:04:20 +0100 Subject: [PATCH 081/100] Move NixOS infrastructure into subdirectory --- .gitignore => nixos/.gitignore | 0 {assets => nixos/assets}/openssh-authorized-keys | 0 {assets => nixos/assets}/wallpaper-macos-swirlies | Bin common.nix => nixos/common.nix | 0 flake.lock => nixos/flake.lock | 0 flake.nix => nixos/flake.nix | 0 graphical.nix => nixos/graphical.nix | 0 readme.md => nixos/readme.md | 0 ruysch-graphical.nix => nixos/ruysch-graphical.nix | 0 ruysch.nix => nixos/ruysch.nix | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => nixos/.gitignore (100%) rename {assets => nixos/assets}/openssh-authorized-keys (100%) rename {assets => nixos/assets}/wallpaper-macos-swirlies (100%) rename common.nix => nixos/common.nix (100%) rename flake.lock => nixos/flake.lock (100%) rename flake.nix => nixos/flake.nix (100%) rename graphical.nix => nixos/graphical.nix (100%) rename readme.md => nixos/readme.md (100%) rename ruysch-graphical.nix => nixos/ruysch-graphical.nix (100%) rename ruysch.nix => nixos/ruysch.nix (100%) diff --git a/.gitignore b/nixos/.gitignore similarity index 100% rename from .gitignore rename to nixos/.gitignore diff --git a/assets/openssh-authorized-keys b/nixos/assets/openssh-authorized-keys similarity index 100% rename from assets/openssh-authorized-keys rename to nixos/assets/openssh-authorized-keys diff --git a/assets/wallpaper-macos-swirlies b/nixos/assets/wallpaper-macos-swirlies similarity index 100% rename from assets/wallpaper-macos-swirlies rename to nixos/assets/wallpaper-macos-swirlies diff --git a/common.nix b/nixos/common.nix similarity index 100% rename from common.nix rename to nixos/common.nix diff --git a/flake.lock b/nixos/flake.lock similarity index 100% rename from flake.lock rename to nixos/flake.lock diff --git a/flake.nix b/nixos/flake.nix similarity index 100% rename from flake.nix rename to nixos/flake.nix diff --git a/graphical.nix b/nixos/graphical.nix similarity index 100% rename from graphical.nix rename to nixos/graphical.nix diff --git a/readme.md b/nixos/readme.md similarity index 100% rename from readme.md rename to nixos/readme.md diff --git a/ruysch-graphical.nix b/nixos/ruysch-graphical.nix similarity index 100% rename from ruysch-graphical.nix rename to nixos/ruysch-graphical.nix diff --git a/ruysch.nix b/nixos/ruysch.nix similarity index 100% rename from ruysch.nix rename to nixos/ruysch.nix From 2b47a8ecf881a6336a5838afd0ec1360f9a5f94c Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 29 Oct 2026 14:30:48 +0100 Subject: [PATCH 082/100] Make Signal window 50% width --- nixos/ruysch-graphical.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/ruysch-graphical.nix b/nixos/ruysch-graphical.nix index f1a6a38..fcf53af 100644 --- a/nixos/ruysch-graphical.nix +++ b/nixos/ruysch-graphical.nix @@ -261,7 +261,6 @@ window-rule { match app-id="firefox" is-floating=false match app-id="jetbrains-rustrover" is-floating=false - match app-id="signal" is-floating=false match app-id="spotify" is-floating=false match app-id="sublime_merge" is-floating=false match app-id="thunderbird" is-floating=false @@ -269,6 +268,14 @@ default-column-width { proportion 0.75; } } + // 50% width windows. + + window-rule { + match app-id="signal" is-floating=false + + default-column-width { proportion 0.5; } + } + // Floated windows. window-rule { From f0503246dc681ce718ee9430dca56da5e7ed2b28 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Sun, 1 Nov 2026 22:44:03 +0100 Subject: [PATCH 083/100] Update nixpkgs and nixpkgs-unstable --- nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 37c3841..8a8dca7 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1793015021, - "narHash": "sha256-Ee5BWo8sh3pGt70QUdRajnaginqFmWvrtdBc4gJzhks=", + "lastModified": 1793294725, + "narHash": "sha256-loLMnbbS4KhmG2ln9EY6f0YMNCA273Yx02oWYQ9IMeE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "718f670e845328e9c2cecdd832835712b2cbd065", + "rev": "6f06d204d8f2d8761d9da78778745974a3216381", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1792773339, - "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=", + "lastModified": 1793110635, + "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504", + "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010", "type": "github" }, "original": { From 6c97f7075511b5b441379139e53ef298d7ec8560 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Sun, 1 Nov 2026 22:44:25 +0100 Subject: [PATCH 084/100] Add android-tools to CLI packages --- nixos/graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/graphical.nix b/nixos/graphical.nix index 432e664..9f81363 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -19,6 +19,7 @@ environment.systemPackages = with pkgs; [ # CLI programs. + android-tools # TODO: Consider replacing with ddcutil-service. ddcutil wl-clipboard From ac4bfc4af29a1f1fb3ad18a0a5a10f64fdca64fe Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 2 Nov 2026 00:10:50 +0100 Subject: [PATCH 085/100] Add ouch as archive handling tool to CLI packages --- nixos/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/common.nix b/nixos/common.nix index 3a7ba51..4f8d890 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -12,6 +12,7 @@ lsof nix-diff nix-tree + ouch pv usbutils tealdeer From 56b42a223791f210ff71bd05c15d390e0e8476d8 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 2 Nov 2026 00:23:46 +0100 Subject: [PATCH 086/100] Persist ~/.android as machine state --- nixos/graphical.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/graphical.nix b/nixos/graphical.nix index 9f81363..d677e89 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -121,9 +121,14 @@ ".config/spotify" ".thunderbird" ]; - "/mnt/machine-state".directories = [ - "/var/lib/bluetooth" - ]; + "/mnt/machine-state" = { + directories = [ + "/var/lib/bluetooth" + ]; + users.rei.directories = [ + ".android" + ]; + }; }; etc = { From 3fe2979ca08af92327f642f908d3702d37d9757f Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 2 Nov 2026 21:06:55 +0100 Subject: [PATCH 087/100] Add yt-dlp alias to include subtitles by default --- nixos/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/common.nix b/nixos/common.nix index 4f8d890..5c68cc6 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -76,6 +76,7 @@ dust = "dust --limit-filesystem"; "mkfs.ntfs" = "mkfs.ntfs --quick"; nix-shell = "nix-shell --run $SHELL"; + yt-dlp = "yt-dlp --write-subs"; # Command shortcuts. From 0b6b760de4aaa5e87b4e439b9a7ebab0bae053c2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 3 Nov 2026 11:39:33 +0100 Subject: [PATCH 088/100] Update dependencies --- nixos/flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 8a8dca7..ff50de4 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1792915725, - "narHash": "sha256-v75hPw5NJ+mRRcwUzKi2OQtVSVv1hgq6ceAlPQB2kEE=", + "lastModified": 1793543282, + "narHash": "sha256-PHtGxKYM99f8WhGR5YD7iiCiwemKa2wUD4yVI2oALFg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "93696586f3463024cceb089353539be95a38ae2b", + "rev": "cee0f879d338cf08f814210fa6c2b280594ade0a", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1793294725, - "narHash": "sha256-loLMnbbS4KhmG2ln9EY6f0YMNCA273Yx02oWYQ9IMeE=", + "lastModified": 1793633738, + "narHash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f06d204d8f2d8761d9da78778745974a3216381", + "rev": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1793110635, - "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=", + "lastModified": 1793540411, + "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010", + "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f", "type": "github" }, "original": { From 4c47b8d6dced36387509040648061107520cbadc Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 3 Nov 2026 11:39:45 +0100 Subject: [PATCH 089/100] Add Obsidian to graphical packages --- nixos/graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/graphical.nix b/nixos/graphical.nix index d677e89..71f3e14 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -33,6 +33,7 @@ # We don't use programs.nm-applet.enable because that also creates an enabled systemd unit for # the applet. We just want nm-connection-editor. networkmanagerapplet + obsidian spotify sublime-merge pkgs-unstable.overskride From 9eb863d6f6e0620b5829a63e005b053a52a3f6f2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Wed, 4 Nov 2026 10:49:00 +0100 Subject: [PATCH 090/100] Yet another office Dell monitor --- nixos/ruysch-graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/ruysch-graphical.nix b/nixos/ruysch-graphical.nix index fcf53af..d6a3e22 100644 --- a/nixos/ruysch-graphical.nix +++ b/nixos/ruysch-graphical.nix @@ -127,6 +127,7 @@ // TandemDrive office monitors. output "Dell Inc. DELL P2715Q V48W26AB160L" { scale 1.25; } + output "Dell Inc. DELL P2715Q V48W26AB261L" { scale 1.25; } output "Dell Inc. DELL P2715Q V48W263V308S" { scale 1.25; } output "Dell Inc. DELL U3225QE GTC9C84" { mode "3840x2160@120"; } output "LG Electronics LG HDR 4K 0x0005C746" { scale 1.25; } From 48b134d080b2c869c3b46eecfff7d34288bafca2 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Fri, 6 Nov 2026 15:21:09 +0100 Subject: [PATCH 091/100] Style Mako notifications --- nixos/graphical.nix | 1 + nixos/ruysch-graphical.nix | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/graphical.nix b/nixos/graphical.nix index 71f3e14..2187526 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -105,6 +105,7 @@ }; }; + # TODO: Replace all these with CLI arguments / environment variables. systemd.user.tmpfiles.rules = [ "d /home/rei/.config/niri 0755 rei users" "L /home/rei/.config/niri/config.kdl - - - - /etc/niri/config.kdl" diff --git a/nixos/ruysch-graphical.nix b/nixos/ruysch-graphical.nix index d6a3e22..5dcb81c 100644 --- a/nixos/ruysch-graphical.nix +++ b/nixos/ruysch-graphical.nix @@ -65,12 +65,21 @@ wl-gammarelay-rs = "${pkgs.wl-gammarelay-rs}/bin/wl-gammarelay-rs"; wlr-randr = "${pkgs.wlr-randr}/bin/wlr-randr"; in { + "mako/config".text = '' + font=Fira Sans Condensed 11 + background-color=#000000 + width=400 + border-size=0 + padding=10 + default-timeout=2000 + ''; + "niri/config.kdl".text = '' spawn-at-startup "${swaybg}" "--image" \ "/home/rei/projects/infrastructure/nixos/assets/wallpaper-macos-swirlies" spawn-at-startup "${ironbar}" spawn-at-startup "${wl-gammarelay-rs}" - spawn-at-startup "${mako}" + spawn-at-startup "${mako}" "--config" "/etc/mako/config" From 8e40d33bb2c4a2e568395f8c7986f36d47432333 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Fri, 6 Nov 2026 15:26:51 +0100 Subject: [PATCH 092/100] Update packages --- nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index ff50de4..9255c2c 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1793633738, - "narHash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=", + "lastModified": 1793865203, + "narHash": "sha256-/cpdPHaySDIyCgZI6EWngiM6jK3YLUNzv1b7lTzy6Bk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd", + "rev": "c56a87d8e41ce69bd2af57eb35dcc117a9dfca33", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1793540411, - "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=", + "lastModified": 1793726008, + "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f", + "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", "type": "github" }, "original": { From b1f992ecdf7de78f7341d26865bf3eb33f08b8c0 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 9 Nov 2026 12:11:21 +0100 Subject: [PATCH 093/100] Update packages --- nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 9255c2c..8676c1d 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1793543282, - "narHash": "sha256-PHtGxKYM99f8WhGR5YD7iiCiwemKa2wUD4yVI2oALFg=", + "lastModified": 1794132860, + "narHash": "sha256-iGNtQnUZsi+v6/4NbtYr+dsmASa6GkzXtUcTpE8F3mE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "cee0f879d338cf08f814210fa6c2b280594ade0a", + "rev": "af9249ca33bc2efaae5d071e4c67ddef19dcb681", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1793726008, - "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=", + "lastModified": 1794042290, + "narHash": "sha256-ziZn2PvCJE5JEEpqTdxXwJpPB+L3YqoCpTAMCzyaP3U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", + "rev": "f4a03c008967841f2a0b3cb7c436fc6fc31671f6", "type": "github" }, "original": { From 67b95550ed9b0c0dd5126784b676b13448a91c6e Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 9 Nov 2026 12:11:38 +0100 Subject: [PATCH 094/100] Increase notification timeout to 5 seconds --- nixos/ruysch-graphical.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/ruysch-graphical.nix b/nixos/ruysch-graphical.nix index 5dcb81c..19deb23 100644 --- a/nixos/ruysch-graphical.nix +++ b/nixos/ruysch-graphical.nix @@ -71,7 +71,7 @@ width=400 border-size=0 padding=10 - default-timeout=2000 + default-timeout=5000 ''; "niri/config.kdl".text = '' From 0051334da60c90f6ea7b17f60163e045f0973e40 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 10 Nov 2026 11:30:06 +0100 Subject: [PATCH 095/100] Add Obsidian dir to machine state, add todo for Spotify dir --- nixos/graphical.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/graphical.nix b/nixos/graphical.nix index 2187526..a0cd464 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -120,6 +120,7 @@ "projects" "screenshots" ".config/mozilla/firefox" + # TODO: Move to machine state. ".config/spotify" ".thunderbird" ]; @@ -129,6 +130,7 @@ ]; users.rei.directories = [ ".android" + ".config/obsidian" ]; }; }; From 8c521fe6d2abbc9bfad5f76d00c5894a06ff51a3 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Tue, 10 Nov 2026 12:08:07 +0100 Subject: [PATCH 096/100] Add Obsidian & Signal to 75% width windows --- nixos/ruysch-graphical.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/ruysch-graphical.nix b/nixos/ruysch-graphical.nix index 19deb23..cbb4542 100644 --- a/nixos/ruysch-graphical.nix +++ b/nixos/ruysch-graphical.nix @@ -271,6 +271,8 @@ window-rule { match app-id="firefox" is-floating=false match app-id="jetbrains-rustrover" is-floating=false + match app-id="md.obsidian.Obsidian" is-floating=false + match app-id="signal" is-floating=false match app-id="spotify" is-floating=false match app-id="sublime_merge" is-floating=false match app-id="thunderbird" is-floating=false @@ -278,14 +280,6 @@ default-column-width { proportion 0.75; } } - // 50% width windows. - - window-rule { - match app-id="signal" is-floating=false - - default-column-width { proportion 0.5; } - } - // Floated windows. window-rule { From 1fd273ceba9408f4dcf8c55f9a2ee21f4685a8c6 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 12 Nov 2026 14:15:06 +0100 Subject: [PATCH 097/100] Update packages --- nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 8676c1d..2649f5b 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1793865203, - "narHash": "sha256-/cpdPHaySDIyCgZI6EWngiM6jK3YLUNzv1b7lTzy6Bk=", + "lastModified": 1794165970, + "narHash": "sha256-XuAV2cUwaod3Bt4XFVqiXz3v1w2ex16W6Sv4S7EWres=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c56a87d8e41ce69bd2af57eb35dcc117a9dfca33", + "rev": "ac588ef1c914865dad517b337ea0eb9694a4021c", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1794042290, - "narHash": "sha256-ziZn2PvCJE5JEEpqTdxXwJpPB+L3YqoCpTAMCzyaP3U=", + "lastModified": 1794192123, + "narHash": "sha256-SvB8u5qaJAOwZZyZciqTVOg/rBoUs2w0sFTU6ED51AQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f4a03c008967841f2a0b3cb7c436fc6fc31671f6", + "rev": "177d0540942fb205af6993b1d5fa0b57799e09f8", "type": "github" }, "original": { From adc80cceb5a9d3f224f77e563779fedfcd32562c Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 16 Nov 2026 14:26:47 +0100 Subject: [PATCH 098/100] Use dark GTK colour scheme --- nixos/graphical.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/graphical.nix b/nixos/graphical.nix index a0cd464..db1f413 100644 --- a/nixos/graphical.nix +++ b/nixos/graphical.nix @@ -69,12 +69,13 @@ settings = { "ca/desrt/dconf-editor".show-warning = false; "org/gnome/desktop/interface" = { + accent-color = "purple"; + color-scheme = "prefer-dark"; font-hinting = "none"; font-name = "Fira Sans Condensed 11"; - gtk-theme = "adw-gtk3"; + gtk-theme = "adw-gtk3-dark"; monospace-font-name = "Fira Mono 10"; }; - "org/gnome/desktop/interface".accent-color = "purple"; "org/gnome/desktop/wm/preferences".button-layout = ""; "org/gnome/nautilus/icon-view".default-zoom-level = "large"; "org/gnome/nautilus/list-view".default-zoom-level = "small"; From 18746a8d4960b914dd7eef2d98d1beb1fb3bdc44 Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Mon, 16 Nov 2026 14:27:00 +0100 Subject: [PATCH 099/100] Update packages --- nixos/flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 2649f5b..2689634 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1794132860, - "narHash": "sha256-iGNtQnUZsi+v6/4NbtYr+dsmASa6GkzXtUcTpE8F3mE=", + "lastModified": 1794739050, + "narHash": "sha256-PCGNIyAydZcdUXCxEXTjrS1+wWS+k9E+ENqBkUK2Mpg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "af9249ca33bc2efaae5d071e4c67ddef19dcb681", + "rev": "9bd074026d6db75b59aae8cd6071b5f2fe27a36c", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1794165970, - "narHash": "sha256-XuAV2cUwaod3Bt4XFVqiXz3v1w2ex16W6Sv4S7EWres=", + "lastModified": 1794552581, + "narHash": "sha256-qXFIqA6FCcx7XeDzw0ZNlkDT9UiCzrNDwK8RuU8RcHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac588ef1c914865dad517b337ea0eb9694a4021c", + "rev": "f1e5c356f35d07e7b71a6b5e6c9338e0b029e0c0", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1794192123, - "narHash": "sha256-SvB8u5qaJAOwZZyZciqTVOg/rBoUs2w0sFTU6ED51AQ=", + "lastModified": 1794537146, + "narHash": "sha256-Wpz/7x/YWnDIBu7yj6ixe8j6fIMsidd9Y+o1PqPF3iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "177d0540942fb205af6993b1d5fa0b57799e09f8", + "rev": "d5cc6833999746cffdfe0598f7bc801a57b887a9", "type": "github" }, "original": { From e8b3d73a6d296bd5beb461939a194fbf5393a81e Mon Sep 17 00:00:00 2001 From: Rei Meliesie Date: Thu, 19 Nov 2026 11:56:09 +0100 Subject: [PATCH 100/100] Update packages --- nixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 2689634..f2673a3 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1794552581, - "narHash": "sha256-qXFIqA6FCcx7XeDzw0ZNlkDT9UiCzrNDwK8RuU8RcHM=", + "lastModified": 1794872590, + "narHash": "sha256-E+XLAfnC7+bdr4qlEgRv6cdGmiqTU5oeFNKCha7epqQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1e5c356f35d07e7b71a6b5e6c9338e0b029e0c0", + "rev": "f68407657ad294471eb4b2e65d193df26edf729f", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1794537146, - "narHash": "sha256-Wpz/7x/YWnDIBu7yj6ixe8j6fIMsidd9Y+o1PqPF3iM=", + "lastModified": 1794890597, + "narHash": "sha256-lME2lHoDHAaSHP3/okgiVoJ0icVEvsQH8LeU3We7tcc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d5cc6833999746cffdfe0598f7bc801a57b887a9", + "rev": "04906337b6d53e8bb0eaf0470ae9f070a4d4eb55", "type": "github" }, "original": {