From 5eace727b01b5863cfea82c030d43bf8b1b36330 Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Sun, 20 Sep 2026 09:48:43 -0500
Subject: [PATCH] update nvim

---
 .../nathan/features/packages/packagesFull.nix | 52 +++++++++++++++++++
 .../packagesMinimal.nix}                      | 48 +----------------
 os/users/nathan/nathan.nix                    | 31 +----------
 packages/neovim/config/init.lua               |  4 ++
 4 files changed, 59 insertions(+), 76 deletions(-)
 create mode 100644 home/nathan/features/packages/packagesFull.nix
 rename home/nathan/features/{packages.nix => packages/packagesMinimal.nix} (59%)

diff --git a/home/nathan/features/packages/packagesFull.nix b/home/nathan/features/packages/packagesFull.nix
new file mode 100644
index 0000000..53c5e4e
--- /dev/null
+++ b/home/nathan/features/packages/packagesFull.nix
@@ -0,0 +1,52 @@
+{ self, ... }: {
+
+    flake.homeModules.nathan-packagesFull = { config, lib, pkgs, ... }: {
+
+        imports = [
+            self.homeModules.nathan-packagesMinimal
+        ];
+
+        config = with lib; mkMerge [        
+        {
+
+            nixpkgs.config = {
+                allowUnfree = true;
+            };
+
+            home.packages = with pkgs; [
+
+                handbrake
+                quickemu
+                bottles
+
+                lmms
+
+#unfree {
+                spotify
+                discord
+#}
+                rustdesk-flutter
+                mpv
+                vlc
+                pavucontrol
+                rpi-imager
+                tigervnc
+                keepassxc
+                localsend
+
+#3D modeling/printing
+                blender
+                freecad-wayland
+                cura-appimage
+
+#productivity
+                libreoffice
+
+#games
+                prismlauncher
+            ];
+
+         }
+        ];
+    };
+}
diff --git a/home/nathan/features/packages.nix b/home/nathan/features/packages/packagesMinimal.nix
similarity index 59%
rename from home/nathan/features/packages.nix
rename to home/nathan/features/packages/packagesMinimal.nix
index ee4f6ed..b8f81d5 100644
--- a/home/nathan/features/packages.nix
+++ b/home/nathan/features/packages/packagesMinimal.nix
@@ -1,11 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
-
-        options.olympus.packageSet = lib.mkOption {
-            type = lib.types.str;
-            default = "full";
-        };
+    flake.homeModules.nathan-packagesMinimal = { config, lib, pkgs, ... }: {
 
         config = with lib; mkMerge [
         {
@@ -66,47 +61,6 @@
 
          ];
          })
-
-        (mkIf (config.olympus.packageSet == "full") {
-
-            nixpkgs.config = {
-                allowUnfree = true;
-            };
-
-
-         home.packages = with pkgs; [
-
-         handbrake
-         quickemu
-         bottles
-
-         lmms
-
-#unfree {
-         spotify
-         discord
-#}
-         rustdesk-flutter
-         mpv
-         vlc
-         pavucontrol
-         rpi-imager
-         tigervnc
-         keepassxc
-         localsend
-
-#3D modeling/printing
-         blender
-         freecad-wayland
-         cura-appimage
-
-#productivity
-         libreoffice
-
-#games
-         prismlauncher
-         ];
-         })
         ];
     };
 }
diff --git a/os/users/nathan/nathan.nix b/os/users/nathan/nathan.nix
index 6226c28..4b8537c 100644
--- a/os/users/nathan/nathan.nix
+++ b/os/users/nathan/nathan.nix
@@ -61,36 +61,9 @@
                 (useWithGraphical (laptop ++ homebox ++ iso) nathan-kitty)
                 (useWithGraphical (laptop ++ homebox ++ iso) nathan-scripts)
                 (useWithGraphical (laptop ++ homebox ++ iso) nathan-pywal)
+                (useWithGraphical (laptop ++ homebox) nathan-packagesFull)
+                (useWith (iso ++ pi4 ++ z2w ++ homebox ++ wsl) nathan-packagesMinimal)
                 (useWith (laptop ++ homebox) nathan-sops)
-                
-                (useWithGraphical laptop {
-                    wayland.windowManager.hyprland.extraConfig = ''
-                        monitor=eDP-1,1920x1080@60,0x0,1
-                        bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
-                        bind = ALT, Escape, exec, if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then hyprctl keyword monitor eDP-1,1920x1080@60,0x0,1; else hyprctl keyword monitor eDP-1,1920x1080@300,0x0,1; fi
-                    '';
-                })
-
-                (useWithGraphical (iso ++ homebox) {
-
-                    wayland.windowManager.hyprland.extraConfig = ''
-                        monitor=,preferred,auto,1
-                    '';
-                })
-
-                (useWithGraphical (homebox) {
-
-                    olympus = {
-                        packageSet = lib.mkForce "full";
-                    };
-                })
-
-                (useWith (iso ++ pi4 ++ z2w ++ homebox ++ wsl) {
-
-                    olympus = {
-                        packageSet = lib.mkDefault "minimal";
-                    };
-                })
             ];
         };
     };
diff --git a/packages/neovim/config/init.lua b/packages/neovim/config/init.lua
index d044a04..1832566 100644
--- a/packages/neovim/config/init.lua
+++ b/packages/neovim/config/init.lua
@@ -33,6 +33,8 @@ vim.o.wrap = false
 
 vim.o.confirm = true
 
+vim.o.exrc = true
+
 vim.api.nvim_create_autocmd('UIEnter', {
   callback = function()
     vim.o.clipboard = 'unnamedplus'
@@ -171,6 +173,8 @@ vim.keymap.set({ 'n' }, '<leader>S', ':%s `<C-r><C-w>`<C-r><C-w>`gI<Left><Left><
 
 vim.keymap.set({ 'n' }, '<leader>e', '<cmd>execute \'split | wincmd j | resize 10 | terminal\' | normal i<CR>')
 
+vim.keymap.set({ 'n' }, '<C-t>', '<cmd>trust<CR>')
+
 --vim.keymap.set({ 'n' }, '<C-y>', function() cmp.mapping.confirm({ select = true }) end)
 
 vim.keymap.set({ 'v' }, '<leader>s', 'y:%s `<C-R>"`<C-R>"`gI<Left><Left><Left>')