refactoring

flake.lock

@@ -88,11 +88,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1748626360,
+        "lastModified": 1748800559,
-        "narHash": "sha256-ZWaR0pZdOPz693FrIcL9R6Uqb02Gg1WuIfaXP0+DnUQ=",
+        "narHash": "sha256-aGirnvHHbYKn2Gk8KU1G2kXTKjM3YRmO2H0bLk3uVas=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "f7dd02872d4acc406355965a6c9bbb4f14782400",
+        "rev": "9153c6719aff5ba4faf817e90d82e9c2f8b886a1",
         "type": "github"
       },
       "original": {
@@ -375,11 +375,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748648449,
+        "lastModified": 1748737919,
-        "narHash": "sha256-5mhG43yYEEpLxEp6e683A8YiW4JHmWihF7XECjMM6Ns=",
+        "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7c60ea029602851cdeb2f3246e991fcc117195bc",
+        "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
         "type": "github"
       },
       "original": {
@@ -784,11 +784,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1748609405,
+        "lastModified": 1748797644,
-        "narHash": "sha256-tuhbZf+oQ6lvBRN7iySy9ZeY9sMVtlAzQvDBBrvwEsk=",
+        "narHash": "sha256-zLkSMDE/4kEK+1q0Ep0fmSO7PJ/3ZxovvYNIA5TuN4I=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "73bcebf1ac79a9a31e29ffd08bcd982c7301d8fc",
+        "rev": "2036ef9e1bfac9d50d96c0771a412226b6998ba5",
         "type": "github"
       },
       "original": {
@@ -817,11 +817,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1748151941,
+        "lastModified": 1748794937,
-        "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
+        "narHash": "sha256-LQfI1BlFm+JeZGjg0MPKdsmyupETu/9HzGmxVd0G4fw=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
+        "rev": "1911cf3f55ac3d9d24c8692434a93214dcbde9ba",
         "type": "github"
       },
       "original": {
@@ -1086,11 +1086,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1748460289,
+        "lastModified": 1748693115,
-        "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
         "type": "github"
       },
       "original": {
@@ -1624,11 +1624,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1748623187,
+        "lastModified": 1748740817,
-        "narHash": "sha256-Er9d/5F34c2Uw+DN/9j+j7TdeWiSxMQlZSgsATC04cM=",
+        "narHash": "sha256-Vj4QAPNXONRmpL9LdmZt2DTqLCqgIBFjuseQprs9Kvg=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "b65a88075a824e4304dca5428ba05de1404fa635",
+        "rev": "d5038eeed52a459fa43b953c3b42a65a1b0d922c",
         "type": "github"
       },
       "original": {
@@ -1645,11 +1645,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748643537,
+        "lastModified": 1748802344,
-        "narHash": "sha256-jHbSTgaqLdA/yFNp4eZzy1/7Mb0YY4YEzsVwAWrkVDc=",
+        "narHash": "sha256-2AkocqhzYQzxAGNXYEkzmud2vWXMjvLNPMnLNpuHmRU=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "6dd55058eda4e71a6107204338ce71e70b81fed0",
+        "rev": "062cbe2ec0e5c885098172b91d571599e7649c76",
         "type": "github"
       },
       "original": {

hosts/eddie/configuration.nix

@@ -8,7 +8,8 @@
     ./razer-speaker-fix.nix
     ./boot.nix
     ./hardware.nix
-    ./packages
+    ./packages.nix
+    ./udev.nix
 
     btrfs-conf
 
@@ -150,62 +151,6 @@
       IdleActionSec=15m
     '';
   };
-  services.udev = {
-    extraRules = ''
-    KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
-    DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660"
-    ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chgrp video /sys/class/backlight/%k/brightness"
-    ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chmod a+w /sys/class/backlight/%k/brightness"
-    ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="AMDGPU DM*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service"
-    ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="NVIDIA i2c adapter*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service"
-    SUBSYSTEM=="i2c", ACTION=="add", ATTR{name}=="AMDGPU DM aux hw bus 3", RUN+="${pkgs.bash}/bin/bash -c 'sleep 30; printf ddcci\ 0x37 > /sys/bus/i2c/devices/i2c-17/new_device'"
-    '';
-    packages = [
-      pkgs.via
-      pkgs.vial
-      pkgs.ddcutil
-      pkgs.game-devices-udev-rules
-      pkgs.sane-airscan
-      pkgs.utsushi
-      pkgs.openrgb-with-all-plugins
-
-      pkgs.gnome-settings-daemon
-      pkgs.gnome-keyring
-
-      (pkgs.writeTextFile {
-        name = "on-battery";
-        text = ''
-          # Rule for when switching to battery
-          SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set balanced"
-        '';
-        destination = "/etc/udev/rules.d/60-onbattery.rules";
-      })
-      (pkgs.writeTextFile {
-        name = "on-power";
-        text = ''
-          # Rule for when switching to ac
-          SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set performance"
-        '';
-        destination = "/etc/udev/rules.d/61-onpower.rules";
-      })
-      (pkgs.writeTextFile {
-        name = "hibernate-low-battery";
-        text = ''
-          # Suspend the system when battery level drops to 5% or lower
-          SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5]", RUN+="${pkgs.systemd}/bin/systemctl hibernate"
-        '';
-        destination = "/etc/udev/rules.d/99-hibernate-low-battery.rules";
-      })
-      (pkgs.writeTextFile {
-        name = "on-battery-power-saver";
-        text = ''
-          # Switch to power-saver when battery below 50%
-          SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5][0-9]", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set power-saver"
-        '';
-        destination = "/etc/udev/rules.d/62-power-save-battery.rules";
-      })
-    ];
-  };
 
   security = {
     polkit.enable = true;

hosts/eddie/udev.nix

@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+  services.udev = {
+    extraRules = ''
+    KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
+    DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660"
+    ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chgrp video /sys/class/backlight/%k/brightness"
+    ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chmod a+w /sys/class/backlight/%k/brightness"
+    ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="AMDGPU DM*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service"
+    ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="NVIDIA i2c adapter*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service"
+    SUBSYSTEM=="i2c", ACTION=="add", ATTR{name}=="AMDGPU DM aux hw bus 3", RUN+="${pkgs.bash}/bin/bash -c 'sleep 30; printf ddcci\ 0x37 > /sys/bus/i2c/devices/i2c-17/new_device'"
+    '';
+    packages = [
+      pkgs.via
+      pkgs.vial
+      pkgs.ddcutil
+      pkgs.game-devices-udev-rules
+      pkgs.sane-airscan
+      pkgs.utsushi
+      pkgs.openrgb-with-all-plugins
+
+      pkgs.gnome-settings-daemon
+      pkgs.gnome-keyring
+
+      (pkgs.writeTextFile {
+        name = "on-battery";
+        text = ''
+          # Rule for when switching to battery
+          SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set balanced"
+        '';
+        destination = "/etc/udev/rules.d/60-onbattery.rules";
+      })
+      (pkgs.writeTextFile {
+        name = "on-power";
+        text = ''
+          # Rule for when switching to ac
+          SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set performance"
+        '';
+        destination = "/etc/udev/rules.d/61-onpower.rules";
+      })
+      (pkgs.writeTextFile {
+        name = "hibernate-low-battery";
+        text = ''
+          # Suspend the system when battery level drops to 5% or lower
+          SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5]", RUN+="${pkgs.systemd}/bin/systemctl hibernate"
+        '';
+        destination = "/etc/udev/rules.d/99-hibernate-low-battery.rules";
+      })
+      (pkgs.writeTextFile {
+        name = "on-battery-power-saver";
+        text = ''
+          # Switch to power-saver when battery below 50%
+          SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5][0-9]", RUN+="${pkgs.power-profiles-daemon}/bin/powerprofilesctl set power-saver"
+        '';
+        destination = "/etc/udev/rules.d/62-power-save-battery.rules";
+      })
+    ];
+  };
+}

modules/home/shell-conf.nix

@@ -135,10 +135,6 @@
       enable = true;
       package = (pkgs.ripgrep.override {withPCRE2 = true;});
     };
-    thefuck = {
-      enableFishIntegration = true;
-      enable = true;
-    };
     wezterm = {
       enable = true;
       package = inputs.wezterm.packages.${pkgs.system}.default;

modules/system/kanata.nix

@@ -31,7 +31,17 @@ let
   tap-copy (tap-dance 150 (c C-c))
 )
 '';
+  basic-nav = ''
+  y home
+  u pgdn
+  i pgup
+  o end
 
+  h left
+  j down
+  k up
+  l right
+'';
 in
 {
   environment.systemPackages = [
@@ -97,15 +107,7 @@ ${shared-alias}
   - f11
   = f12
 
-  y home
+  ${basic-nav}
-  u pgdn
-  i pgup
-  o end
-
-  h left
-  j down
-  k up
-  l right
 
   rsft up
   menu down
@@ -159,16 +161,7 @@ ${shared-alias}
   @supesc lalt @ctrl-ret     @spcnav            @ctrl-ret ralt)
 
 (deflayermap (navigation)
-  y home
+  ${basic-nav}
-  u pgdn
-  i pgup
-  o end
-
-  h left
-  j down
-  k up
-  l right
-
   ___ _)
 
 '';