Update

flake.lock

@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775425411,
-        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
+        "lastModified": 1779506708,
+        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
+        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
         "type": "github"
       },
       "original": {
@@ -154,11 +154,11 @@
     },
     "nixpkgs-unstable_2": {
       "locked": {
-        "lastModified": 1776877367,
-        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
+        "lastModified": 1779560665,
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -218,11 +218,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1777077449,
-        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
+        "lastModified": 1779796641,
+        "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
+        "rev": "25f538306313eae3927264466c70d7001dcea1df",
         "type": "github"
       },
       "original": {
@@ -248,19 +248,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1776877367,
-        "narHash": "sha256-wMN1gM00sUQ2KC9CNr/XEOGdfOrl67PabIRv9AYayTo=",
-        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre985613.0726a0ecb6d4/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
     "noctalia": {
       "inputs": {
         "nixpkgs": [
@@ -269,11 +256,11 @@
         "noctalia-qs": "noctalia-qs"
       },
       "locked": {
-        "lastModified": 1777253304,
-        "narHash": "sha256-XqSHEKEW5pSAx9MoMo8mKPgkjoy4FEhZ4x0a6hGYrSI=",
+        "lastModified": 1779763713,
+        "narHash": "sha256-as2Vo4PitnWfXezfkQB2H3Rsr/DXJPp4Oe+dE+dZ0Xo=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "6773c4750a12c9e9af9c4ce2365e083f1d0d0ad8",
+        "rev": "272cd91408b5ff6e329e6397eed042fe422069e7",
         "type": "github"
       },
       "original": {
@@ -292,11 +279,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1777167795,
-        "narHash": "sha256-VHdtmxVX7oF2+FxYQQPARQmtaHw23FoTBiTaH6ucOEg=",
+        "lastModified": 1779588472,
+        "narHash": "sha256-CVonDVo41DqdqS/kNeXFatwEuTltyXcppm9zkVOnrsM=",
         "owner": "noctalia-dev",
         "repo": "noctalia-qs",
-        "rev": "697db4c14e27d841956ff76887fc312443e6fb17",
+        "rev": "70fea8a39a908e395de63024a4dfdb829bff1ffe",
         "type": "github"
       },
       "original": {
@@ -312,8 +299,7 @@
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable_2",
         "noctalia": "noctalia",
-        "sops-nix": "sops-nix",
-        "spicetify-nix": "spicetify-nix"
+        "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
@@ -321,11 +307,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1777338324,
-        "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -334,25 +320,6 @@
         "type": "github"
       }
     },
-    "spicetify-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_7",
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1777183994,
-        "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=",
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "rev": "501256c3e670ca1679501ce3839ea805df00d8ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,
@@ -398,21 +365,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [

flake.nix

@@ -24,8 +24,6 @@
       url = "github:noctalia-dev/noctalia-shell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # Add spicetify input
-    spicetify-nix.url = "github:Gerg-L/spicetify-nix";
   };
 
   outputs = {

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
@@ -49,10 +48,13 @@ in {
     unstablePkgs.podman-tui
     pkgs.popsicle
     nixers.python-env
+    unstablePkgs.quarto
     nixers.rbw-autofill
     unstablePkgs.ruff
     pkgs.signal-desktop
+    unstablePkgs.sone
     pkgs.sshs
+    unstablePkgs.typst
     unstablePkgs.uv
     pkgs.vial
     nixers.vivaldi-wayland

home-manager/worklaptop/programs.nix

@@ -10,7 +10,6 @@
 }: {
   imports = [
     inputs.noctalia.homeModules.default
-    inputs.spicetify-nix.homeManagerModules.default
   ];
 
   programs = {
@@ -35,31 +34,5 @@
       };
     };
     hyprcursor-phinger.enable = true;
-    spicetify = let
-      spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-    in {
-      enable = true;
-      theme = {
-        name = "TokyoNight";
-        src = pkgs.fetchFromGitHub {
-          owner = "evening-hs";
-          repo = "Spotify-Tokyo-Night-Theme";
-          rev = "main";
-          hash = "sha256-cLj9v8qtHsdV9FfzV2Qf4pWO8AOBXu51U/lUMvdEXAk=";
-        };
-        appendName = false;
-        injectCss = true;
-        replaceColors = true;
-        overwriteAssets = true;
-      };
-      colorScheme = "Night";
-      enabledExtensions = with spicePkgs.extensions; [
-        adblock
-        shuffle
-        hidePodcasts
-        fullAppDisplay
-        trashbin
-      ];
-    };
   };
 }

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/packages.nix

@@ -42,6 +42,7 @@
     pkgs.rm-improved
     pkgs.starship
     pkgs.tealdeer
+    pkgs.tree-sitter
     pkgs.wget
     pkgs.wl-clipboard
     pkgs.wtype

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;

nixos/worklaptop/services.nix

@@ -29,6 +29,28 @@
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
+
+      extraConfig.pipewire."99-high-res-audio" = {
+        "context.properties" = {
+          "default.clock.rate" = 48000;
+          "default.clock.allowed-rates" = [44100 48000 88200 96000 176400 192000];
+        };
+      };
+
+      wireplumber.extraConfig."10-high-res-audio" = {
+        "monitor.alsa.rules" = [
+          {
+            matches = [
+              {"node.name" = "~alsa_output.*";}
+            ];
+            actions = {
+              update-props = {
+                "audio.format" = "S32LE";
+              };
+            };
+          }
+        ];
+      };
     };
 
     gvfs.enable = true;