diff --git a/flake.lock b/flake.lock
index fe8e1ad..7e8f4ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,7 +43,9 @@
       "inputs": {
         "devenv": "devenv",
         "fenix": "fenix",
-        "flake-parts": "flake-parts",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "flake-root": "flake-root",
         "mk-shell-bin": "mk-shell-bin",
         "nix2container": "nix2container",
@@ -356,15 +358,17 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1698882062,
-        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
-        "path": "/nix/store/vf5ra8smwlqy3pi0300s580g5msc3xp7-source",
-        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
-        "type": "path"
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
       },
       "original": {
-        "id": "flake-parts",
-        "type": "indirect"
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
       }
     },
     "flake-parts_2": {
@@ -967,19 +971,16 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "dir": "lib",
-        "lastModified": 1698611440,
-        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
         "type": "github"
       },
       "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
         "type": "github"
       }
     },
@@ -1173,6 +1174,7 @@
         "darwin": "darwin_2",
         "deploy-rs": "deploy-rs",
         "disko": "disko",
+        "flake-parts": "flake-parts",
         "grasp": "grasp",
         "hardware": "hardware",
         "home-manager": "home-manager_2",
diff --git a/flake.nix b/flake.nix
index bebefa3..24e4002 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,9 +85,11 @@
     };
     tidalcycles.url = "github:mitchmindtree/tidalcycles.nix";
     tidalcycles.inputs.nixpkgs.follows = "unstable";
+    flake-parts.url = "github:hercules-ci/flake-parts";
     autohide-tdrop = {
       url = "github:I-Want-ToBelieve/autohide-tdrop";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
     };
     # TODO hundred rabbits software
     # TODO needs secrets
@@ -156,6 +158,7 @@
               pkg:
               builtins.elem (nixpkgs.lib.getName pkg) [
                 "ripcord"
+                "obsidian"
                 "vcv-rack"
                 "SunVox"
                 "renoise"
@@ -271,8 +274,10 @@
         system:
         let
           pkgs = nixpkgsFor.${system};
+          allPkgs = import ./pkgs { pkgs = pkgs; };
         in
-        import ./pkgs { pkgs = pkgs; }
+        # Filter out non-derivation attributes (e.g. obsidianPlugins is an attrset)
+        nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) allPkgs
       );
       # Devshell for bootstrapping
       # Acessible through 'nix develop' or 'nix-shell' (legacy)
@@ -313,6 +318,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.backupFileExtension = "hm-bak";
               home-manager.users.anish = import ./home/gui;
             }
           ];
@@ -352,6 +358,7 @@
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
+              home-manager.backupFileExtension = "hm-bak";
               home-manager.users.anish = import ./home/core;
             }
           ];
@@ -378,6 +385,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.backupFileExtension = "hm-bak";
               home-manager.users.anish = import ./home/dev;
             }
           ];
diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix
index 518d079..036e9f1 100644
--- a/home/profiles/cli/default.nix
+++ b/home/profiles/cli/default.nix
@@ -29,7 +29,7 @@
       skim
       tealdeer
       usbutils
-      utillinux
+      util-linux
       whois
       iftop
       wget