working declarative nvim

need to add plugins

flake.lock

@@ -37,6 +37,43 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751685974,
+        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "ref": "refs/heads/main",
+        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "revCount": 92,
+        "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-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753121425,
+        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -64,11 +101,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1754941490,
+        "lastModified": 1751123364,
-        "narHash": "sha256-2AJf0q4u1zakqjr0y4dCyqzdDSil8P5m2YpZxAAzJJw=",
+        "narHash": "sha256-Nb3pxs1onnbdhhnoNc+IfHzrW9dM+UbEdjK0AguR2J4=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "5bf632e9cc0e77a578bad983b0cbdf0451ce87d4",
+        "rev": "f6d1c274b9c0e095dc0a1b411dec7410ad779bf5",
         "type": "github"
       },
       "original": {
@@ -84,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753592768,
+        "lastModified": 1750792728,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
         "type": "github"
       },
       "original": {
@@ -98,6 +135,21 @@
         "type": "github"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1748710831,
+        "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1739444422,
@@ -129,11 +181,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1754767907,
+        "lastModified": 1750969886,
-        "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=",
+        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc",
+        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
         "type": "github"
       },
       "original": {
@@ -143,13 +195,52 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1753432016,
+        "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts",
+        "mnw": "mnw",
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1754552918,
+        "narHash": "sha256-vbT+nGdMLNAeYZ1S5WBBLJTVWosGne2VRt46rqPfB2A=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "d61de135ce174f4e04b4e509de02e1afe040a834",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "nvf": "nvf"
       }
     },
     "systems": {
@@ -167,11 +258,25 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "zig": {
       "inputs": {
         "flake-compat": [
-          "ghostty",
+          "ghostty"
-          "flake-compat"
         ],
         "flake-utils": [
           "ghostty",
@@ -217,8 +322,8 @@
       },
       "original": {
         "owner": "jcollie",
+        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "repo": "zon2nix",
-        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       }
     }

flake.nix

@@ -12,6 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
+    nvf.url = "github:notashelf/nvf";
   };
 
   outputs = inputs @ {
@@ -21,12 +22,13 @@
     darwin,
     home-manager,
     ghostty,
+    nvf,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail ghostty;
+      inherit userName userEmail ghostty nvf;
     };
   in {
     meta = import ./meta;
@@ -57,7 +59,7 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail ghostty;
+        inherit userName userEmail; 
         hostname = "cloud";
         role = "devel";
       };

home/default.nix

@@ -4,6 +4,7 @@
   userName,
   userEmail,
   ghostty,
+  nvf,
   ...
 }: let
   # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -13,7 +14,7 @@
   };
 in {
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty nvf;}) [
     ./atuin.nix
     ./shell.nix
     ./packages

home/git.nix

@@ -15,7 +15,7 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.rebase = false;
+      pull.merge = true;
       merge.tool = "nvimdiff";
       mergetool.keepBackup = false;
     };

home/neovim.nix

@@ -1,14 +1,22 @@
-{dirs, ...}: {
+{ nvf, ...}: {
-  programs.neovim = {
+  imports = [
-    enable = true;
+    nvf.homeManagerModules.default
-    defaultEditor = true;
+  ];
-    vimAlias = true;
-  };
 
-  xdg.configFile = {
+  programs.nvf.enable = true;
-    nvim = {
+
-      onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
+  ### --- OLD NEOVIM CONFIG BASED ON LUA CONFIG ---
-      source = dirs.defaults + /nvim;
+  #
-    };
+  # programs.neovim = {
-  };
+  #   enable = true;
+  #   defaultEditor = true;
+  #   vimAlias = true;
+  # };
+  #
+  # xdg.configFile = {
+  #   nvim = {
+  #     onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
+  #     source = dirs.defaults + /nvim;
+  #   };
+  # };
 }

home/shell.nix

@@ -1,29 +1,30 @@
-{
+{pkgs, ...}: {
-  lib,
+  programs.fish = {
-  pkgs,
-  userName,
-  ...
-}: {
-  programs = {
-    fish = {
     enable = true;
+    # initExtra = ''
+    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
+    # '';
+
     shellAliases = {
       # ls aliases
       ls = "eza --color";
       la = "eza -l -all --color";
       ll = "eza -l --color";
       lt = "eza -l --color --git";
+
       # lazygit alias
       lg = "lazygit";
+
       # cat, less, more alias
       cat = "bat";
       less = "bat";
       more = "bat";
+
       # top alias
       top = "btm";
     };
-      functions =
+
-        {
+    functions = {
       fish_greeting = {
         body = ''
           set memes \
@@ -42,60 +43,19 @@
             "Can I get a waffle? Can I please get a waffle?" \
             "I'm lesbian. I thought you were American." \
             "You gotta give 'em that 'hawk tuah' and spit on that thang!" \
-                "We don't do that here..." \
+            "We don't do that here..."
-                "What are those?! They are my crocs..." \
-                "It's an avocado... Thanks!" \
-                "I am once again asking for your financial support" \
-                "Is that a weed?" \
-                "No, this is Patrick!" \
-                "Come ride, heroes, ride" \
-                "Away with the tide" \
-                "Concede your mind unto the fiend" \
-                "Darkness come, rend the shield of light" \
-                "The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
-                "Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
-                "Snap click clank whirr whizz wham boom!" \
-                "Rohs an kyn ala na"
 
           set choose_meme (random)"%"(count $memes)
           set choose_meme $memes[(math $choose_meme"+1")]
+
           printf (set_color F90)"%s\n" $choose_meme
         '';
-            # onEvent = "fish_greeting";
+        onEvent = "fish_greeting";
       };
-        } // (lib.mkIf pkgs.stdenv.isLinux {
-          block = {
-            body = ''
-              echo "Starting systemd-inhibit..."
-              set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
-              bash -c 'systemd-inhibit --no-ask-password --what=idle --who="'${userName}'" --why="manual invocation" sh & echo $! > '"$inhibit_pid_file"' && disown'
-              if test -f $inhibit_pid_file
-                set -g INHIBIT_PID (cat $inhibit_pid_file)
-                echo "Inhibit process started with PID: $INHIBIT_PID"
-              else
-                echo "Failed to start inhibit process"
-                return 1
-              end
-            '';
     };
-          unblock = {
-            body = ''
-              set inhibit_pid_file /tmp/fish_inhibit_pid_(whoami)
-              if test -f $inhibit_pid_file
-                set INHIBIT_PID (cat $inhibit_pid_file)
-                echo "Killing inhibit process: $INHIBIT_PID"
-                kill -SIGTERM $INHIBIT_PID 2>/dev/null; or kill -SIGKILL $INHIBIT_PID 2>/dev/null
-                rm -f $inhibit_pid_file
-                set -e INHIBIT_PID
-                echo "Inhibit process terminated"
-              else
-                echo "No inhibit process file found"
-              end
-            '';
   };
-        });
+
-    };
+  programs.zsh = {
-    zsh = {
     enable = true;
     initContent = ''
       if [[ -z "$BASH_EXECUTION_STRING" ]]; then
@@ -108,7 +68,8 @@
       fi
     '';
   };
-    bash = {
+
+  programs.bash = {
     enable = true;
     initExtra = ''
       if [[ -z "$BASH_EXECUTION_STRING" ]]; then
@@ -121,5 +82,4 @@
       fi
     '';
   };
-  };
 }

home/sway.nix

@@ -147,5 +147,20 @@ in {
   programs.waybar = {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
+
+    package = pkgs.waybar.overrideAttrs (old: {
+      version = "0.11.0";
+
+      src = pkgs.fetchFromGitHub {
+        owner = "Alexays";
+        repo = "Waybar";
+        rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
+        sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
+      # mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
+    });
   };
 }

modules/apps/appimage.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.appimage;
-in {
-  options.appimage = {
-    enable = mkEnableOption "AppImage support";
-  };
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      appimageupdate
-      appimage-run
-    ];
-  };
-}

modules/machine/cloud/configuration.nix

@@ -21,13 +21,11 @@ in {
       inherit lib pkgs flatpakPackages;
     })
     ../../apps/gaming.nix
-    ../../apps/appimage.nix
     ../../graphics
     ../../pwrMgmt
     ../../networking/core.nix
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
-    ../../sound/focusrite.nix
     ../../virtualization/podman.nix
     ../../virtualization/hardware.nix
   ];
@@ -36,13 +34,9 @@ in {
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
   # Custom kernel/boot stuff
-  boot = {
+  boot.kernelPackages = pkgs.linuxPackages_latest;
-    kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
-    loader = {
+  boot.loader.efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
 
   # Enable Bluetooth if present
   hardware.bluetooth.enable = true;
@@ -69,6 +63,21 @@ in {
     wl-clip-persist
   ];
 
+  # 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;
 
@@ -136,39 +145,14 @@ in {
     networkManager.enable = true;
   };
 
-  programs = {
-    # Enable GnuPG
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-    # Enable SUID wrappers (some programs need them)
-    mtr.enable = true;
-
   # Enable dconf
-    dconf.enable = true;
+  programs.dconf.enable = true;
-  };
 
   # Add username to groups "wheel" and "video" - more may be added here later
   users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
 
-  services = {
-    # Enable OpenSSH
-    openssh.enable = true;
-
-    # Enable keyring
-    gnome.gnome-keyring.enable = true;
-
   # Flatpak packages (see ../../apps/flatpak.nix)
-    flatpak.packages = flatpakPackages;
+  services.flatpak.packages = flatpakPackages;
-  };
-
-  # Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
-  sound.hardware.focusrite.enable = true;
-
-  # AppImage support
-  appimage.enable = true;
 
   # XDG stuff
   xdg = {

modules/sound/focusrite.nix

@@ -1,33 +0,0 @@
-# Must be paired with the pipewire Nix module, this does nothing but install packages
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.sound.hardware.focusrite;
-in {
-  options.sound.hardware.focusrite = {
-    enable = mkEnableOption "Focusrite audio interface support";
-    guiSupport = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      environment.systemPackages = with pkgs;
-        [
-          scarlett2
-          alsa-scarlett-gui
-        ]
-        ++ (
-          if cfg.guiSupport
-          then [pkgs.alsa-scarlett-gui]
-          else []
-        );
-    }
-  ]);
-}