flake update

needed changes cause of input

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 {
-
+  { "nvim-treesitter/nvim-treesitter" },
-  -- == Examples of Adding Plugins ==
+  { "neovim/nvim-lspconfig" },
-
+  { "kylechui/nvim-surround" },
-  "andweeb/presence.nvim",
+  { "nvim-neo-tree/neo-tree.nvim" },
-  {
+  { "akinsho/toggleterm.nvim" },
-    "ray-x/lsp_signature.nvim",
+  { "nvimtools/none-ls.nvim" },
-    event = "BufRead",
+  { "rebelot/heirline.nvim" },
-    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 <cr>
-            :with_cr(cond.none()),
-        },
-        -- disable for .vim files, but it work for another filetypes
-        Rule("a", "a", "-vim")
-      )
-    end,
-  },
 }

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1783689476,
+        "lastModified": 1785936455,
-        "narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=",
+        "narHash": "sha256-pXD5pfIwI6j17cpvHh9vjzY+635cCiAldN9bDjXKJ8Y=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "af94408291ad477cae8eed964981ab41f90eb184",
+        "rev": "ce55463be1feee6a9a6a6d35d313b8b728c1d8c9",
         "type": "github"
       },
       "original": {
@@ -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-schemas": {
       "locked": {
         "lastModified": 1780327564,
@@ -198,11 +214,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1783668331,
+        "lastModified": 1786187685,
-        "narHash": "sha256-mMfzU9jvq9XQyyssR9w0Rki8/Ec4Ez+bLkFWc7BaGGg=",
+        "narHash": "sha256-yM+cGzDhRpvbYI0zpCG/wVha6Jbcs6Jlb647wzYbQEk=",
         "owner": "purpleclay",
         "repo": "go-overlay",
-        "rev": "423eed783363fa154fc7f0c049f7effa910d2440",
+        "rev": "1f5ea3876f1d63709538c395b451f79dc6853229",
         "type": "github"
       },
       "original": {
@@ -238,11 +254,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783740085,
+        "lastModified": 1785119570,
-        "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
+        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
+        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
         "type": "github"
       },
       "original": {
@@ -270,6 +286,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,
@@ -304,11 +335,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1783703440,
+        "lastModified": 1786201459,
-        "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=",
+        "narHash": "sha256-CiOTEjmwAmG2AWnaIno9YaCJJmpca2FXPhMAsnrolCg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283",
+        "rev": "8b8c811c7c2541c30382c5de7ed26be055569c60",
         "type": "github"
       },
       "original": {
@@ -365,6 +396,19 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1784796856,
+        "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=",
+        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -402,6 +446,26 @@
         "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
       }
     },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "mnw": "mnw",
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1786307523,
+        "narHash": "sha256-RKnrspb7azG0ERNZgdumX3EEivFCD3Vtglwbf90T1K0=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "23f994fcd754e9de067fa00cca891a774498825b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "aagl": "aagl",
@@ -411,6 +475,7 @@
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
+        "nvf": "nvf",
         "rust-overlay": "rust-overlay_3"
       }
     },
@@ -422,11 +487,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782875958,
+        "lastModified": 1785476452,
-        "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=",
+        "narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca",
+        "rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c",
         "type": "github"
       },
       "original": {
@@ -459,14 +524,14 @@
     },
     "rust-overlay_3": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1783834461,
+        "lastModified": 1786247265,
-        "narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=",
+        "narHash": "sha256-cVTcTqAhzSNMOVddtBhFpuv+Vx6/SgrhgZWJiI61H24=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a286e5b998e852297a403786f063fb2c9fe7f57a",
+        "rev": "6df7076ea0f5697e3242719a4c71211f00411cf5",
         "type": "github"
       },
       "original": {

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 = { ... }: {
@@ -213,32 +215,6 @@
       ];
     };
 
-    # Discord bot server
-    nixosConfigurations."estinien" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail nur;
-        hostname = "estinien";
-        role = "server";
-      };
-      modules = [
-        myOverlays
-        ./modules/common
-        ./modules/machine/estinien
-
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
-          home-manager.backupFileExtension = "bak";
-          home-manager.users.${userName}.imports = [
-            ./home
-          ];
-        }
-      ];
-    };
-
     # generic non-NixOS Linux machine
     homeConfigurations."generic" = let
       hostname = builtins.getEnv "HOSTNAME";
@@ -247,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,109 @@
-{...}: 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 = {
+          nix.enable = true;
+          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; }
+        ];
+      };
     };
   };
 }

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;

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;
   };
 

modules/machine/estinien/configuration.nix

@@ -1,118 +0,0 @@
-{
-  pkgs,
-  userName,
-  nur,
-  ...
-}: let
-    hildibrand = nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand;
-    caitsith = nur.packages.${pkgs.stdenv.hostPlatform.system}.caitsith;
-  in {
-  imports = [
-    ../../pwrMgmt
-    ../../networking/core.nix
-  ];
-
-  # Enable flakes for NixOS
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
-  # Custom kernel/boot stuff
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # Set your timezone
-  time.timeZone = "America/Detroit";
-
-  # Enable OpenSSH
-  services.openssh.enable = true;
-
-  # Enable keyring
-  services.gnome.gnome-keyring.enable = true;
-
-  # Enable GnuPG
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  # Enable SUID wrappers (some programs need them)
-  programs.mtr.enable = true;
-
-  # Enable Polkit
-  security.polkit.enable = true;
-
-  # Power management (see ../../pwrMgmt/default.nix)
-  pwrMgmt = {
-    enable = true;
-    cpuFreqGovernor = "performance";
-    powertop.enable = false;
-  };
-
-  network = {
-    firewall = {
-      enable = true;
-    };
-    networkManager.enable = true;
-  };
-
-  environment.systemPackages = [
-    hildibrand
-    caitsith
-  ];
-
-  systemd.services.hildibrand = {
-    description = "Hildibrand - trivia buzzer bot";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "network.target" ];
-    serviceConfig = {
-      Type = "simple";
-      User = userName;
-      WorkingDirectory = "/home/${userName}";
-      ExecStart = "${hildibrand}/bin/hildebrand";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      EnvironmentFile = "/etc/secrets/hildibrand.env";
-    };
-  };
-
-  systemd.services.caitsith = {
-    description = "Caitsith - a randomizer bot";
-    wantedBy = [ "multi-user.target" ];
-    after = [ "network.target" ];
-    serviceConfig = {
-      Type = "simple";
-      User = userName;
-      WorkingDirectory = "/home/${userName}";
-      ExecStart = "${caitsith}/bin/hildebrand";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      EnvironmentFile = "/etc/secrets/caitsith.env";
-    };
-  };
-
-  # Add username to groups "wheel" and "video" - more may be added here later
-  users = {
-    users = {
-      ${userName} = {
-        extraGroups = [ "wheel" "network" ];
-        openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
-        ];
-      };
-    };
-  };
-
-  services.fail2ban = {
-    enable = true;
-    package = pkgs.fail2ban;
-    maxretry = 5;
-    bantime = "3h";
-    bantime-increment = {
-      enable = true;
-      rndtime = "10m";
-    };
-  };
-
-  system.stateVersion = "24.11";
-}

modules/machine/estinien/default.nix

@@ -1,6 +0,0 @@
-{ ... }: {
-  imports = [
-    ./configuration.nix
-    ./hardware-configuration.nix
-  ];
-}

modules/machine/estinien/hardware-configuration.nix

@@ -1,32 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/498ce176-f090-46d8-96bf-9e6141cffa19";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/09A6-B803";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/4a64a2ee-2b32-4e53-b00f-7b1f127162aa"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}