moar -> moor

flake.nix

@@ -121,6 +121,10 @@
               networking.hostName = x;
               imports = modules ++ [ (./instances/${x}) ];
               _module.args.otherNodes = lib.filterAttrs (n: v: n != x) nodes;
+              deployment.privilegeEscalationCommand = [
+                "run0"
+                "--unit=colmena-apply"
+              ];
             };
         }) n;
     in
@@ -134,10 +138,6 @@
                   specialArgs = { inherit inputs; };
                   nixpkgs = genPkgs "x86_64-linux";
                 };
-                deployment.privilegeEscalationCommand = [
-                  "run0"
-                  "--unit=colmena-apply"
-                ];
               }
               (importConfigs [
                 "ds9"

hm-modules/git.nix

@@ -9,13 +9,14 @@ in
 {
   options.xyno.git.enable = lib.mkEnableOption "xynos git config";
   config = lib.mkIf cfg.enable {
+    programs.difftastic.git.enable = true;
+    programs.difftastic.enable = true;
     programs.git = {
       enable = true;
-      difftastic.enable = true;
       lfs.enable = true;
 
       # Default configs
-      extraConfig = {
+      settings = {
         commit.gpgSign = true;
         gpg.format = "ssh";
 

modules/presets/cli.nix

@@ -130,7 +130,7 @@ in
       imagemagick
       jq
       lm_sensors
-      moar
+      moor
       neofetch
       nix-output-monitor
       poppler
@@ -145,7 +145,7 @@ in
     programs.mosh.enable = true;
     environment.variables.EDITOR = "hx";
     environment.variables.VISUAL = "hx";
-    environment.variables.PAGER = "moar";
+    environment.variables.PAGER = "moor";
 
     environment.shellAliases = {
       l = "ls -alh";
@@ -161,7 +161,7 @@ in
       p = "cd ~/proj";
       ytl = ''yt-dlp -f "bv*+mergeall[vcodec=none]" --audio-multistreams'';
       sudo = "run0";
-      less = "moar";
+      less = "moor";
     };
   };
 }