mod: start neovim refactoring

flake.lock

@@ -96,6 +96,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1777699697,
+        "narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=",
+        "ref": "refs/heads/main",
+        "rev": "382052b74656a369c5408822af3f2501e9b1af81",
+        "revCount": 94,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -236,6 +252,21 @@
         "type": "github"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1780772958,
+        "narHash": "sha256-VKKe8r4pwCGWZ3Yr9CPN129R4S3CKLSrlYqdYz3vKpM=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "0871dbf63a53610c95db04439ed8ea4d6ec9c160",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1739444422,
@@ -317,6 +348,19 @@
       }
     },
     "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1783148766,
+        "narHash": "sha256-H9+N+GFtsbVC8ZniHliChM7ndizxtqVZs6bnGOLM3WQ=",
+        "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.4193.a50de1b7d8a5/nixexprs.tar.xz?lastModified=1783148766&rev=a50de1b7d8a586adc18d2395c19de7d6058e6030"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-26.05/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -353,6 +397,26 @@
         "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
       }
     },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "mnw": "mnw",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1783767627,
+        "narHash": "sha256-UgQuKee2d5VhXaqectc23i2rarIufUpAVSTA6R8XloY=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "c55a3a783e6e1ecbbaad607b15a9b7b23d42236f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "aagl": "aagl",
@@ -362,6 +426,7 @@
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
+        "nvf": "nvf",
         "rust-overlay": "rust-overlay_2"
       }
     },
@@ -388,7 +453,7 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1781234414,

flake.nix

@@ -17,6 +17,7 @@
       url = "github:ezKEa/aagl-gtk-on-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nvf.url = "github:notashelf/nvf";
     nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git";
   };
 
@@ -30,12 +31,13 @@
     go-overlay,
     aagl,
     nur,
+    nvf,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail nur;
+      inherit userName userEmail nur nvf;
     };
 
     myOverlays = { ... }: {
@@ -221,7 +223,7 @@
       pkgs = nixpkgs.legacyPackages.${system};
       
       extraSpecialArgs = {
-        inherit userName userEmail hostname;
+        inherit userName userEmail hostname nvf;
         isNixOS = false;
         role = "workstation";
       };

home/neovim.nix

@@ -1,18 +1,108 @@
-{...}: let
+{ nvf, ... }: {
-  dirs = {
+  imports = [
-    defaults = ../defaults;
+    nvf.homeManagerModules.default
-  };
+  ];
-in {
+
-  programs.neovim = {
+  programs.nvf = {
     enable = true;
-    defaultEditor = true;
+    settings = {
+      vim = {
+        viAlias = true;
         vimAlias = true;
+        lsp.enable = true;
+        treesitter.enable = true;
+        autocomplete.nvim-cmp.enable = true;
+
+        languages = {
+          rust.enable = true;
+          go.enable = true;
+          python.enable = true;
+          markdown.enable = true;
+          css.enable = true;
+          scss.enable = true;
+          tsx.enable = true;
+          typescript = {
+            enable = true;
+            lsp.servers = [ "typescript-language-server" "deno" ];
+          };
         };
 
-  xdg.configFile = {
+        utility.surround.enable = true;
-    nvim = {
+        telescope.enable = true;
-      onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
+        mini.icons.enable = true;
-      source = dirs.defaults + /nvim;
+        notes.obsidian = {
+          enable = true;
+          setupOpts.workspaces = [
+            {
+              name = "personal";
+              path = "~/Documents/Obsidian/notes";
+            }
+          ];
+        };
+
+        terminal.toggleterm = {
+          enable = true;
+          lazygit = {
+            enable = true;
+            mappings.open = "<leader>gg";
+          };
+        };
+        filetree.neo-tree.enable = true;
+        binds.whichKey.enable = true;
+
+        clipboard = {
+          enable = true;
+          registers = "unnamedplus";
+          providers = {
+            wl-copy.enable = true;
+            xclip.enable = true;
+          };
+        };
+
+        lsp.null-ls = {
+          enable = true;
+          setupOpts = {};
+        };
+        lsp.trouble.enable = true;
+
+        theme = {
+          enable = true;
+          name = "catppuccin";
+          style = "mocha";
+          transparent = false;
+        };
+
+        dashboard.alpha.enable = true;
+
+        statusline.lualine.enable = true;
+
+        keymaps = [
+          {
+            key = "<C-s>";
+            mode = "n";
+            action = "<cmd>w<CR>";
+            silent = true;
+            noremap = true;
+          }
+          { key = "<leader>o"; mode = "n"; action = "<cmd>Neotree toggle<CR>"; silent = true; noremap = true; }
+          { key = "<leader>tf"; mode = "n"; action = "<cmd>ToggleTerm direction=float<CR>"; silent = true; noremap = true; }
+          { key = "<leader>th"; mode = "n"; action = "<cmd>ToggleTerm direction=horizontal<CR>"; silent = true; noremap = true; }
+          { key = "<leader>tv"; mode = "n"; action = "<cmd>ToggleTerm direction=vertical<CR>"; silent = true; noremap = true; }
+          { key = "<leader>n"; mode = "n"; action = "<nop>"; desc = "Notes"; silent = true; noremap = true; }
+          { key = "<leader>nd"; mode = "n"; action = "<cmd>Obsidian today<CR>"; desc = "Obsidian daily note"; silent = true; noremap = true; }
+          { key = "<leader>nf"; mode = "n"; action = "<cmd>Obsidian quick_switch<CR>"; desc = "Obsidian find note"; silent = true; noremap = true; }
+          { key = "<leader>ns"; mode = "n"; action = "<cmd>Obsidian search<CR>"; desc = "Obsidian search notes"; silent = true; noremap = true; }
+          { key = "<leader>nn"; mode = "n"; action = "<cmd>Obsidian new<CR>"; desc = "Obsidian new note"; silent = true; noremap = true; }
+          { key = "<leader>ff"; mode = "n"; action = "<cmd>Telescope find_files<CR>"; silent = true; noremap = true; }
+          { key = "<leader>fD"; mode = "n"; action = "<cmd>lua require('telescope.builtin').find_files({ cwd = vim.fn.input('Dir: ', vim.loop.cwd() .. '/', 'dir') })<CR>"; silent = true; noremap = true; }
+          { key = "<leader>fg"; mode = "n"; action = "<cmd>Telescope live_grep<CR>"; silent = true; noremap = true; }
+          { key = "<leader>/";  mode = "n"; action = "<cmd>Telescope current_buffer_fuzzy_find<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gb"; mode = "n"; action = "<cmd>Telescope git_branches<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gc"; mode = "n"; action = "<cmd>Telescope git_commits<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gl"; mode = "n"; action = "<cmd>Telescope git_bcommits<CR>"; silent = true; noremap = true; }
+          { key = "<leader>gr"; mode = "n"; action = "<cmd>Telescope git_status<CR>"; silent = true; noremap = true; }
+        ];
+      };
     };
   };
 }

home/packages/linux.nix

@@ -5,12 +5,7 @@ lib.mkIf pkgs.stdenv.isLinux {
     xdg-utils
   ] ++ lib.optionals isNixOS [
     vesktop
-    thunar
+    xfce.thunar
-    thunar-volman
-    thunar-shares-plugin
-    thunar-vcs-plugin
-    thunar-archive-plugin
-    thunar-media-tags-plugin
     pavucontrol
     zathura
     gpu-screen-recorder

modules/apps/gaming.nix

@@ -226,7 +226,7 @@ in {
     nix.settings = let 
       inherit agl;
     in (lib.mkIf
-      (agl.anime-game-launcher.enable || agl.honkers-railway-launcher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable)
+      (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable)
       {
         substituters = [ "https://ezkea.cachix.org" ];
         trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ];

modules/machine/cloud/configuration.nix

@@ -85,10 +85,7 @@ in {
     wl-clip-persist
     ollama-rocm
     newelle
-    vlc
+    tailscale
-    mediainfo
-    makemkv
-    ffmpeg
   ];
 
   # Enable Polkit
@@ -128,11 +125,10 @@ in {
 
     ffxiv.enable = true;
     minecraft.enable = true;
-    aagl.wavey-launcher.enable = true;
+    aagl.anime-game-launcher.enable = true;
     vintage-story.enable = true;
   };
 
-  
   # Power management (see ../../pwrMgmt/default.nix)
   pwrMgmt = {
     enable = true;
@@ -232,8 +228,5 @@ in {
     ];
   };
 
-  # Tailscale service
-  services.tailscale.enable = true;
-
   system.stateVersion = "24.11";
 }