flake.lock

@@ -930,22 +930,6 @@
         "type": "github"
       }
     },
-    "none-ls-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696658105,
-        "narHash": "sha256-4+B2F4ZweWTqXlhSs0jiBaKSv52G4X7p37KHfYl6sPo=",
-        "owner": "nvimtools",
-        "repo": "none-ls.nvim",
-        "rev": "ae339f45590cc421a68de885fc5a3261cc247362",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvimtools",
-        "repo": "none-ls.nvim",
-        "type": "github"
-      }
-    },
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
@@ -1056,7 +1040,6 @@
         "nix-lazy-nvim": "nix-lazy-nvim",
         "nix-super": "nix-super",
         "nixpkgs": "nixpkgs_8",
-        "none-ls-nvim": "none-ls-nvim",
         "nvim-lspconfig": "nvim-lspconfig",
         "nvim-puppeteer": "nvim-puppeteer",
         "nvim-treesitter": "nvim-treesitter",

flake.nix

@@ -48,8 +48,6 @@
     telekasten-nvim.url = "github:renerocksai/telekasten.nvim";
     telescope-nvim.flake = false;
     telescope-nvim.url = "github:nvim-telescope/telescope.nvim";
-    none-ls-nvim.flake = false;
-    none-ls-nvim.url = "github:nvimtools/none-ls.nvim";
 
     # Hyprland
     hypr-contrib.url = "github:hyprwm/contrib";

modules/profiles/base.nix

@@ -123,8 +123,10 @@ in
           "|" = "split-window -h";
           "C-l" = "send-keys C-l";
           "R" = "source-file $XDG_CONFIG_HOME/tmux/tmux.conf \\; display-message 'Reloaded tmux.conf'";
-          "f" = "new-window ts";
-          "a" = "new-window ta";
+        };
+        root = {
+          "C-f" = "new-window ts";
+          "C-a" = "new-window ta";
         };
         copy-mode-vi = {
           "v" = "send -X begin-selection";

modules/programs/nvim/default.nix

@@ -30,17 +30,12 @@ in
           [
             alejandra
             black
-            checkmake
             deadnix
-            dotenv-linter
-            fish
             isort
             jq
             nixd
             nixpkgs-fmt
             nodePackages.bash-language-server
-            nodePackages.jsonlint
-            ruff-lsp
             rustfmt
             shellcheck
             shfmt
@@ -51,7 +46,6 @@ in
             typst
             typst-lsp
             yamlfmt
-            yamllint
           ];
         extraLuaConfig = readFile ./options.lua;
         lazy.enable = true;

modules/programs/nvim/plugins/coding.nix

@@ -104,6 +104,7 @@ with builtins;
       event = [ "BufRead" "BufNewFile" ];
       conf = readFile ./lua/nvim-lspconfig.lua;
       dependencies = [
+        { plugin = lsp_signature-nvim; }
         {
           plugin = null-ls-nvim;
           conf = readFile ./lua/null-ls-nvim.lua;

modules/programs/nvim/plugins/lua/null-ls-nvim.lua

@@ -8,15 +8,9 @@ null_ls.setup({
     -- Completion
     null_ls.builtins.completion.spell,
     -- Diagnostics
-    null_ls.builtins.diagnostics.checkmake,
     null_ls.builtins.diagnostics.deadnix,
-    null_ls.builtins.diagnostics.dotenv_linter,
-    null_ls.builtins.diagnostics.fish,
-    null_ls.builtins.diagnostics.jsonlint,
     null_ls.builtins.diagnostics.shellcheck,
     null_ls.builtins.diagnostics.statix,
-    null_ls.builtins.diagnostics.trail_space,
-    null_ls.builtins.diagnostics.yamllint,
   },
 })
 

modules/programs/tmux/default.nix

@@ -19,7 +19,7 @@ let
 
   tmux-sessionizer = pkgs.writeFishApplication {
     name = "ts";
-    runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-switch gawk ];
+    runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-switch ];
     text = readFile ./tmux-sessionizer/script.fish;
     completions = readFile ./tmux-sessionizer/completions.fish;
   };
@@ -97,7 +97,7 @@ in
             if ! fish_is_root_user && test "$TERM_PROGRAM" != 'vscode' && ${insideVariableMissing}
                 if test -z $tmux_autostarted
                     set -x tmux_autostarted true
-                    tmux new -A -s home
+                    ts
                 end
             end
           '';

modules/programs/tmux/tmux-attach/script.fish

@@ -1,4 +1,4 @@
-set selected (tmux list-sessions -F '#{session_name}' 2>/dev/null | fzf --query "$argv")
+set selected (tmux list-sessions -F '#{session_name}' 2>/dev/null | fzf $argv)
 if not test -n "$selected"
   exit 1
 end

modules/programs/tmux/tmux-sessionizer/script.fish

@@ -1,10 +1,10 @@
-#!/usr/bin/env fish
 set pipe (mktemp --dry-run)
 mkfifo $pipe
 
-fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec-batch dirname {} | tee $pipe >/dev/null &
-fd . ~/ --min-depth 1 --max-depth 3 --type d --exec-batch realpath {} | tee $pipe >/dev/null &
-set selected (cat $pipe | awk '!seen[$0]++' | fzf --query "$argv")
+fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | tee $pipe >/dev/null &
+fd . ~/ --min-depth 1 --max-depth 3 --type d | tee $pipe >/dev/null &
+
+set selected (cat $pipe | fzf $argv)
 rm -f "$pipe"
 
 set selected_name (basename $selected 2>/dev/null | string replace "." "_")

overlays/vimPlugins.nix

@@ -51,10 +51,5 @@ with lib.my;
       version = mkVersionInput inputs.nvim-puppeteer;
       src = inputs.nvim-puppeteer;
     };
-
-    null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (a: {
-      version = mkVersionInput inputs.none-ls-nvim;
-      src = inputs.none-ls-nvim;
-    });
   };
 }