flake.lock: Update

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/e55f9a8678adc02024a4877c2a403e3f6daf24fe' (2024-09-03)
  → 'github:nix-community/disko/51994df8ba24d5db5459ccf17b6494643301ad28' (2024-09-20)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/3fd4c14d3683baac8d1f94286ae14fe160888b51' (2024-08-01)
  → 'github:nix-community/dream2nix/b76c529f377100516c40c5b6e239a4525fdcabe0' (2024-09-16)
• Updated input 'flakeParts':
    'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6' (2024-09-01)
  → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a' (2024-09-12)
• Updated input 'homeManager':
    'github:nix-community/home-manager/be47a2bdf278c57c2d05e747a13ed31cef54a037' (2024-09-09)
  → 'github:nix-community/home-manager/04213d1ce4221f5d9b40bcee30706ce9a91d148d' (2024-09-22)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=c14486ae8d3bbc862c625d948a6b2f4dc0927d5b' (2024-09-09)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=5f298f74c92402a8390b01c736463b17b36277e3' (2024-09-21)
• Updated input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=353b25f0b6da5ede15206d416345a2ec4195b5c8' (2024-09-08)
  → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=b0e6f359500d66670cc16f521e4f62d6a0a4864e' (2024-09-18)
• Updated input 'lix-module/flake-utils':
    'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
  → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/672f8299e484301994858d9220921309f631d616' (2024-09-06)
  → 'github:NixOS/mobile-nixos/a386813d9ec46fa32e51488f7d48c0e1bde77f8e' (2024-09-21)
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/76559183801030451e200c90a1627c1d82bb4910' (2024-09-06)
  → 'github:LnL7/nix-darwin/bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d' (2024-09-22)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/166dee4f88a7e3ba1b7a243edb1aca822f00680e' (2024-09-09)
  → 'github:NixOS/nixos-hardware/b493dfd4a8cf9552932179e56ff3b5819a9b8381' (2024-09-21)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/268bb5090a3c6ac5e1615b38542a868b52ef8088' (2024-09-19)
  → 'github:NixOS/nixpkgs/9c711566cde5929768e311413eaa2399631624ce' (2024-09-22)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/9fb342d14b69aefdf46187f6bb80a4a0d97007cd' (2024-09-02)
  → 'github:numtide/treefmt-nix/ee41a466c2255a3abe6bc50fc6be927cdee57a9f' (2024-09-19)

flake.lock

@@ -21,21 +21,6 @@
         "type": "github"
       }
     },
-    "catppuccin": {
-      "locked": {
-        "lastModified": 1726952185,
-        "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -86,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727086915,
+        "lastModified": 1726842196,
-        "narHash": "sha256-mqoWnKQRbA3AsyW9cg9ttqKvOY0IvdEz+/lf1qwsKnE=",
+        "narHash": "sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP+aXWgwm70o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "49b22d486c2bd1ce3102881c948e58c14b58152a",
+        "rev": "51994df8ba24d5db5459ccf17b6494643301ad28",
         "type": "github"
       },
       "original": {
@@ -691,11 +676,11 @@
     },
     "nixosHardware": {
       "locked": {
-        "lastModified": 1727040444,
+        "lastModified": 1726905744,
-        "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
+        "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
+        "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381",
         "type": "github"
       },
       "original": {
@@ -897,11 +882,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1727094993,
+        "lastModified": 1727007089,
-        "narHash": "sha256-cf1MsBKTkEK3aDgEADqCu1MqffUMkVefPZTk6p29dU8=",
+        "narHash": "sha256-vsyRYF7MSJE5FHrQdcY3g+CORy6K/6NW+Cw00+VvNy0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea9a0aed95904e86dd0084a70c8ecd89a28e9c0a",
+        "rev": "9c711566cde5929768e311413eaa2399631624ce",
         "type": "github"
       },
       "original": {
@@ -1104,7 +1089,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "catppuccin": "catppuccin",
         "disko": "disko",
         "dream2nix": "dream2nix",
         "flakeParts": "flakeParts",

flake.nix

@@ -59,7 +59,6 @@
       url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs =

hmModules/btop/default.nix

@@ -1,9 +1,21 @@
+{ pkgs, ... }:
 {
   programs.btop = {
     enable = true;
     settings = {
       update_ms = 100;
       theme_background = false;
+      # color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
+      color_theme =
+        let
+          catppuccin-theme = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "btop";
+            rev = "21b8d5956a8b07fa52519e3267fb3a2d2e693d17";
+            hash = "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=";
+          };
+        in
+        "${catppuccin-theme}/themes/catppuccin_mocha.theme";
     };
   };
 }

hmModules/catppuccin/default.nix

@@ -1,39 +0,0 @@
-{ lib, ... }:
-{
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    accent = "sapphire";
-  };
-
-  qt = {
-    platformTheme.name = lib.mkForce "kvantum";
-    style.name = lib.mkForce "kvantum";
-  };
-
-  # TODO move away
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      font = {
-        normal = {
-          family = "Fira Code";
-          style = "Regular";
-        };
-        bold = {
-          family = "Fira Code";
-          style = "Bold";
-        };
-        italic = {
-          family = "Cascadia Code";
-          style = "Italic";
-        };
-        bold_italic = {
-          family = "Fira Code";
-          style = "Bold Italic";
-        };
-        size = 13;
-      };
-    };
-  };
-}

hmModules/foot/default.nix

@@ -1,50 +1,59 @@
 {
   lib,
+  pkgs,
   config,
   ...
 }:
 lib.mkMerge [
   {
-    programs.foot = {
+    programs.foot =
-      enable = true;
+      let
-      server.enable = true;
+        catppuccin = pkgs.fetchFromGitHub {
-      settings = {
+          owner = "catppuccin";
-        main = {
+          repo = "foot";
-          term = "xterm-256color";
+          rev = "307611230661b7b1787feb7f9d122e851bae97e9";
-          login-shell = "yes";
+          hash = "sha256-mkPYHDJtfdfDnqLr1YOjaBpn4lCceok36LrnkUkNIE4=";
-          dpi-aware = "no";
+        };
-          horizontal-letter-offset = "1";
+      in
-          font =
+      {
-            let
+        enable = true;
-              size = "13";
+        server.enable = true;
-            in
+        settings = {
-            lib.mkForce (
+          main = {
+            term = "xterm-256color";
+            login-shell = "yes";
+            dpi-aware = "no";
+            horizontal-letter-offset = "1";
+            include = "${catppuccin}/themes/catppuccin-mocha.ini";
+            font =
+              let
+                size = "13";
+              in
               lib.concatStringsSep ", " [
                 "Iosevka Comfy:size=${size}"
                 "Symbols Nerd Font:size=${size}"
                 "JoyPixels:size=${size}"
-              ]
+              ];
-            );
+          };
-        };
+          cursor = {
-        cursor = {
+            blink = true;
-          blink = true;
+          };
-        };
+          tweak = {
-        tweak = {
+            overflowing-glyphs = true;
-          overflowing-glyphs = true;
+          };
-        };
 
-        key-bindings = {
+          key-bindings = {
-          scrollback-up-page = "Control+Shift+k";
+            scrollback-up-page = "Control+Shift+k";
-          scrollback-down-page = "Control+Shift+j";
+            scrollback-down-page = "Control+Shift+j";
-          search-start = "Control+Shift+s";
+            search-start = "Control+Shift+s";
-          pipe-command-output = ''[sh -c 'f=$(mktemp); cat - > $f; footclient hx $f; rm $f'] Control+Shift+g'';
+            pipe-command-output = ''[sh -c 'f=$(mktemp); cat - > $f; footclient hx $f; rm $f'] Control+Shift+g'';
-        };
+          };
 
-        mouse = {
+          mouse = {
-          hide-when-typing = "yes";
+            hide-when-typing = "yes";
+          };
         };
       };
-    };
   }
   (lib.mkIf config.programs.fish.enable {
     programs.fish.functions = {

hmModules/helix/default.nix

@@ -12,6 +12,7 @@
     enable = true;
     defaultEditor = true;
     settings = {
+      theme = "catppuccin_mocha";
       editor = {
         indent-guides.render = true;
         cursor-shape = {

hmModules/hyprland/default.nix

@@ -56,20 +56,21 @@ in
 
   gtk = {
     enable = true;
-    # font.name = lib.mkForce "Sans,Symbols Nerd Font";
+    font.name = "Sans,Symbols Nerd Font";
     iconTheme = {
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
-    # cursorTheme = {
+    cursorTheme = {
-    #   name = "catppuccin-mocha-sapphire";
+      name = "catppuccin-mocha-sapphire";
-    #   package = pkgs.catppuccin-cursors;
+      package = pkgs.catppuccin-cursors;
-    #   size = 48;
+      size = 48;
-    # };
+    };
   };
 
   qt = {
     enable = true;
+    platformTheme.name = "gtk3";
   };
 
   # services.kanshi = {

hmModules/shell/default.nix

@@ -116,11 +116,45 @@
   #   '';
   # };
 
+  xdg.configFile = {
+    "dracula-theme" = {
+      target = "fish/themes/dracula.theme";
+      source =
+        let
+          theme = pkgs.fetchFromGitHub {
+            owner = "dracula";
+            repo = "fish";
+            rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
+            hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
+          };
+        in
+        "${theme}/themes/Dracula\ Official.theme";
+    };
+    "catppuccin-theme" = {
+      target = "fish/themes/Catppuccin\ Mocha.theme";
+      source =
+        let
+          theme = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "fish";
+            rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf";
+            hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
+          };
+        in
+        "${theme}/themes/Catppuccin\ Mocha.theme";
+    };
+  };
+
   programs.fish = {
     enable = true;
-    shellInit = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
+    shellInit =
-      export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
+      ''
-    '';
+        fish_config theme choose "dracula"
+        fish_config theme choose "Catppuccin Mocha"
+      ''
+      + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
+        export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
+      '';
     shellAliases = {
       "cat" = "bat";
     };

hmModules/sway/default.nix

@@ -28,7 +28,7 @@
 
     gtk = {
       enable = true;
-      font.name = lib.mkForce "Sans,Symbols Nerd Font";
+      font.name = "Sans,Symbols Nerd Font";
       iconTheme = {
         name = "Adwaita";
         package = pkgs.adwaita-icon-theme;

hmModules/wezterm/default.nix

@@ -1,6 +1,64 @@
+{
+  pkgs,
+  hostname,
+  ...
+}:
 {
   programs.wezterm = {
     enable = true;
+    package =
+      if hostname == "pircard" then
+        (pkgs.wezterm.overrideAttrs (old: rec {
+          pname = "wezterm";
+          version = "20240406-cce0706";
+          src = pkgs.fetchFromGitHub {
+            owner = "wez";
+            repo = "${pname}";
+            rev = "cce0706b1f2a9e2d1f02c57f2d1cd367c91df1ae";
+            fetchSubmodules = true;
+            hash = "sha256-BBPxidOpFrw/tIRTqMSREyJF3QEWOwlIoVRT3FD62sQ=";
+          };
+          cargoDeps = pkgs.rustPlatform.importCargoLock {
+            lockFile = "${src}/Cargo.lock";
+            outputHashes = {
+              "xcb-imdkit-0.3.0" = "sha256-fTpJ6uNhjmCWv7dZqVgYuS2Uic36XNYTbqlaly5QBjI=";
+            };
+          };
+          patches = (old.patches or [ ]) ++ [
+            (pkgs.fetchpatch {
+              # fix(wayland): ensure repaint event is sent in show
+              url = "https://patch-diff.githubusercontent.com/raw/wez/wezterm/pull/5264.patch";
+              hash = "sha256-c+frVaBEL0h3PJvNu3AW2iap+uUXBY8olbm7Wsxuh4Q=";
+            })
+            (pkgs.writeText "wezterm-remove_capabilities.patch" ''
+              diff --git a/window/src/os/wayland/seat.rs b/window/src/os/wayland/seat.rs
+              index 3798f4259..e91591130 100644
+              --- a/window/src/os/wayland/seat.rs
+              +++ b/window/src/os/wayland/seat.rs
+              @@ -65,9 +65,15 @@ impl SeatHandler for WaylandState {
+                       _conn: &Connection,
+                       _qh: &QueueHandle<Self>,
+                       _seat: WlSeat,
+              -        _capability: smithay_client_toolkit::seat::Capability,
+              +        capability: smithay_client_toolkit::seat::Capability,
+                   ) {
+              -        todo!()
+              +        if capability == Capability::Keyboard && self.keyboard.is_some() {
+              +            self.keyboard.take().unwrap().release();
+              +        }
+              +
+              +        if capability == Capability::Pointer && self.pointer.is_some() {
+              +            self.pointer = None;
+              +        }
+                   }
+
+                   fn remove_seat(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>, _seat: WlSeat) {
+            '')
+          ];
+        }))
+      else
+        pkgs.wezterm;
+
     extraConfig = ''
       return {
         -- enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483

hosts/default.nix

@@ -68,13 +68,11 @@
           inputs.nixThePlanet.nixosModules.macos-ventura
           inputs.lix-module.nixosModules.default
           inputs.lanzaboote.nixosModules.lanzaboote
-          inputs.catppuccin.nixosModules.catppuccin
         ];
         extraHmModules = [
           # inputs.ccrEmacs.hmModules.default
           "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
           inputs.vscode-server.nixosModules.home
-          inputs.catppuccin.homeManagerModules.catppuccin
         ];
         secrets = {
           "picard-wireguard-private-key" = { };

hosts/picard/default.nix

@@ -58,6 +58,7 @@
       "element"
       "zmkbatx"
       "tremotesf"
+      # "emacs"
       "firefox"
       "gpg"
       "mpv"
@@ -84,7 +85,6 @@
       "reinstall-magisk-on-lineage"
       "vscode-server"
       "zk"
-      "catppuccin"
     ];
     extraGroups = [ ];
     backupPaths = [ ];

modules/nix/default.nix

@@ -32,7 +32,7 @@
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M="
       ];
-      deprecated-features = [ "url-literals" ];
+      # deprecated-features = [ "url-literals" ];
     };
 
     nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ];