feat: update flake

Author: SapphicCode

flake.lock

@@ -2,8 +2,8 @@
   description = "Cassandra's everything flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/e897da8080bec8cbb6026c680818a035656c8da7";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/446b013ec787228fe8d8ae04c76788812b54ec13";
 
     flake-utils.url = "github:numtide/flake-utils";
 
@@ -15,11 +15,6 @@
       url = "github:LnL7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    pkg-mergiraf = {
-      url = "git+https://codeberg.org/mergiraf/mergiraf";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
   };
 
   outputs = {
@@ -29,7 +24,6 @@
     flake-utils,
     home-manager,
     nix-darwin,
-    pkg-mergiraf,
     ...
   }:
     {
@@ -60,7 +54,7 @@
       };
       overlays = [
         (final: prev: {
-          mergiraf = pkg-mergiraf.packages.${system}.mergiraf;
+
         })
       ];
       pkgs = import nixpkgs {
@@ -188,6 +182,10 @@
           modules = [./nix-darwin/host/maeve.nix];
           specialArgs = {inherit unstable;};
         };
+        Clementine = nix-darwin.lib.darwinSystem {
+          modules = [./nix-darwin/host/clementine.nix];
+          specialArgs = {inherit unstable;};
+        };
       };
 
       packages.thorium-browser = pkgs.callPackage ./packages/thorium-browser.nix {};

flake.nix

@@ -30,7 +30,6 @@ update OFFSET='3day': _pull
     git commit -m "flake: update inputs"
 
 switch-hm: _pull
-    chezmoi update -a
     home-manager switch --flake '.#{{hostname}}'
 
 switch-nixos: _pull

home-manager/module/fonts.nix

@@ -5,7 +5,7 @@ with pkgs;
     curl
     pv
     gptfdisk
-    gitFull
+    git
 
     # finding
     fd

justfile

@@ -41,6 +41,6 @@ with pkgs;
   ]
   ++ (
     if pkgs.stdenv.isDarwin
-    then [fallback.numbat]
+    then []
     else [pkgs.numbat]
   )

pkgset/00-core.nix

@@ -1,4 +1,7 @@
-{pkgs}:
+{
+  pkgs,
+  fallback ? pkgs,
+}:
 with pkgs; [
   # more shells!
   xonsh
@@ -25,7 +28,7 @@ with pkgs; [
   imagemagickBig
 
   # cloud utils
-  awscli2
+  fallback.awscli2
 
   # programming languages in global context
   python312

pkgset/20-comfy.nix

@@ -5,7 +5,7 @@ with pkgs; [
   merriweather
 
   fira-code
-  fira-code-nerdfont
+  nerd-fonts.fira-code
   iosevka
   iosevka-comfy.comfy
   departure-mono

pkgset/50-everything.nix

@@ -1,6 +1,6 @@
 {pkgs}:
 with pkgs; [
-  _1password
+  _1password-cli
   bashInteractive
   curl
   gnugrep