chore(deps): lock file maintenance

2025-05-18 00:00:33 +02:00
5 changed files with 75 additions and 178 deletions
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "fromYaml": "fromYaml"
      },
      "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "lastModified": 1745523430,
+        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
        "type": "github"
      },
      "original": {
@ -70,11 +70,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1744642301,
-        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
+        "lastModified": 1743774811,
+        "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
+        "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
        "type": "github"
      },
      "original": {
@ -205,16 +205,16 @@
    "gnome-shell": {
      "flake": false,
      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "lastModified": 1732369855,
+        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
        "type": "github"
      },
      "original": {
        "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "47.2",
        "repo": "gnome-shell",
        "type": "github"
      }
@ -226,16 +226,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1747556831,
-        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
+        "lastModified": 1747331121,
+        "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
+        "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
@ -303,15 +303,15 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1747672794,
-        "narHash": "sha256-O+9sQ6QEoKcM/lJXDumDdUZbuxs2TMuBf7xi3ivOXCo=",
-        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
+        "lastModified": 1747471812,
+        "narHash": "sha256-nZcQYsgmKeyqlMfX9uPEPoGFuXcSWfvRzaXc10JR1cA=",
+        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05beta801800.ca49c4304acf/nixexprs.tar.xz?rev=ca49c4304acf0973078db0a9d200fd2bae75676d"
+        "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.717984.ba8b70ee098b/nixexprs.tar.xz?rev=ba8b70ee098bc5654c459d6a95dfc498b91ff858"
      },
      "original": {
        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+        "url": "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz"
      }
    },
    "nixvim": {
@ -328,11 +328,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747683610,
-        "narHash": "sha256-Jis9/4lnr3pn1AIRgCnoeiReKs2MGy6COWc6JtAEESo=",
+        "lastModified": 1747495941,
+        "narHash": "sha256-h/35nPaCLRvtoIN/c8ZqbEKAeK/YTGuB7IKEj+kBLkU=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "14c7f5f8968940d1730b5e935dd1d9f3e461a2d3",
+        "rev": "1deeb7f689ad5c23b738c56ce4afea5ef9bbd7d1",
        "type": "github"
      },
      "original": {
@ -388,8 +388,9 @@
        "base16-vim": "base16-vim",
        "firefox-gnome-theme": "firefox-gnome-theme",
        "flake-compat": [],
-        "flake-parts": [
-          "flake-parts"
+        "flake-utils": [
+          "lix-module",
+          "flake-utils"
        ],
        "git-hooks": "git-hooks",
        "gnome-shell": "gnome-shell",
@ -399,27 +400,24 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nur": [],
        "systems": [
          "systems"
        ],
        "tinted-foot": "tinted-foot",
        "tinted-kitty": "tinted-kitty",
-        "tinted-schemes": "tinted-schemes",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
+        "tinted-tmux": "tinted-tmux"
      },
      "locked": {
-        "lastModified": 1747675820,
-        "narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=",
-        "owner": "nix-community",
+        "lastModified": 1746143246,
+        "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=",
+        "owner": "danth",
        "repo": "stylix",
-        "rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70",
+        "rev": "20ace60f9cb5e179cb2256abaee505780df8e804",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "ref": "master",
+        "owner": "danth",
+        "ref": "release-24.11",
        "repo": "stylix",
        "type": "github"
      }
@ -459,43 +457,28 @@
    "tinted-kitty": {
      "flake": false,
      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
+        "lastModified": 1716423189,
+        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
        "type": "github"
      },
      "original": {
        "owner": "tinted-theming",
        "repo": "tinted-kitty",
-        "type": "github"
-      }
-    },
-    "tinted-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744974599,
-        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
+        "rev": "eb39e141db14baef052893285df9f266df041ff8",
        "type": "github"
      }
    },
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1745111349,
-        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
+        "lastModified": 1743296873,
+        "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
+        "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
        "type": "github"
      },
      "original": {
@ -504,22 +487,6 @@
        "type": "github"
      }
    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725758778,
-        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
-    },
    "treefmt-nix": {
      "inputs": {
        "nixpkgs": [
@ -542,11 +509,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1747598443,
-        "narHash": "sha256-Gec67rXs7qwrC1nTfyXRN1m/SL/qqY8A3eRYuK/5ADg=",
-        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
+        "lastModified": 1747458844,
+        "narHash": "sha256-0F13bs2Hrspx4ZKcVsOD9KmlkLRigFWpGdnLd9Ujtl8=",
+        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre802366.292fa7d4f651/nixexprs.tar.xz?rev=292fa7d4f6519c074f0a50394dbbe69859bb6043"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.05pre801034.e06158e58f3a/nixexprs.tar.xz?rev=e06158e58f3adee28b139e9c2bcfcc41f8625b46"
      },
      "original": {
        "type": "tarball",
--- a/flake.nix
+++ b/flake.nix
@ -8,7 +8,7 @@

  # Flake inputs
  inputs = {
-    nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";
+    nixpkgs.url = "https://channels.nixos.org/nixos-24.11/nixexprs.tar.xz";
    unstable.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
    # Lix
    lix-module = {
@ -20,16 +20,15 @@
    };
    # Modules
    home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    stylix = {
-      url = "github:nix-community/stylix/master"; # FIXME: pin to 25.05 once released
+      url = "github:danth/stylix/release-24.11";
      inputs = {
        nixpkgs.follows = "nixpkgs";
-        flake-parts.follows = "flake-parts";
+        flake-utils.follows = "lix-module/flake-utils";
        systems.follows = "systems";
-        nur.follows = "";

        home-manager.follows = "home-manager";
        # disable optional inputs
--- a/modules/hm/default.nix
+++ b/modules/hm/default.nix
@ -108,7 +108,7 @@ in
        gpg-agent = {
          enable = true;
          maxCacheTtl = 86400;
-          pinentry.package = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses;
+          pinentryPackage = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses;
          extraConfig = "allow-preset-passphrase";
        };
        # Delete old generations (>month)
--- a/modules/hm/gui/default.nix
+++ b/modules/hm/gui/default.nix
@ -13,7 +13,6 @@ let
  cfg = jhome.gui;
  cursor = {
    package = pkgs.nordzy-cursor-theme;
-    size = 48;
    name = "Nordzy-cursors";
  };
  iconTheme = {
@ -28,18 +27,20 @@ in
  ];

  config = lib.mkIf (jhome.enable && cfg.enable) {
-    home.packages = [
-      pkgs.webcord
-      pkgs.ferdium
-      pkgs.xournalpp
-      pkgs.signal-desktop
-      pkgs.pcmanfm
-      pkgs.wl-clipboard
-      # Extra fonts
-      pkgs.noto-fonts-cjk-sans # Chinese, Japanese and Korean characters
-      pkgs.noto-fonts-cjk-serif # Chinese, Japanese and Korean characters
-      pkgs.nerd-fonts.symbols-only
-    ] ++ lib.optional flatpakEnabled pkgs.flatpak;
+    home.packages =
+      (with pkgs; [
+        webcord
+        ferdium
+        xournalpp
+        signal-desktop
+        pcmanfm
+        wl-clipboard
+        # Extra fonts
+        noto-fonts-cjk-sans # Chinese, Japanese and Korean characters
+        noto-fonts-cjk-serif # Chinese, Japanese and Korean characters
+        (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+      ])
+      ++ lib.optional flatpakEnabled pkgs.flatpak;
    fonts.fontconfig = {
      enable = true;
      defaultFonts = lib.mkIf config.jhome.styling.enable {
@ -60,75 +61,7 @@ in
    };
    # Browser
    programs = {
-      firefox = {
-        enable = true;
-        profiles."${config.home.username}" = {
-          search = {
-            engines =
-              let
-                queryParam = name: value: { inherit name value; };
-              in
-              {
-                # Add search.nixos.org as search engines
-                nix-packages = {
-                  name = "Nix Packages";
-                  urls = [
-                    {
-                      template = "https://search.nixos.org/packages";
-                      params = [
-                        (queryParam "type" "packages")
-                        (queryParam "query" "{searchTerms}")
-                      ];
-                    }
-                  ];
-
-                  icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                  definedAliases = [
-                    "@np"
-                    "@nixpackages"
-                  ];
-                };
-
-                nixos-options = {
-                  name = "NixOS Options";
-                  urls = [
-                    {
-                      template = "https://search.nixos.org/options";
-                      params = [
-                        (queryParam "type" "packages")
-                        (queryParam "query" "{searchTerms}")
-                      ];
-                    }
-                  ];
-
-                  icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                  definedAliases = [
-                    "@no"
-                    "@nixopts"
-                  ];
-                };
-
-                nixos-wiki = {
-                  name = "NixOS Wiki";
-                  urls = [
-                    {
-                      template = "https://wiki.nixos.org/w/index.php";
-                      params = [ (queryParam "search" "{searchTerms}") ];
-                    }
-                  ];
-                  iconMapObj."16" = "https://wiki.nixos.org/favicon.ico";
-                  definedAliases = [
-                    "@nw"
-                    "@nixwiki"
-                  ];
-                };
-
-                # hide bing
-                bing.metaData.hidden = true;
-              };
-          };
-        };
-      };
+      firefox.enable = true;
      # Dynamic Menu
      fuzzel = {
        enable = true;
@ -215,19 +148,14 @@ in
      # Notifications
      mako = {
        enable = true;
-        settings = {
-          layer = "overlay";
-          border-radius = 8;
-          default-timeout = 15000;
-        };
+        layer = "overlay";
+        borderRadius = 8;
+        defaultTimeout = 15000;
      };
    };

-    stylix = lib.mkIf config.jhome.styling.enable {
-      # Set cursor style
-      inherit cursor;
-      targets.firefox.profileNames = [ config.home.username ];
-    };
+    # Set cursor style
+    stylix = lib.mkIf config.jhome.styling.enable { inherit cursor; };
    home.pointerCursor = lib.mkIf config.jhome.styling.enable (
      lib.mkDefault {
        gtk.enable = true;
@ -242,7 +170,10 @@ in
      gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
    };
    # Set Qt theme
-    qt = lib.mkIf config.jhome.styling.enable { enable = true; };
+    qt = lib.mkIf config.jhome.styling.enable {
+      enable = true;
+      platformTheme.name = "gtk";
+    };

    xdg.systemDirs.data = [
      "/usr/share"
--- a/scripts/audiomenu/audiomenu.py
+++ b/scripts/audiomenu/audiomenu.py
@ -7,10 +7,10 @@ import typing
 import click


-def expect[T](type_: type[T], value: object) -> T:
-    if not isinstance(value, type_):
+def expect[T](typ: type[T], value: object) -> T:
+    if not isinstance(value, typ):
        raise ValueError(
-            f"expected value to be of type {type_} but was of type {type(value)}"
+            f"expected value to be of type {typ} but was of type {type(value)}"
        )
    return value