flake.lock

@@ -528,16 +528,16 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1705679158,
-        "narHash": "sha256-zAyiitJIgOCZTB0CmgNt0MHENM70SOHLIoWrVwOJKFg=",
+        "lastModified": 1726901409,
+        "narHash": "sha256-PYZ1/kmhZIdK0mGZP6Hikm4CIysbA88jUkXLUmbQB98=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "f197a15b0d1e8d555263af20add51450e5aaa1f0",
+        "rev": "929ca9c76ee20bb27cffbde4ee90583b6c54d616",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
-        "ref": "v0.9.2",
+        "ref": "master",
         "repo": "nvim-treesitter",
         "type": "github"
       }
@@ -733,16 +733,16 @@
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1721232722,
-        "narHash": "sha256-hJ6nBCgSyYF1pY4lX+b8WZd49i5F6BwOmrl7xVSIwRw=",
+        "lastModified": 1713792255,
+        "narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "48be57eaba817f038d61bbf64d2c597f578c0827",
+        "rev": "066cccf48a43553a80a210eb3be89a15d789d6e6",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
-        "ref": "v2.12.0",
+        "ref": "v2.11.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }

flake.nix

@@ -91,7 +91,7 @@
     };
     nvim-treesitter-src = {
       # https://github.com/nvim-treesitter/nvim-treesitter/tags
-      url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
+      url = "github:nvim-treesitter/nvim-treesitter/master";
       flake = false;
     };
     telescope-nvim-src = {
@@ -105,7 +105,7 @@
     };
     toggleterm-nvim-src = {
       # https://github.com/akinsho/toggleterm.nvim/tags
-      url = "github:akinsho/toggleterm.nvim/v2.12.0";
+      url = "github:akinsho/toggleterm.nvim/v2.11.0";
       flake = false;
     };
     bufferline-nvim-src = {

modules/common/default.nix

@@ -137,10 +137,6 @@
         type = lib.types.str;
         description = "Hostname for push notification services (ntfy).";
       };
-      status = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for status page (Uptime-Kuma).";
-      };
       transmission = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for peer2peer downloads (Transmission).";

modules/common/shell/fish/default.nix

@@ -76,10 +76,6 @@
           description = "Full git commit on notes";
           body = builtins.readFile ./functions/syncnotes.fish;
         };
-        _which = {
-          description = "Identify the path to a program in the shell";
-          body = "command --search (string sub --start=2 $argv)";
-        };
       };
       interactiveShellInit = ''
         fish_vi_key_bindings
@@ -105,13 +101,6 @@
         "-" = "cd -";
         mkd = "mkdir -pv";
 
-        # Convert a program into its full path
-        "=" = {
-          position = "anywhere";
-          regex = "=\\w+";
-          function = "_which";
-        };
-
         # System
         s = "sudo";
         sc = "systemctl";

modules/common/shell/git.nix

@@ -113,7 +113,6 @@ in
         gpd = "git push origin -d";
         gbd = "git branch -d";
         gbD = "git branch -D";
-        gdd = "git-delete-both";
         gr = "git reset";
         grh = "git reset --hard";
         gm = "git merge";
@@ -159,13 +158,6 @@ in
                 and git branch -D $branch
               '';
             };
-            git-delete-both = {
-              argumentNames = "branch";
-              body = ''
-                git push origin -d $branch
-                git branch -d $branch
-              '';
-            };
             git-merge-fuzzy = {
               body = ''
                 set branch (git-fuzzy-branch "merge from...")

modules/darwin/system.nix

@@ -23,8 +23,6 @@
 
     system = {
 
-      stateVersion = 5;
-
       keyboard = {
         remapCapsLockToControl = true;
         enableKeyMapping = true; # Allows for skhd

modules/nixos/services/uptime-kuma.nix

@@ -1,6 +1,13 @@
 { config, lib, ... }:
 {
 
+  options = {
+    hostnames.status = lib.mkOption {
+      type = lib.types.str;
+      description = "Hostname for status page (Uptime-Kuma).";
+    };
+  };
+
   config = lib.mkIf config.services.uptime-kuma.enable {
 
     services.uptime-kuma = {