Fixed issue with git pulls on flake.lock

home-manager/core/dotfiles.nix

@@ -25,6 +25,22 @@
   };
 
   noctaliaPluginFiles = builtins.listToAttrs (map makeNoctaliaEntries noctaliaPlugins);
+
+  customPluginsDir = ./dotfiles/dot_config/noctalia/plugins-custom;
+  customPlugins = builtins.attrNames (
+    lib.filterAttrs (name: type: type == "directory") (builtins.readDir customPluginsDir)
+  );
+
+  makeCustomEntries = plugin: {
+    name = "noctalia-custom-plugin-${plugin}";
+    value = {
+      source = customPluginsDir + "/${plugin}";
+      target = ".config/noctalia/plugins/${plugin}";
+      recursive = true;
+    };
+  };
+
+  customPluginFiles = builtins.listToAttrs (map makeCustomEntries customPlugins);
 in {
   home.file =
     {
@@ -66,6 +82,7 @@ in {
             ! (
               (lib.hasInfix "/plugins/" name)
               || (lib.hasInfix "/plugins-repo/" name)
+              || (lib.hasInfix "/plugins-custom/" name)
               # || (lib.hasInfix "/plugins-settings/" name)
             );
         };
@@ -92,7 +109,8 @@ in {
         recursive = true;
       };
     }
-    // noctaliaPluginFiles;
+    // noctaliaPluginFiles
+    // customPluginFiles;
 
   # Move across noctalia plugin settings as a writable overlay
   home.activation.overlayNoctaliaSettings = lib.hm.dag.entryAfter ["writeBoundary"] ''

home-manager/core/packages.nix

@@ -17,5 +17,8 @@
     unstablePkgs.lazygit
     unstablePkgs.nixd
     unstablePkgs.nushell
+    unstablePkgs.nh
+    unstablePkgs.nix-output-monitor
+    unstablePkgs.nvd
   ];
 }

home-manager/worklaptop/packages.nix

@@ -35,7 +35,6 @@ in {
     pkgs.minikube
     unstablePkgs.mission-center
     pkgs.neovide
-    pkgs.nix-output-monitor
     pkgs.nix-tree
     pkgs.nh
     pkgs.nodejs_24

justfile

@@ -10,11 +10,20 @@ default:
 
 _git-sync:
     @if [ -n "$(git status --porcelain)" ]; then \
-        echo ">> Stashing local changes..."; \
-        git stash; \
-        git pull --ff-only --recurse-submodules; \
-        git submodule update --remote --recursive; \
-        git stash pop; \
+        if git status --porcelain | grep -q "flake.lock"; then \
+            echo ">> flake.lock is dirty. Resetting to avoid pull conflicts..."; \
+            git checkout flake.lock; \
+        fi; \
+        if [ -n "$(git status --porcelain)" ]; then \
+            echo ">> Stashing remaining local changes..."; \
+            git stash; \
+            git pull --ff-only --recurse-submodules; \
+            git submodule update --remote --recursive; \
+            git stash pop; \
+        else \
+            git pull --ff-only --recurse-submodules; \
+            git submodule update --remote --recursive; \
+        fi; \
     else \
         git pull --ff-only --recurse-submodules; \
         git submodule update --remote --recursive; \
@@ -23,6 +32,11 @@ _git-sync:
 _flake-update:
     nix flake update
 
+# Safely commit the lockfile changes
+commit-lock:
+    git add flake.lock
+    git commit -m "chore: update flake.lock" || echo "No changes to commit"
+
 # Sync git and update flake inputs (override with git=false or flake=false)
 prebuild:
     @if [ "{{git}}" == "true" ]; then \

nixos/core/programs.nix

@@ -9,4 +9,11 @@
   imports = [
     ./programs/neovim.nix
   ];
+
+  programs.nh = {
+    enable = true;
+    clean.enable = true;
+    clean.extraArgs = "--keep-since 7d --keep 5";
+    flake = "/home/cianh/.config/nix";
+  };
 }

nixos/worklaptop.nix

@@ -106,11 +106,6 @@
   nix = {
     registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];
-    gc = {
-      automatic = true;
-      dates = "daily";
-      options = "--delete-older-than 14d";
-    };
     settings = {
       experimental-features = "nix-command flakes";
       auto-optimise-store = true;