Don't start tmux after cloning

Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1761656077,
+        "lastModified": 1762618334,
-        "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
     "bop-scripts": {
       "flake": false,
       "locked": {
-        "lastModified": 1760234399,
+        "lastModified": 1762468291,
-        "narHash": "sha256-SpQ4TMOsYCr9EoCdUZ1GeX5cOoPHfxEYyRakYznc91w=",
+        "narHash": "sha256-kvhro91rmPgSX8LYLTsesLJlOlKp1YJsIg9e+Cb9u6o=",
         "owner": "breadonpenguins",
         "repo": "scripts",
-        "rev": "1396a09a206dbd6f9a08ffa7a5603e6d55ae5f00",
+        "rev": "c1c94c3f4b89076dc8f788fae12f639dda663ddb",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761899396,
+        "lastModified": 1762276996,
-        "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=",
+        "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998",
+        "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1760948891,
+        "lastModified": 1762440070,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
         "rev": "19591ad8e1f3c261e84b487307c8534dd67a3707",
         "revCount": 37,
         "type": "git",
-        "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
+        "url": "https://git.oliverdavies.uk/opdavies/git-repo-updater"
       },
       "original": {
         "type": "git",
-        "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
+        "url": "https://git.oliverdavies.uk/opdavies/git-repo-updater"
       }
     },
     "home-manager": {
@@ -232,11 +232,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761878381,
+        "lastModified": 1762721397,
-        "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
+        "narHash": "sha256-E428EuouA4nFTNlLuqlL4lVR78X+EbBIqDqsBFnB79w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
+        "rev": "b8645b18b0f5374127bbade6de7381ef0b3d5720",
         "type": "github"
       },
       "original": {
@@ -248,11 +248,11 @@
     },
     "import-tree": {
       "locked": {
-        "lastModified": 1761120675,
+        "lastModified": 1762327901,
-        "narHash": "sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA=",
+        "narHash": "sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM=",
         "owner": "vic",
         "repo": "import-tree",
-        "rev": "a037ed2a58fc0ebed9e93b9ef79b0646e648f719",
+        "rev": "90fa129798be99cde036b78658e89475710966a1",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761451000,
+        "lastModified": 1762660502,
-        "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=",
+        "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4",
+        "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1761933221,
+        "lastModified": 1762463231,
-        "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=",
+        "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7467f155fcba189eb088a7601f44fbef7688669b",
+        "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226",
         "type": "github"
       },
       "original": {
@@ -327,11 +327,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761907660,
+        "lastModified": 1762596750,
-        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
+        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
+        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
         "type": "github"
       },
       "original": {
@@ -343,11 +343,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1754788789,
+        "lastModified": 1761765539,
-        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
         "type": "github"
       },
       "original": {
@@ -400,11 +400,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1761947009,
+        "lastModified": 1762691346,
-        "narHash": "sha256-yutWdFO7EkJGdQOquwHvyWZ+3KpPowzy+v1xb8IA/K4=",
+        "narHash": "sha256-dyYnqvYrgViB22inBqNern/XSWtOiweP8NTfJQJeTis=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225",
+        "rev": "faf1fb4b7cd069ce44469e45c3259b7bcf106f81",
         "type": "github"
       },
       "original": {
@@ -421,11 +421,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762024599,
+        "lastModified": 1762724684,
-        "narHash": "sha256-bdC2Y1/wTa6VbOUyCDsHbL0UAi8M/nZUEEf6Omyko88=",
+        "narHash": "sha256-B24ywaTUd9BYkK3qHfl0MubCLnO4Bk8cRSQmIvfofco=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "64d040646b791571b0e3658bb934c7ce78c482bb",
+        "rev": "efc27c839b15d0ff15d58fb09035a93dea7f85f5",
         "type": "github"
       },
       "original": {
@@ -582,17 +582,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1762197997,
+        "lastModified": 1762731584,
-        "narHash": "sha256-gbCTy6PqSLmCFDeLy9l5Vebzy2stbHY5V555p+jnpTQ=",
+        "narHash": "sha256-qSN44lGSceoqkUeksXbEAcGPeTf9yJBGQMWafh8cZuw=",
         "ref": "refs/heads/main",
-        "rev": "c2ee61e54afabacd1571ad23fcdffaef195a8df7",
+        "rev": "184accfd1fadb9580f2af8873ce0f2a70eeb8b49",
-        "revCount": 141,
+        "revCount": 165,
         "type": "git",
-        "url": "https://code.oliverdavies.uk/opdavies/z"
+        "url": "https://git.oliverdavies.uk/opdavies/z"
       },
       "original": {
         "type": "git",
-        "url": "https://code.oliverdavies.uk/opdavies/z"
+        "url": "https://git.oliverdavies.uk/opdavies/z"
       }
     }
   },

flake.nix

@@ -21,7 +21,7 @@
       inputs.flake-parts.follows = "flake-parts";
       inputs.import-tree.follows = "import-tree";
       inputs.nixpkgs.follows = "nixpkgs";
-      url = "git+https://code.oliverdavies.uk/opdavies/git-repo-updater";
+      url = "git+https://git.oliverdavies.uk/opdavies/git-repo-updater";
     };
 
     home-manager = {
@@ -71,7 +71,7 @@
     z = {
       inputs.flake-parts.follows = "flake-parts";
       inputs.nixpkgs.follows = "nixpkgs";
-      url = "git+https://code.oliverdavies.uk/opdavies/z";
+      url = "git+https://git.oliverdavies.uk/opdavies/z";
     };
   };
 

hosts/nixedo/configuration.nix

@@ -48,6 +48,4 @@
     tree
     vim
   ];
-
-  security.sudo-rs.enable = lib.mkForce false;
 }

hosts/nixedo/modules/acme.nix

@@ -27,6 +27,7 @@
                 "eric"
                 "florida-drupalcamp-tailwind-css"
                 "freshrss"
+                "git"
                 "home"
                 "jellyfin"
                 "luke"

hosts/nixedo/modules/forgejo.nix

@@ -7,7 +7,7 @@
 
     settings = {
       server = {
-        DOMAIN = "code.oliverdavies.uk";
+        DOMAIN = "git.oliverdavies.uk";
         LANDING_PAGE = "explore";
         ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}";
         SSH_DOMAIN = "ssh.oliverdavies.uk";

hosts/nixedo/modules/nginx/oliverdavies.uk/default.nix

@@ -12,18 +12,20 @@ let
     root = "/var/www/vhosts/website-tome";
 
     paths = [
+      "core"
+      "sites/default/files"
+      "themes/custom/opdavies"
+
+      # TODO: move back to Sculpin.
       "archive"
       "automated-testing"
-      "core"
       "daily/.+"
       "examples"
       "homelab"
       "podcast"
       "rss/bb.xml"
       "rss/daily.xml"
-      "sites/default/files"
       "testing"
-      "themes/custom/opdavies"
     ];
 
     port = ports.nginx.website-tome;

hosts/t480/cron.nix

@@ -5,7 +5,7 @@
     enable = true;
 
     systemCronJobs = [
-      "*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/code.oliverdavies.uk/opdavies/email-filters/config.lua"
+      "*/15 * * * * opdavies ${pkgs.imapfilter}/bin/imapfilter -c ~/Repos/git.oliverdavies.uk/opdavies/email-filters/config.lua"
       "0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a"
     ];
   };

modules/hosts/t480/ollama.nix

@@ -1,3 +0,0 @@
-{
-  flake.modules.nixos.desktop.services.ollama.enable = false;
-}

modules/hosts/t480/open-webui.nix

@@ -1,5 +0,0 @@
-{
-  nixpkgs.allowedUnfreePackages = [ "open-webui" ];
-
-  flake.modules.nixos.desktop.services.open-webui.enable = false;
-}

modules/nixvim/fugitive.nix

@@ -0,0 +1,18 @@
+{
+  flake.modules.nixvim.custom = {
+    plugins.fugitive.enable = true;
+
+    keymaps = [
+      {
+        key = "<leader>gc";
+        action = "<cmd>Git commit<CR><C-w>K";
+      }
+
+      {
+        # Open the ":Git" window in its own buffer, not a split.
+        key = "<leader>gs";
+        action = "<cmd>0Git<CR>";
+      }
+    ];
+  };
+}

modules/nixvim/oil.nix

@@ -0,0 +1,24 @@
+{
+  flake.modules.nixvim.custom = {
+    plugins.oil = {
+      enable = true;
+
+      settings = {
+        delete_to_trash = true;
+
+        keymaps."-" = "actions.parent";
+
+        skip_confirm_for_simple_edits = true;
+        view_options.show_hidden = true;
+      };
+    };
+
+    keymaps = [
+      {
+        action = "<cmd>Oil<CR>";
+        key = "-";
+      }
+    ];
+  };
+}
+

modules/nixvim/qmk.nix

@@ -0,0 +1,18 @@
+{
+  flake.modules.nixvim.custom.plugins.qmk = {
+    enable = true;
+
+    settings = {
+      layout = [
+        "x x x x x _ _ _ _ _ _ _ _ _ x x x x x"
+        "x x x x x x _ _ _ _ _ _ _ x x x x x x"
+        "x x x x x x _ _ _ _ _ _ _ x x x x x x"
+        "x x x x x x _ _ _ _ _ _ _ x x x x x x"
+        "x x x x x x x x x _ x x x x x x x x x"
+        "x x x x x _ x x x _ x x x _ x x x x x"
+      ];
+      name = "LAYOUT_glove80";
+      variant = "zmk";
+    };
+  };
+}

modules/nixvim/treesitter.nix

@@ -11,6 +11,7 @@
             comment
             css
             csv
+            devicetree
             dockerfile
             gitattributes
             gitignore
@@ -41,7 +42,10 @@
             yaml
           ];
 
-          settings.highlight.enable = true;
+          settings = {
+            highlight.enable = true;
+            indent.enable = true;
+          };
         };
 
         treesitter-textobjects.enable = true;

modules/scripts/clone.nix

@@ -2,14 +2,13 @@
 
 {
   perSystem =
-    psArgs@{ pkgs, ... }:
+    { pkgs, ... }:
     {
       packages.clone = pkgs.writeShellApplication {
         name = "clone";
 
         runtimeInputs = with pkgs; [
           git
-          psArgs.config.packages.start-tmux
         ];
 
         text = ''
@@ -20,7 +19,7 @@
             domain="''${BASH_REMATCH[2]}"
 
             if [[ "$domain" == "ssh.oliverdavies.uk" ]]; then
-              domain="code.oliverdavies.uk"
+              domain="git.oliverdavies.uk"
             fi
 
             user="''${BASH_REMATCH[3]}"
@@ -34,8 +33,6 @@
             mkdir -pv "$repo_path"
 
             git clone "$repo_url" "$repo_path"
-
-            start-tmux "$repo_path"
           else
             exit 1
           fi

modules/scripts/open-repo-url.nix

@@ -15,7 +15,7 @@ in
         text = ''
           repo_url=$(git remote get-url origin | sed -E 's#(git|forgejo)@([A-Za-z0-9.-]+):#https://\2/#;s#.git$##')
 
-          repo_url="''${repo_url//ssh.oliverdavies.uk/code.oliverdavies.uk}"
+          repo_url="''${repo_url//ssh.oliverdavies.uk/git.oliverdavies.uk}"
 
           xdg-open "$repo_url"
         '';

modules/sudo.nix

@@ -2,8 +2,6 @@
 
 {
   flake.modules.nixos.pc = {
-    security.sudo-rs.enable = true;
-
     users.users.${config.flake.meta.owner.username}.extraGroups = [ "wheel" ];
   };
 }

modules/zsh/abbreviations/abbreviations.nix

@@ -131,6 +131,7 @@
     rduli = "run drush uli";
     rdup = "run drush updatedb -y";
     rpub = "run publish";
+    rs = "run switch";
     rt = "run test";
 
     nah = "git reset --hard; git clean -fd";
@@ -168,5 +169,8 @@
     sgsp = "vendor/bin/sculpin generate --server --port";
     sgsw = "vendor/bin/sculpin generate --server --watch";
     sgswp = "vendor/bin/sculpin generate --server --watch --port";
+
+    mnf = "man fzf";
+    mnt = "man tmux";
   };
 }

modules/zsh/init.nix

@@ -1,3 +1,5 @@
+{ lib, ... }:
+
 {
   flake.modules.homeManager.base =
     { config, pkgs, ... }:
@@ -47,6 +49,10 @@
           command ${pkgs.ttyper}/bin/ttyper --language english1000 --words 50 "''${@}"
         }
 
+        watchexec() {
+          ${lib.getExe pkgs.watchexec} --clear "$@"
+        }
+
         weather() {
           curl "https://wttr.in/''$1"
         }

notes.txt

@@ -1,6 +1,6 @@
 Running Neovim as a package:
 
 nix run .#neovim
-nix run git+https://code.oliverdavies.uk/opdavies/nix-config#neovim
+nix run git+https://git.oliverdavies.uk/opdavies/nix-config#neovim
 
 nixos-rebuild --flake .#nixedo --target-host 192.168.1.116 --sudo test