📦 Update dependencies, fix ze deprecated setting

🔐 Reencrypt weather api key
Merge remote-tracking branch 'origin/main' into thinkpad
2025-03-05 21:57:55 +01:00 · 2025-03-03 22:00:16 +01:00 · 2025-03-03 21:52:34 +01:00 · 2025-03-03 21:46:38 +01:00 · 2025-03-02 08:19:45 +01:00 · 2025-03-01 23:00:24 +01:00
22 changed files with 432 additions and 205 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+home-manager/secrets/* filter=git-crypt diff=git-crypt
--- a/configuration.nix
+++ b/configuration.nix
@ -1,6 +1,5 @@
 {
  pkgs,
-  inputs,
  outputs,
  ...
 }:
@ -44,7 +43,7 @@ in
    xdg-utils
    xdg-desktop-portal
    xdg-desktop-portal-gtk
-    protonmail-desktop
+    unstable.protonmail-desktop
    stremio
    fastfetch
    discord
@ -52,9 +51,6 @@ in
    gimp
    vlc
    vdhcoapp
-    fortune
-    cowsay
-    inputs.zen-browser.packages.${system}.default # beta
    onlyoffice-desktopeditors
  ];

--- a/flake.lock
+++ b/flake.lock
@ -49,11 +49,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1739094937,
-        "narHash": "sha256-LemSQ5AZHwl4ZVlirdpAytDWgS96OZsct7Akx/REdGA=",
+        "lastModified": 1739934729,
+        "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "aee0cec463e62702751adaeb9f4fc00f2f72879b",
+        "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf",
        "type": "github"
      },
      "original": {
@ -62,41 +62,6 @@
        "type": "github"
      }
    },
-    "devshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735644329,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "revCount": 69,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-      }
-    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@ -136,54 +101,6 @@
        "type": "github"
      }
    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "nixvim",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737465171,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -191,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
        "type": "github"
      },
      "original": {
@ -205,27 +122,6 @@
        "type": "github"
      }
    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738878603,
-        "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
    "hyprpanel": {
      "inputs": {
        "ags": "ags",
@ -234,11 +130,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739002652,
-        "narHash": "sha256-W83O9ASWUFaDAFY7H9vvW/Gm9PN5Lkh0McYW3bA/6aU=",
+        "lastModified": 1740863579,
+        "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=",
        "owner": "Jas-SinghFSU",
        "repo": "HyprPanel",
-        "rev": "0d5f80ff5cd525b8f27adfb84cef67d90e3d7f10",
+        "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd",
        "type": "github"
      },
      "original": {
@ -275,27 +171,6 @@
        "type": "github"
      }
    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738743987,
-        "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1736012469,
@ -314,11 +189,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1739020877,
-        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "lastModified": 1741010256,
+        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
        "type": "github"
      },
      "original": {
@ -330,11 +205,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1738843498,
-        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
+        "lastModified": 1741048562,
+        "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
+        "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f",
        "type": "github"
      },
      "original": {
@ -362,24 +237,18 @@
    },
    "nixvim": {
      "inputs": {
-        "devshell": "devshell",
-        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
-        "home-manager": "home-manager_2",
-        "nix-darwin": "nix-darwin",
        "nixpkgs": [
          "nixpkgs-unstable"
        ],
-        "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": "treefmt-nix"
+        "nuschtosSearch": "nuschtosSearch"
      },
      "locked": {
-        "lastModified": 1738966895,
-        "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=",
+        "lastModified": 1741098523,
+        "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07",
+        "rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
        "type": "github"
      },
      "original": {
@ -431,11 +300,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1739074574,
-        "narHash": "sha256-dLfT4/nIU3RzMHk7I5UigRehSWzq7wGkZxwuQdflO6s=",
+        "lastModified": 1740889006,
+        "narHash": "sha256-A1iyKVvZrLdLwqWPC9OvPjC85ADQn2R1EGfCzJBl+wI=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "366191fe8e9375d280e9a6b0ed9823468b49f6e7",
+        "rev": "f8d3757d4ae3af2175a631fb9598a42d30ee75fc",
        "type": "github"
      },
      "original": {
@ -474,37 +343,16 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738680491,
-        "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
    "zen-browser": {
      "inputs": {
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1739071251,
-        "narHash": "sha256-Kj4grI7YpHk2RIsy73Dwg7ikDn94MI7zKrWN0BXrvJI=",
+        "lastModified": 1740554227,
+        "narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=",
        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
-        "rev": "410d6e9a8ba0edd163d0828a4cda1b1f267f2e1a",
+        "rev": "7de16ae319e6f6852274fa90b0d41c00049767c9",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -48,6 +48,8 @@
      devShells.${system}.default = pkgs.mkShell {
        packages = with pkgs; [
          just
+          git
+          git-crypt
          nh
        ];
      };
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@ -28,6 +28,7 @@ in
    ./hyprland
    ./spicetify.nix # TODO env conflict on latest version
    ./yazi
+    ./zen
  ];

  dconf = {
--- a/home-manager/development/git.nix
+++ b/home-manager/development/git.nix
@ -1,23 +1,33 @@
+{ pkgs, ... }:
+
 {
-  programs.git = {
-    enable = true;
-    userName = "Martin Berg Alstad";
-    userEmail = "git@martials.no";
+  home.packages = with pkgs; [ git-crypt ];

-    aliases = {
-      amend = "commit --amend";
-      cm = "commit";
-      s = "status";
-    };
+  programs.git =
+    let
+      package = pkgs.git.override { withLibsecret = true; };
+    in
+    {
+      enable = true;
+      package = package;
+      userName = "Martin Berg Alstad";
+      userEmail = "git@martials.no";

-    signing = {
-      signByDefault = true;
-      key = "848D71DE0590C199";
-    };
+      aliases = {
+        amend = "commit --amend";
+        cm = "commit";
+        s = "status";
+      };

-    extraConfig = {
-      push.autoSetupRemote = true;
-      safe.directory = "/etc/nixos";
+      signing = {
+        signByDefault = true;
+        key = "848D71DE0590C199";
+      };
+
+      extraConfig = {
+        push.autoSetupRemote = true;
+        safe.directory = "/etc/nixos";
+        credential.helper = "${package}/bin/git-credential-libsecret";
+      };
    };
-  };
 }
--- a/home-manager/development/zed.nix
+++ b/home-manager/development/zed.nix
@ -20,10 +20,25 @@
        fontSize = 14;
      in
      {
+        assistant = {
+          default_model = {
+            provider = "ollama";
+            model = "deepseek-r1:8b";
+          };
+          version = "2";
+        };
        autosave = "on_focus_change";
        base_keymap = "JetBrains";
        buffer_font_family = font;
-        icon-theme = "Catppuccin Mocha"; # TODO doesn't work?
+        features = {
+          edit_completion_provider = "zed";
+        };
+        icon_theme = "Catppuccin Mocha";
+        # icon_theme = { TODO replace icon theme above with below
+        #   mode = theme.mode;
+        #   light = "Catppuccin Mocha";
+        #   dark = "Catppuccin Mocha";
+        # };
        ui_font_family = font;
        ui_font_size = fontSize;
        buffer_font_size = fontSize;
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@ -20,7 +20,7 @@ in
      # Start starship when creating a new shell
      interactiveShellInit = ''
        starship init fish | source
-        fortune | cowsay -f tux
+        ${pkgs.fortune}/bin/fortune | ${pkgs.cowsay}/bin/cowsay -f tux
      '';
      plugins = [
        {
--- a/home-manager/freetube.nix
+++ b/home-manager/freetube.nix
@ -1,8 +1,11 @@
+{ pkgs, ... }:
+
 {
  catppuccin.freetube.enable = true;

  programs.freetube = {
    enable = true;
+    package = pkgs.unstable.freetube;
    settings = {
      allowDashAv1Formats = true;
      checkForUpdates = false;
--- a/home-manager/hyprland/binds.nix
+++ b/home-manager/hyprland/binds.nix
@ -7,6 +7,7 @@ in
  wayland.windowManager.hyprland.settings = {
    "$mainMod" = "SUPER";
    "$shiftMod" = "$mainMod SHIFT";
+    "$ctrlMod" = "$mainMod CTRL";
    "$menu" = "rofi -show drun";

    bind = [
@ -29,6 +30,12 @@ in
      "$mainMod, up, movefocus, u"
      "$mainMod, down, movefocus, d"

+      # Move window with ctrl + mainMod + arrow keys
+      "$ctrlMod, left, movewindow, l"
+      "$ctrlMod, right, movewindow, r"
+      "$ctrlMod, up, movewindow, u"
+      "$ctrlMod, down, movewindow, d"
+
      # Switch workspaces with mainMod + [0-9]
      "$mainMod, 1, workspace, 1"
      "$mainMod, 2, workspace, 2"
--- a/home-manager/hyprland/hyprpanel/default.nix
+++ b/home-manager/hyprland/hyprpanel/default.nix
@ -1,7 +1,13 @@
-{ pkgs, inputs, ... }:
+{
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
 let
  common = import ../../../common.nix;
  theme = import ../../../theme.nix;
+  loader = import ../../secretsLoader.nix lib;
 in
 {
  imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
@ -75,7 +81,8 @@ in
          };
          weather = {
            unit = "metric";
-            location = "Bergen, Norway"; # TODO not working
+            location = "Bergen, Norway";
+            key = loader.loadSecret ../../secrets/weather-api-key;
          };
        };

@ -110,7 +117,7 @@ in
        };
      };

-      wallpaper.enable = true;
+      wallpaper.enable = false;
    };
  };
 }
--- a/home-manager/secrets/weather-api-key
+++ b/home-manager/secrets/weather-api-key
--- a/home-manager/secretsLoader.nix
+++ b/home-manager/secretsLoader.nix
@ -0,0 +1,6 @@
+lib:
+
+{
+  loadSecret =
+    filePath: lib.strings.trim (lib.strings.removeSuffix "\n" (builtins.readFile filePath));
+}
--- a/home-manager/zen/chrome/userChrome.css
+++ b/home-manager/zen/chrome/userChrome.css
@ -0,0 +1,113 @@
+/* Catppuccin Mocha Blue userChrome.css*/
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --zen-colors-primary: #313244 !important;
+    --zen-primary-color: #89b4fa !important;
+    --zen-colors-secondary: #313244 !important;
+    --zen-colors-tertiary: #181825 !important;
+    --zen-colors-border: #89b4fa !important;
+    --toolbarbutton-icon-fill: #89b4fa !important;
+    --lwt-text-color: #cdd6f4 !important;
+    --toolbar-field-color: #cdd6f4 !important;
+    --tab-selected-textcolor: rgb(171, 197, 247) !important;
+    --toolbar-field-focus-color: #cdd6f4 !important;
+    --toolbar-color: #cdd6f4 !important;
+    --newtab-text-primary-color: #cdd6f4 !important;
+    --arrowpanel-color: #cdd6f4 !important;
+    --arrowpanel-background: #1e1e2e !important;
+    --sidebar-text-color: #cdd6f4 !important;
+    --lwt-sidebar-text-color: #cdd6f4 !important;
+    --lwt-sidebar-background-color: #11111b !important;
+    --toolbar-bgcolor: #313244 !important;
+    --newtab-background-color: #1e1e2e !important;
+    --zen-themed-toolbar-bg: #181825 !important;
+    --zen-main-browser-background: #181825 !important;
+  }
+
+  #permissions-granted-icon {
+    color: #181825 !important;
+  }
+
+  .sidebar-placesTree {
+    background-color: #1e1e2e !important;
+  }
+
+  #zen-workspaces-button {
+    background-color: #1e1e2e !important;
+  }
+
+  #TabsToolbar {
+    background-color: #181825 !important;
+  }
+
+  #urlbar-background {
+    background-color: #1e1e2e !important;
+  }
+
+  .content-shortcuts {
+    background-color: #1e1e2e !important;
+    border-color: #89b4fa !important;
+  }
+
+  .urlbarView-url {
+    color: #89b4fa !important;
+  }
+
+  #zenEditBookmarkPanelFaviconContainer {
+    background: #11111b !important;
+  }
+
+  toolbar .toolbarbutton-1 {
+    &:not([disabled]) {
+      &:is([open], [checked])
+        > :is(
+          .toolbarbutton-icon,
+          .toolbarbutton-text,
+          .toolbarbutton-badge-stack
+        ) {
+        fill: #11111b;
+      }
+    }
+  }
+
+  .identity-color-blue {
+    --identity-tab-color: #89b4fa !important;
+    --identity-icon-color: #89b4fa !important;
+  }
+
+  .identity-color-turquoise {
+    --identity-tab-color: #94e2d5 !important;
+    --identity-icon-color: #94e2d5 !important;
+  }
+
+  .identity-color-green {
+    --identity-tab-color: #a6e3a1 !important;
+    --identity-icon-color: #a6e3a1 !important;
+  }
+
+  .identity-color-yellow {
+    --identity-tab-color: #f9e2af !important;
+    --identity-icon-color: #f9e2af !important;
+  }
+
+  .identity-color-orange {
+    --identity-tab-color: #fab387 !important;
+    --identity-icon-color: #fab387 !important;
+  }
+
+  .identity-color-red {
+    --identity-tab-color: #f38ba8 !important;
+    --identity-icon-color: #f38ba8 !important;
+  }
+
+  .identity-color-pink {
+    --identity-tab-color: #f5c2e7 !important;
+    --identity-icon-color: #f5c2e7 !important;
+  }
+
+  .identity-color-purple {
+    --identity-tab-color: #cba6f7 !important;
+    --identity-icon-color: #cba6f7 !important;
+  }
+}
--- a/home-manager/zen/chrome/userContent.css
+++ b/home-manager/zen/chrome/userContent.css
@ -0,0 +1,158 @@
+/* Catppuccin Mocha Blue userContent.css*/
+
+@media (prefers-color-scheme: dark) {
+  /* Common variables affecting all pages */
+  @-moz-document url-prefix("about:") {
+    :root {
+      --in-content-page-color: #cdd6f4 !important;
+      --color-accent-primary: #89b4fa !important;
+      --color-accent-primary-hover: rgb(163, 197, 251) !important;
+      --color-accent-primary-active: rgb(138, 153, 250) !important;
+      background-color: #1e1e2e !important;
+      --in-content-page-background: #1e1e2e !important;
+    }
+  }
+
+  /* Variables and styles specific to about:newtab and about:home */
+  @-moz-document url("about:newtab"), url("about:home") {
+    :root {
+      --newtab-background-color: #1e1e2e !important;
+      --newtab-background-color-secondary: #313244 !important;
+      --newtab-element-hover-color: #313244 !important;
+      --newtab-text-primary-color: #cdd6f4 !important;
+      --newtab-wordmark-color: #cdd6f4 !important;
+      --newtab-primary-action-background: #89b4fa !important;
+    }
+
+    .icon {
+      color: #89b4fa !important;
+    }
+
+    .search-wrapper .logo-and-wordmark .logo {
+      background:
+        url("zen-logo-mocha.svg"),
+        url("https://raw.githubusercontent.com/IAmJafeth/zen-browser/main/themes/Mocha/Blue/zen-logo-mocha.svg")
+          no-repeat center !important;
+      display: inline-block !important;
+      height: 82px !important;
+      width: 82px !important;
+      background-size: 82px !important;
+    }
+
+    @media (max-width: 609px) {
+      .search-wrapper .logo-and-wordmark .logo {
+        background-size: 64px !important;
+        height: 64px !important;
+        width: 64px !important;
+      }
+    }
+
+    .card-outer:is(:hover, :focus, .active):not(.placeholder) .card-title {
+      color: #89b4fa !important;
+    }
+
+    .top-site-outer .search-topsite {
+      background-color: #89b4fa !important;
+    }
+
+    .compact-cards .card-outer .card-context .card-context-icon.icon-download {
+      fill: #a6e3a1 !important;
+    }
+  }
+
+  /* Variables and styles specific to about:preferences */
+  @-moz-document url-prefix("about:preferences") {
+    :root {
+      --zen-colors-tertiary: #181825 !important;
+      --in-content-text-color: #cdd6f4 !important;
+      --link-color: #89b4fa !important;
+      --link-color-hover: rgb(163, 197, 251) !important;
+      --zen-colors-primary: #313244 !important;
+      --in-content-box-background: #313244 !important;
+      --zen-primary-color: #89b4fa !important;
+    }
+
+    groupbox,
+    moz-card {
+      background: #1e1e2e !important;
+    }
+
+    button,
+    groupbox menulist {
+      background: #313244 !important;
+      color: #cdd6f4 !important;
+    }
+
+    .main-content {
+      background-color: #11111b !important;
+    }
+
+    .identity-color-blue {
+      --identity-tab-color: #8aadf4 !important;
+      --identity-icon-color: #8aadf4 !important;
+    }
+
+    .identity-color-turquoise {
+      --identity-tab-color: #8bd5ca !important;
+      --identity-icon-color: #8bd5ca !important;
+    }
+
+    .identity-color-green {
+      --identity-tab-color: #a6da95 !important;
+      --identity-icon-color: #a6da95 !important;
+    }
+
+    .identity-color-yellow {
+      --identity-tab-color: #eed49f !important;
+      --identity-icon-color: #eed49f !important;
+    }
+
+    .identity-color-orange {
+      --identity-tab-color: #f5a97f !important;
+      --identity-icon-color: #f5a97f !important;
+    }
+
+    .identity-color-red {
+      --identity-tab-color: #ed8796 !important;
+      --identity-icon-color: #ed8796 !important;
+    }
+
+    .identity-color-pink {
+      --identity-tab-color: #f5bde6 !important;
+      --identity-icon-color: #f5bde6 !important;
+    }
+
+    .identity-color-purple {
+      --identity-tab-color: #c6a0f6 !important;
+      --identity-icon-color: #c6a0f6 !important;
+    }
+  }
+
+  /* Variables and styles specific to about:addons */
+  @-moz-document url-prefix("about:addons") {
+    :root {
+      --zen-dark-color-mix-base: #181825 !important;
+      --background-color-box: #1e1e2e !important;
+    }
+  }
+
+  /* Variables and styles specific to about:protections */
+  @-moz-document url-prefix("about:protections") {
+    :root {
+      --zen-primary-color: #1e1e2e !important;
+      --social-color: #cba6f7 !important;
+      --coockie-color: #89dceb !important;
+      --fingerprinter-color: #f9e2af !important;
+      --cryptominer-color: #b4befe !important;
+      --tracker-color: #a6e3a1 !important;
+      --in-content-primary-button-background-hover: rgb(81, 83, 105) !important;
+      --in-content-primary-button-text-color-hover: #cdd6f4 !important;
+      --in-content-primary-button-background: #45475a !important;
+      --in-content-primary-button-text-color: #cdd6f4 !important;
+    }
+
+    .card {
+      background-color: #313244 !important;
+    }
+  }
+}
--- a/home-manager/zen/chrome/zen-logo.svg
+++ b/home-manager/zen/chrome/zen-logo.svg
@ -0,0 +1,13 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_15_9)">
+    <rect width="1024" height="1024" rx="225" fill="#11111b"/>
+    <circle cx="512" cy="512" r="340" stroke="#cdd6f4" stroke-width="70"/>
+    <circle cx="512" cy="512" r="224.915" stroke="#cdd6f4" stroke-width="51"/>
+    <circle cx="512" cy="512" r="129.018" stroke="#cdd6f4" stroke-width="31"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_15_9">
+      <rect width="1024" height="1024" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>
--- a/home-manager/zen/default.nix
+++ b/home-manager/zen/default.nix
@ -0,0 +1,12 @@
+{ pkgs, inputs, ... }:
+
+{
+  # TODO programatically get default name
+  home = {
+    file.".zen/xdaxqlov.default/chrome" = {
+      source = ./chrome;
+      recursive = true;
+    };
+    packages = with pkgs; [ inputs.zen-browser.packages.${system}.default ]; # Beta
+  };
+}
--- a/8
+++ b/8
@ -22,3 +22,11 @@ update:
    nix flake update

    just switch
+
+# Encrypt all files in the repo using git-crypt
+lock:
+    git-crypt lock
+
+# Decrypt all files in the repo using git-crypt and the user's GPG key
+unlock:
+    git-crypt unlock ~/.config/git/crypt-key
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = [
+    pkgs.bluez
+  ];
+
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true; # powers up the default Bluetooth controller on boot
+  };
+
+  services.blueman.enable = true;
+}
--- a/modules/default.nix
+++ b/modules/default.nix
@ -1,8 +1,10 @@
 {
  imports = [
    ./battery.nix
+    ./bluetooth.nix
    ./development.nix
    ./fonts.nix
+    ./gaming
    ./gnome
    ./hardware
    ./locale.nix
@ -12,7 +14,6 @@
    ./sddm.nix
    ./security.nix
    ./shell.nix
-    ./steam.nix
    ./qt.nix
  ];
 }
--- a/modules/gaming/default.nix
+++ b/modules/gaming/default.nix
@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./steam.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    heroic
+    wine
+  ];
+}
--- a/modules/gaming/steam.nix
+++ b/modules/gaming/steam.nix
Author	SHA1	Message	Date
Martin Berg Alstad	200a479c76	📦 Update dependencies, fix ze deprecated setting	2025-03-05 21:57:55 +01:00
Martin Berg Alstad	17168ca309	🔐 Reencrypt weather api key	2025-03-03 22:00:16 +01:00
Martin Berg Alstad	b42c0d9988	Merge remote-tracking branch 'origin/main' into thinkpad	2025-03-03 21:52:34 +01:00
Martin Berg Alstad	1d20ef52a8	✨ Enable Bluetooth (bluez, blueman)	2025-03-03 21:46:38 +01:00
Martin Berg Alstad	a6cb4a5cf6	🐛 Disable wallpaper by Hyprpanel, comments on justfile	2025-03-02 08:19:45 +01:00
Martin Berg Alstad	909d3b9b21	✨ Use same package of git	2025-03-01 23:00:24 +01:00
Martin Berg Alstad	3552314e69	✨ Store git secrets using libsecret	2025-03-01 22:54:49 +01:00
Martin Berg Alstad	adb963a48d	✨ Added lock and unlock to justfile	2025-03-01 15:11:42 +01:00
Martin Berg Alstad	7ab89cda7c	✨ Wildcard encrypt files in secrets dir, util function to load secrets, use apu-key in weather widget	2025-03-01 15:09:03 +01:00
Martin Berg Alstad	fd03c87c18	🔐 Add weather API key	2025-03-01 14:31:54 +01:00
Martin Berg Alstad	443530b667	✨ Added git-crypt and .gitattributes	2025-03-01 14:27:58 +01:00
Martin Berg Alstad	5a36e23ae7	📦 Updated packages, protonmail and freetube on unstable	2025-02-27 18:44:59 +01:00
Martin Berg Alstad	056012a288	✨ Gaming dir with heroic and wind, moved steam to dir	2025-02-18 21:56:34 +01:00
Martin Berg Alstad	1ed7ce2e89	🪟 Move windows with arrowkeys, moved zen package to /zen dir in home	2025-02-15 12:14:03 +01:00
Martin Berg Alstad	000b5fe81a	Zen theme, Updated dependencies, moved fortune and cowsay pkgs	2025-02-15 12:02:23 +01:00
				`@ -0,0 +1 @@`
				`home-manager/secrets/* filter=git-crypt diff=git-crypt`