From 1070f65c6e204306b81c237a4742375d3a14195b Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 12 Jul 2026 15:27:37 -0400 Subject: [PATCH 1/4] mod: start neovim refactoring --- flake.lock | 67 ++++++++++++++++++++++++++- flake.nix | 6 ++- home/neovim.nix | 118 ++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 174 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index e3ad0a1..0837409 100644 --- a/flake.lock +++ b/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, diff --git a/flake.nix b/flake.nix index c41215c..7028d1b 100644 --- a/flake.nix +++ b/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"; }; diff --git a/home/neovim.nix b/home/neovim.nix index eebfd50..7a1a6ac 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -1,18 +1,108 @@ -{...}: let - dirs = { - defaults = ../defaults; - }; -in { - programs.neovim = { - enable = true; - defaultEditor = true; - vimAlias = true; - }; +{ nvf, ... }: { + imports = [ + nvf.homeManagerModules.default + ]; - xdg.configFile = { - nvim = { - onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall"; - source = dirs.defaults + /nvim; + programs.nvf = { + enable = 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" ]; + }; + }; + + utility.surround.enable = true; + telescope.enable = true; + mini.icons.enable = true; + notes.obsidian = { + enable = true; + setupOpts.workspaces = [ + { + name = "personal"; + path = "~/Documents/Obsidian/notes"; + } + ]; + }; + + terminal.toggleterm = { + enable = true; + lazygit = { + enable = true; + mappings.open = "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 = ""; + mode = "n"; + action = "w"; + silent = true; + noremap = true; + } + { key = "o"; mode = "n"; action = "Neotree toggle"; silent = true; noremap = true; } + { key = "tf"; mode = "n"; action = "ToggleTerm direction=float"; silent = true; noremap = true; } + { key = "th"; mode = "n"; action = "ToggleTerm direction=horizontal"; silent = true; noremap = true; } + { key = "tv"; mode = "n"; action = "ToggleTerm direction=vertical"; silent = true; noremap = true; } + { key = "n"; mode = "n"; action = ""; desc = "Notes"; silent = true; noremap = true; } + { key = "nd"; mode = "n"; action = "Obsidian today"; desc = "Obsidian daily note"; silent = true; noremap = true; } + { key = "nf"; mode = "n"; action = "Obsidian quick_switch"; desc = "Obsidian find note"; silent = true; noremap = true; } + { key = "ns"; mode = "n"; action = "Obsidian search"; desc = "Obsidian search notes"; silent = true; noremap = true; } + { key = "nn"; mode = "n"; action = "Obsidian new"; desc = "Obsidian new note"; silent = true; noremap = true; } + { key = "ff"; mode = "n"; action = "Telescope find_files"; silent = true; noremap = true; } + { key = "fD"; mode = "n"; action = "lua require('telescope.builtin').find_files({ cwd = vim.fn.input('Dir: ', vim.loop.cwd() .. '/', 'dir') })"; silent = true; noremap = true; } + { key = "fg"; mode = "n"; action = "Telescope live_grep"; silent = true; noremap = true; } + { key = "/"; mode = "n"; action = "Telescope current_buffer_fuzzy_find"; silent = true; noremap = true; } + { key = "gb"; mode = "n"; action = "Telescope git_branches"; silent = true; noremap = true; } + { key = "gc"; mode = "n"; action = "Telescope git_commits"; silent = true; noremap = true; } + { key = "gl"; mode = "n"; action = "Telescope git_bcommits"; silent = true; noremap = true; } + { key = "gr"; mode = "n"; action = "Telescope git_status"; silent = true; noremap = true; } + ]; + }; }; }; } From 3fa654f7743a16d8e7fd27668a97af08e1201e7c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 7 Aug 2026 21:35:02 -0400 Subject: [PATCH 2/4] mod: added nix support --- defaults/nvim/lua/plugins/user.lua | 89 +++--------------------------- home/neovim.nix | 1 + 2 files changed, 8 insertions(+), 82 deletions(-) diff --git a/defaults/nvim/lua/plugins/user.lua b/defaults/nvim/lua/plugins/user.lua index 121089e..65ea261 100644 --- a/defaults/nvim/lua/plugins/user.lua +++ b/defaults/nvim/lua/plugins/user.lua @@ -1,85 +1,10 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE - --- You can also add or configure plugins by creating files in this `plugins/` folder --- Here are some examples: - ---@type LazySpec return { - - -- == Examples of Adding Plugins == - - "andweeb/presence.nvim", - { - "ray-x/lsp_signature.nvim", - event = "BufRead", - config = function() require("lsp_signature").setup() end, - }, - - -- == Examples of Overriding Plugins == - - -- customize alpha options - { - "goolord/alpha-nvim", - opts = function(_, opts) - -- customize the dashboard header - opts.section.header.val = { - " █████ ███████ ████████ ██████ ██████", - "██ ██ ██ ██ ██ ██ ██ ██", - "███████ ███████ ██ ██████ ██ ██", - "██ ██ ██ ██ ██ ██ ██ ██", - "██ ██ ███████ ██ ██ ██ ██████", - " ", - " ███  ██ ██  ██ ██ ███  ███", - " ████  ██ ██  ██ ██ ████  ████", - " ██ ██  ██ ██  ██ ██ ██ ████ ██", - " ██  ██ ██  ██  ██  ██ ██  ██  ██", - " ██   ████   ████   ██ ██      ██", - } - return opts - end, - }, - - -- You can disable default plugins as follows: - { "max397574/better-escape.nvim", enabled = false }, - - -- You can also easily customize additional setup of plugins that is outside of the plugin's setup call - { - "L3MON4D3/LuaSnip", - config = function(plugin, opts) - require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call - -- add more custom luasnip configuration such as filetype extend or custom snippets - local luasnip = require "luasnip" - luasnip.filetype_extend("javascript", { "javascriptreact" }) - end, - }, - - { - "windwp/nvim-autopairs", - config = function(plugin, opts) - require "astronvim.plugins.configs.nvim-autopairs"(plugin, opts) -- include the default astronvim config that calls the setup call - -- add more custom autopairs configuration such as custom rules - local npairs = require "nvim-autopairs" - local Rule = require "nvim-autopairs.rule" - local cond = require "nvim-autopairs.conds" - npairs.add_rules( - { - Rule("$", "$", { "tex", "latex" }) - -- don't add a pair if the next character is % - :with_pair(cond.not_after_regex "%%") - -- don't add a pair if the previous character is xxx - :with_pair( - cond.not_before_regex("xxx", 3) - ) - -- don't move right when repeat character - :with_move(cond.none()) - -- don't delete if the next character is xx - :with_del(cond.not_after_regex "xx") - -- disable adding a newline when you press - :with_cr(cond.none()), - }, - -- disable for .vim files, but it work for another filetypes - Rule("a", "a", "-vim") - ) - end, - }, + { "nvim-treesitter/nvim-treesitter" }, + { "neovim/nvim-lspconfig" }, + { "kylechui/nvim-surround" }, + { "nvim-neo-tree/neo-tree.nvim" }, + { "akinsho/toggleterm.nvim" }, + { "nvimtools/none-ls.nvim" }, + { "rebelot/heirline.nvim" }, } diff --git a/home/neovim.nix b/home/neovim.nix index 7a1a6ac..9b27664 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -14,6 +14,7 @@ autocomplete.nvim-cmp.enable = true; languages = { + nix.enable = true; rust.enable = true; go.enable = true; python.enable = true; From 28a8ccc5321e0e5d978b3d9200174c7f30103b83 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 9 Aug 2026 17:26:26 -0400 Subject: [PATCH 3/4] flake update needed changes cause of input --- flake.lock | 147 ++++++++++++++++++------ modules/apps/gaming.nix | 5 +- modules/machine/cloud/configuration.nix | 4 - 3 files changed, 113 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 3d7f061..71ed9bd 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1783689476, - "narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=", + "lastModified": 1785936455, + "narHash": "sha256-pXD5pfIwI6j17cpvHh9vjzY+635cCiAldN9bDjXKJ8Y=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "af94408291ad477cae8eed964981ab41f90eb184", + "rev": "ce55463be1feee6a9a6a6d35d313b8b728c1d8c9", "type": "github" }, "original": { @@ -112,6 +112,20 @@ "url": "https://git.lix.systems/lix-project/flake-compat.git" } }, + "flake-schemas": { + "locked": { + "lastModified": 1780327564, + "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=", + "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6", + "revCount": 149, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -200,11 +214,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783668331, - "narHash": "sha256-mMfzU9jvq9XQyyssR9w0Rki8/Ec4Ez+bLkFWc7BaGGg=", + "lastModified": 1786187685, + "narHash": "sha256-yM+cGzDhRpvbYI0zpCG/wVha6Jbcs6Jlb647wzYbQEk=", "owner": "purpleclay", "repo": "go-overlay", - "rev": "423eed783363fa154fc7f0c049f7effa910d2440", + "rev": "1f5ea3876f1d63709538c395b451f79dc6853229", "type": "github" }, "original": { @@ -213,6 +227,26 @@ "type": "github" } }, + "hildibrand": { + "inputs": { + "flake-schemas": "flake-schemas", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1785717646, + "narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=", + "ref": "refs/heads/master", + "rev": "9588520925513ed0e47711a5798c6e9958143a0a", + "revCount": 5, + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git" + }, + "original": { + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -220,11 +254,11 @@ ] }, "locked": { - "lastModified": 1783740085, - "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", + "lastModified": 1785119570, + "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", + "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", "type": "github" }, "original": { @@ -236,7 +270,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1779507042, @@ -301,11 +335,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783703440, - "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=", + "lastModified": 1786201459, + "narHash": "sha256-CiOTEjmwAmG2AWnaIno9YaCJJmpca2FXPhMAsnrolCg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283", + "rev": "8b8c811c7c2541c30382c5de7ed26be055569c60", "type": "github" }, "original": { @@ -316,6 +350,20 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1784280462, + "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=", + "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f", + "revCount": 1009740, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1778443072, "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", @@ -331,7 +379,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1780902259, "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", @@ -347,20 +395,20 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1783148766, - "narHash": "sha256-H9+N+GFtsbVC8ZniHliChM7ndizxtqVZs6bnGOLM3WQ=", - "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", + "lastModified": 1784796856, + "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "tarball", - "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.4193.a50de1b7d8a5/nixexprs.tar.xz?lastModified=1783148766&rev=a50de1b7d8a586adc18d2395c19de7d6058e6030" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixos-26.05/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -380,15 +428,16 @@ "inputs": { "darwin": "darwin_2", "flake-utils": "flake-utils_2", + "hildibrand": "hildibrand", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1783886399, - "narHash": "sha256-pcHOwEcr5xFGFRUriCdWFcBFBU5oouFW3iO65HCZ3cI=", + "lastModified": 1786304454, + "narHash": "sha256-2ovOgwFWnKqUMoQfxbobtIWQ+TSN62llX9eJVb9hFoY=", "ref": "refs/heads/master", - "rev": "b43f2ace4941315daabccc716e151a0ca47276db", - "revCount": 32, + "rev": "ea7094e4e33fbb030edf28383de37073fc8b84e0", + "revCount": 43, "type": "git", "url": "https://scm.wyattjmiller.com/wymiller/nur.git" }, @@ -401,14 +450,14 @@ "inputs": { "flake-compat": "flake-compat_3", "mnw": "mnw", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1783767627, - "narHash": "sha256-UgQuKee2d5VhXaqectc23i2rarIufUpAVSTA6R8XloY=", + "lastModified": 1786307523, + "narHash": "sha256-RKnrspb7azG0ERNZgdumX3EEivFCD3Vtglwbf90T1K0=", "owner": "notashelf", "repo": "nvf", - "rev": "c55a3a783e6e1ecbbaad607b15a9b7b23d42236f", + "rev": "23f994fcd754e9de067fa00cca891a774498825b", "type": "github" }, "original": { @@ -427,7 +476,7 @@ "nixpkgs": "nixpkgs_2", "nur": "nur", "nvf": "nvf", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" } }, "rust-overlay": { @@ -438,11 +487,11 @@ ] }, "locked": { - "lastModified": 1782875958, - "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=", + "lastModified": 1785476452, + "narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca", + "rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c", "type": "github" }, "original": { @@ -453,14 +502,36 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "nur", + "hildibrand", + "nixpkgs" + ] }, "locked": { - "lastModified": 1783834461, - "narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=", + "lastModified": 1784438913, + "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a286e5b998e852297a403786f063fb2c9fe7f57a", + "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1786247265, + "narHash": "sha256-cVTcTqAhzSNMOVddtBhFpuv+Vx6/SgrhgZWJiI61H24=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "6df7076ea0f5697e3242719a4c71211f00411cf5", "type": "github" }, "original": { diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index e871dce..3619c39 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -157,7 +157,10 @@ in { config = let agl = cfg.aagl; - nurPkgs = import "${nur.outPath}/pkgs" { inherit pkgs; }; + nurPkgs = import "${nur.outPath}/pkgs" { + inherit pkgs; + hildibrand = nur.inputs.hildibrand.packages.${pkgs.stdenv.hostPlatform.system}.default; + }; in { programs.steam = lib.mkIf cfg.steam.enable { enable = true; diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 85cd474..65896c4 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -85,9 +85,6 @@ in { ollama-rocm newelle vlc - mediainfo - makemkv - ffmpeg ]; # Enable Polkit @@ -128,7 +125,6 @@ in { ffxiv.enable = true; archon.enable = true; minecraft.enable = true; - aagl.wavey-launcher.enable = true; vintage-story.enable = true; }; From c78fb3019ce0bb14cf143c206f39e364a0b67c1a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 14 Sep 2026 19:31:56 -0400 Subject: [PATCH 4/4] mod: added autopair, bufferline plugins --- flake.lock | 60 ++++++++++++++++++++++++++++++++++++------------- home/neovim.nix | 2 ++ 2 files changed, 47 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 51ad7d4..fc10529 100644 --- a/flake.lock +++ b/flake.lock @@ -135,6 +135,22 @@ "type": "github" } }, + "flake-compat_4": { + "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-schemas": { "locked": { "lastModified": 1780327564, @@ -251,11 +267,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1789140629, - "narHash": "sha256-1TN95Z5nh1z6pyuou2QguhkWJKAl+hIpcfVV/RayGQQ=", + "lastModified": 1789395265, + "narHash": "sha256-EvwCTZsXjw2AkEYP3dJd/ZQDxfMhK73p1t17Dl+kx3g=", "owner": "purpleclay", "repo": "go-overlay", - "rev": "7069b95f142184721d3aeac373d687912e7ada0e", + "rev": "615091b8fb4b01d37b01f81bd68fe57e500066c4", "type": "github" }, "original": { @@ -401,11 +417,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1789114715, - "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", + "lastModified": 1789344334, + "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "21a67dc470149f337cecafbe965d8d252a390518", + "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", "type": "github" }, "original": { @@ -432,6 +448,19 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1787498568, + "narHash": "sha256-FoOSoBG7tEvOlGRTpWnVdY506Ner4y7r7UYO3OGgmE8=", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1060451.56c02bc00adc/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -473,16 +502,16 @@ }, "nvf": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "mnw": "mnw", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1786307523, - "narHash": "sha256-RKnrspb7azG0ERNZgdumX3EEivFCD3Vtglwbf90T1K0=", + "lastModified": 1789333536, + "narHash": "sha256-C9GsjXostGh50d62SYEXVJOSDTwk7RjAumJmwzkJKEY=", "owner": "notashelf", "repo": "nvf", - "rev": "23f994fcd754e9de067fa00cca891a774498825b", + "rev": "2d6b480abfa9fcf84841e62c27922bfa3f3d0d2b", "type": "github" }, "original": { @@ -500,6 +529,7 @@ "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "nur": "nur", + "nvf": "nvf", "rust-overlay": "rust-overlay_5" } }, @@ -591,14 +621,14 @@ }, "rust-overlay_5": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1789196581, - "narHash": "sha256-yJr1Bt4fKkKIpPYbsKGqJ0VFdoDnURgRwuffmBQ2WzY=", + "lastModified": 1789372034, + "narHash": "sha256-mu6atvdBHYpDsFhJkPtSsS6auSWAnWONVJMCvpL0900=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "228ecefb6329d5a531b77b46b581a2f0c26ee056", + "rev": "a5f41d15ba0e9442542c5324fbccd7a87105a90d", "type": "github" }, "original": { diff --git a/home/neovim.nix b/home/neovim.nix index 9b27664..b212f57 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -12,6 +12,7 @@ lsp.enable = true; treesitter.enable = true; autocomplete.nvim-cmp.enable = true; + autopairs.nvim-autopairs.enable = true; languages = { nix.enable = true; @@ -76,6 +77,7 @@ dashboard.alpha.enable = true; statusline.lualine.enable = true; + tabline.nvimBufferline.enable = true; keymaps = [ {