vim deprecated functions

Reviewed-on: #1
Co-authored-by: Evan Reichard <evan@reichard.io>
Co-committed-by: Evan Reichard <evan@reichard.io>

README.md

@@ -64,3 +64,44 @@ rsync -av --exclude='.git' . root@HOST:/etc/nixos
 ```bash
 sudo nixos-rebuild switch
 ```
+
+# Nix Home Manager Configuration - macOS
+
+## Upgrade
+
+```bash
+# Update System Channels
+sudo nix-channel --add https://nixos.org/channels/nixpkgs-24.11-darwin nixpkgs
+sudo nix-channel --update
+
+# Update Home Manager
+nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
+nix-channel --update
+
+# Link Repo
+ln -s /Users/evanreichard/Development/git/personal/nix/home-manager ~/.config/home-manager
+
+# Build Home Manager
+home-manager switch
+```
+
+## Clean Garbage
+
+NOTE: This will remove previous generations
+
+```bash
+sudo nix-collect-garbage --delete-old
+nix-collect-garbage --delete-old
+```
+
+## OS Update
+
+`/etc/bashrc` may get overridden. To properly load Nix, prepend the following:
+
+```bash
+# Nix
+if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
+  . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
+fi
+# End Nix
+```

flake.lock

@@ -28,11 +28,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1743598667,
+        "lastModified": 1753140376,
-        "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
+        "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
+        "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
         "type": "github"
       },
       "original": {
@@ -43,18 +43,17 @@
     },
     "firefox-addons": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1743861198,
+        "lastModified": 1753589020,
-        "narHash": "sha256-PzbPHoSI5U1juWd01Spf3ST7ylR9mQ84v5p7NksBplY=",
+        "narHash": "sha256-rFZWFBjYRXNli1rZvRLOJVKLznk3Fj/eHJJdcWB0zWE=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "7408ed5bbc9009741094f4dd4cc1abec79e79e7e",
+        "rev": "2988587ae70864239861389dbd84efdbfa9fa2c5",
         "type": "gitlab"
       },
       "original": {
@@ -96,40 +95,6 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1629284811,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils-plus": {
-      "inputs": {
-        "flake-utils": "flake-utils_2"
-      },
-      "locked": {
-        "lastModified": 1715533576,
-        "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -147,6 +112,25 @@
         "type": "github"
       }
     },
+    "flake-utils-plus": {
+      "inputs": {
+        "flake-utils": "flake-utils"
+      },
+      "locked": {
+        "lastModified": 1715533576,
+        "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -154,16 +138,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1743808813,
+        "lastModified": 1753592768,
-        "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -191,11 +175,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742568034,
+        "lastModified": 1751903740,
-        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
+        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
+        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
         "type": "github"
       },
       "original": {
@@ -206,11 +190,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743259260,
+        "lastModified": 1752596105,
-        "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=",
+        "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f",
+        "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708",
         "type": "github"
       },
       "original": {
@@ -222,11 +206,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1744098102,
+        "lastModified": 1753429684,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
         "type": "github"
       },
       "original": {
@@ -238,16 +222,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1743813633,
+        "lastModified": 1753345091,
-        "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
+        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
+        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -310,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743910657,
+        "lastModified": 1752544651,
-        "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=",
+        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "523f58a4faff6c67f5f685bed33a7721e984c304",
+        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
   description = "NixOS Hosts";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     disko.url = "github:nix-community/disko";
     snowfall-lib = {
@@ -10,7 +10,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-silicon = {

homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix

@@ -43,7 +43,7 @@ in
     android-tools
     imagemagick
     mosh
-    python311
+    python312
     texliveSmall # Pandoc PDF Dep
     google-cloud-sdk
     tldr

homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix

@@ -26,6 +26,8 @@ in
       graphical = {
         wms.hyprland = enabled;
         ghostty = enabled;
+        gimp = enabled;
+        wireshark = enabled;
         ghidra = enabled;
         browsers.firefox = {
           enable = true;
@@ -44,9 +46,9 @@ in
     };
   };
 
-  # home.packages = with pkgs; [
+  home.packages = with pkgs; [
-  #   catppuccin-gtk
+    jellyfin-media-player
-  # ];
+  ];
 
   dconf = {
     settings = {

modules/home/programs/graphical/browsers/firefox/default.nix

@@ -53,7 +53,7 @@ in
 
     settings = mkOpt attrs { } "Settings to apply to the profile.";
 
-    extensions = mkOpt (with lib.types; listOf package)
+    extensions.packages = mkOpt (with lib.types; listOf package)
       (with pkgs.firefox-addons; [
         bitwarden
         darkreader

modules/home/programs/graphical/ghostty/default.nix

@@ -59,7 +59,7 @@ in
       thefuck
       fastfetch
       bashInteractive
-      (nerdfonts.override { fonts = [ "Meslo" ]; })
+      nerd-fonts.meslo-lg
     ] ++ optionals isLinux [
       # Pending Darwin @ https://github.com/NixOS/nixpkgs/pull/369788
       ghostty

modules/home/programs/graphical/gimp/default.nix

@@ -0,0 +1,17 @@
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.programs.graphical.gimp;
+in
+{
+  options.${namespace}.programs.graphical.gimp = {
+    enable = mkEnableOption "GIMP";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      gimp-with-plugins
+    ];
+  };
+}

modules/home/programs/graphical/wireshark/default.nix

@@ -0,0 +1,17 @@
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.programs.graphical.wireshark;
+in
+{
+  options.${namespace}.programs.graphical.wireshark = {
+    enable = mkEnableOption "Wireshark";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      wireshark
+    ];
+  };
+}

modules/home/programs/graphical/wms/hyprland/default.nix

@@ -39,8 +39,8 @@ in
           "$mainMod, Q, killactive"
           "$mainMod, M, exit"
           "$mainMod, V, togglefloating"
-          "$mainMod, P, pseudo" # dwindle
+          "$mainMod, P, pin"
-          "$mainMod, J, togglesplit" # dwindle
+          "$mainMod, J, togglesplit"
           "$mainMod, S, togglespecialworkspace, magic"
           "$mainMod SHIFT, S, movetoworkspace, special:magic"
 

modules/home/programs/terminal/nvim/config/lua/avante-config.lua

@@ -0,0 +1 @@
+require("avante").setup()

modules/home/programs/terminal/nvim/config/lua/base.lua

@@ -20,7 +20,7 @@ vim.g.loaded_netrwPlugin = 1
 vim.opt.termguicolors = true
 
 -- Synchronize with system clipboard
-vim.opt.clipboard = "unnamed"
+vim.opt.clipboard:append("unnamedplus")
 
 -- Always show the signcolumn
 vim.opt.signcolumn = "yes"

modules/home/programs/terminal/nvim/config/lua/git-signs.lua

@@ -1,6 +1,8 @@
-require('gitsigns').setup {
+require("gitsigns").setup({
+	current_line_blame = true,
+	current_line_blame_opts = { delay = 0 },
 	on_attach = function(bufnr)
-        local gitsigns = require('gitsigns')
+		local gitsigns = require("gitsigns")
 
 		local function map(mode, l, r, opts)
 			opts = opts or {}
@@ -8,9 +10,9 @@ require('gitsigns').setup {
 			vim.keymap.set(mode, l, r, opts)
 		end
 
-        map('n', '<leader>gb', gitsigns.toggle_current_line_blame)
+		map("n", "<leader>gb", gitsigns.toggle_current_line_blame)
-        map('n', '<leader>gB', function()
+		map("n", "<leader>gB", function()
-            gitsigns.blame_line {full = true}
+			gitsigns.blame_line({ full = true })
 		end)
-    end
+	end,
-}
+})

modules/home/programs/terminal/nvim/config/lua/init.lua

@@ -1,6 +1,7 @@
 require("base")
 require("aerial-config")
 require("autopairs-config")
+require("avante-config")
 require("cmp-config")
 require("comment-config")
 require("dap-config")

modules/home/programs/terminal/nvim/config/lua/lsp-config.lua

@@ -23,7 +23,7 @@ local nvim_lsp = require("lspconfig")
 local on_attach = function(client, bufnr)
 	local bufopts = { noremap = true, silent = true, buffer = bufnr }
 
-	if client.supports_method("textDocument/formatting") then
+	if client:supports_method("textDocument/formatting") then
 		vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
 		vim.api.nvim_create_autocmd("BufWritePre", {
 			group = augroup,
@@ -80,6 +80,7 @@ nvim_lsp.pyright.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 	capabilities = capabilities,
+	filetypes = { "starlark", "python" },
 })
 
 -- HTML LSP Configuration
@@ -183,9 +184,9 @@ nvim_lsp.golangci_lint_ls.setup({
 })
 
 ------------------------------------------------------
---------------------- Null-LS LSP --------------------
+--------------------- None-LS LSP --------------------
 ------------------------------------------------------
-local null_ls = require("null-ls")
+local none_ls = require("null-ls")
 
 local eslintFiles = {
 	".eslintrc",
@@ -202,29 +203,33 @@ local eslintFiles = {
 	"eslint.config.cts",
 }
 
-has_eslint_in_parents = function(fname)
+local has_eslint_in_parents = function(fname)
-	root_file = nvim_lsp.util.insert_package_json(eslintFiles, "eslintConfig", fname)
+	local root_file = nvim_lsp.util.insert_package_json(eslintFiles, "eslintConfig", fname)
 	return nvim_lsp.util.root_pattern(unpack(root_file))(fname)
 end
 
-null_ls.setup({
+none_ls.setup({
 	sources = {
 		-- Prettier Formatting
-		null_ls.builtins.formatting.prettier,
+		none_ls.builtins.formatting.prettier,
-		null_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
+		none_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
 		require("none-ls.diagnostics.eslint_d").with({
 			condition = function(utils)
 				return has_eslint_in_parents(vim.fn.getcwd())
 			end,
 		}),
-		null_ls.builtins.completion.spell,
+		none_ls.builtins.completion.spell,
-		null_ls.builtins.formatting.nixpkgs_fmt,
+		none_ls.builtins.formatting.nixpkgs_fmt,
-		null_ls.builtins.formatting.stylua,
+		none_ls.builtins.formatting.stylua,
-		null_ls.builtins.diagnostics.sqlfluff,
+		none_ls.builtins.diagnostics.sqlfluff,
-		null_ls.builtins.formatting.sqlfluff,
+		none_ls.builtins.formatting.sqlfluff,
+		require("none-ls.formatting.autopep8").with({
+			filetypes = { "starlark", "python" },
+			extra_args = { "--max-line-length", "100" },
+		}),
 	},
 	on_attach = function(client, bufnr)
-		if client.supports_method("textDocument/formatting") then
+		if client:supports_method("textDocument/formatting") then
 			vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
 			vim.api.nvim_create_autocmd("BufWritePre", {
 				group = augroup,

modules/home/programs/terminal/nvim/config/lua/lsp-lines-config.lua

@@ -1,2 +1,5 @@
 require("lsp_lines").setup()
-vim.diagnostic.config({virtual_text = false})
+vim.diagnostic.config({
+	virtual_text = false,
+	virtual_lines = true,
+})

modules/home/programs/terminal/nvim/config/lua/telescope-config.lua

@@ -1,20 +1,22 @@
-require('telescope').setup {
+require("telescope").setup({
 	extensions = {
 		fzf = {
 			fuzzy = true,
 			override_generic_sorter = true,
 			override_file_sorter = true,
-            case_mode = "smart_case"
+			case_mode = "smart_case",
-        }
+		},
-    }
+	},
-}
+})
 
-require('telescope').load_extension('fzf')
+require("telescope").load_extension("fzf")
 require("telescope").load_extension("ui-select")
+require("telescope").load_extension("undo")
 
-local builtin = require('telescope.builtin')
+local builtin = require("telescope.builtin")
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
-vim.keymap.set('n', '<leader>fj', builtin.jumplist, {})
+vim.keymap.set("n", "<leader>fj", builtin.jumplist, {})
+vim.keymap.set("n", "<leader>fu", "<cmd>Telescope undo<cr>")

modules/home/programs/terminal/nvim/default.nix

@@ -34,6 +34,7 @@ in
         # -------------------
         # ----- Helpers -----
         # -------------------
+        avante-nvim # Avante
         aerial-nvim # Code Outline
         comment-nvim # Code Comments
         diffview-nvim # Diff View
@@ -47,6 +48,7 @@ in
         telescope-fzf-native-nvim # Faster Telescope
         telescope-nvim # Fuzzy Finder
         telescope-ui-select-nvim # UI
+        telescope-undo-nvim # Undo Tree
         toggleterm-nvim # Terminal Helper
         vim-nix # Nix Helpers
         which-key-nvim # Shortcut Helper
@@ -81,13 +83,14 @@ in
         (
           pkgs.vimUtils.buildVimPlugin {
             pname = "none-ls-extras.nvim";
-            version = "2024-06-11";
+            version = "2025-06-18";
             src = pkgs.fetchFromGitHub {
               owner = "nvimtools";
               repo = "none-ls-extras.nvim";
-              rev = "336e84b9e43c0effb735b08798ffac382920053b";
+              rev = "924fe88a9983c7d90dbb31fc4e3129a583ea0a90";
-              sha256 = "sha256-UtU4oWSRTKdEoMz3w8Pk95sROuo3LEwxSDAm169wxwk=";
+              sha256 = "sha256-OJHg2+h3zvlK7LJ8kY6f7et0w6emnxfcDbjD1YyWRTw=";
             };
+            doCheck = false;
             meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/";
           }
         )
@@ -105,6 +108,7 @@ in
               rev = "5ca462bee0a39b058786bc7fbeb5d16ea49f3a23";
               sha256 = "0vlp645d5mmii513v72jca931miyrhkvhwb9bfzhix1199zx7vi2";
             };
+            doCheck = false;
             meta.homepage = "https://github.com/mhanberg/silicon.lua/";
           }
         )
@@ -142,7 +146,6 @@ in
             meta.homepage = "https://github.com/ggml-org/llama.vim/";
           }
         )
-
       ];
 
       extraPackages = with pkgs; [
@@ -165,6 +168,7 @@ in
         nodePackages.vscode-langservers-extracted
         pyright
         eslint_d
+        python312Packages.autopep8
 
         # Formatters
         luaformatter

modules/nixos/programs/graphical/wms/hyprland/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, namespace, ... }:
+{ config, pkgs, lib, namespace, ... }:
 let
   inherit (lib) mkIf;
 
@@ -17,6 +17,10 @@ in
       };
     };
 
+    environment.systemPackages = with pkgs; [
+      wl-clipboard
+    ];
+
     reichard = {
       display-managers = {
         sddm = {

systems/x86_64-linux/lin-va-thinkpad/default.nix

@@ -6,6 +6,7 @@ in
   system.stateVersion = "24.11";
   time.timeZone = "America/New_York";
   hardware.enableRedistributableFirmware = true;
+  hardware.bluetooth.enable = true;
 
   # System Config
   reichard = {