diff --git a/flake.lock b/flake.lock index 8936fc1..75f1fef 100644 --- a/flake.lock +++ b/flake.lock @@ -205,16 +205,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -226,16 +226,16 @@ ] }, "locked": { - "lastModified": 1747331121, - "narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -388,9 +388,8 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": [], - "flake-utils": [ - "lix-module", - "flake-utils" + "flake-parts": [ + "flake-parts" ], "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", @@ -400,24 +399,27 @@ "nixpkgs": [ "nixpkgs" ], + "nur": [], "systems": [ "systems" ], "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746143246, - "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=", - "owner": "danth", + "lastModified": 1747675820, + "narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=", + "owner": "nix-community", "repo": "stylix", - "rev": "20ace60f9cb5e179cb2256abaee505780df8e804", + "rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70", "type": "github" }, "original": { - "owner": "danth", - "ref": "release-24.11", + "owner": "nix-community", + "ref": "master", "repo": "stylix", "type": "github" } @@ -457,17 +459,32 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1747207144, + "narHash": "sha256-pHfbM7mF2mF1beycGAmA+7Jt+vmJ2reU7BvRfKURyaY=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "8c00a361a99b6d356db9572240053a3f8716ea68", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", "type": "github" } }, @@ -487,6 +504,22 @@ "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": [ diff --git a/flake.nix b/flake.nix index 62bd990..2030f58 100644 --- a/flake.nix +++ b/flake.nix @@ -20,15 +20,16 @@ }; # Modules home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-24.11"; + url = "github:nix-community/stylix/master"; # FIXME: pin to 25.05 once released inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "lix-module/flake-utils"; + flake-parts.follows = "flake-parts"; systems.follows = "systems"; + nur.follows = ""; home-manager.follows = "home-manager"; # disable optional inputs diff --git a/modules/hm/default.nix b/modules/hm/default.nix index e7e67c7..98cb89a 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -108,7 +108,7 @@ in gpg-agent = { enable = true; maxCacheTtl = 86400; - pinentryPackage = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses; + pinentry.package = if config.jhome.gui.enable then pkgs.pinentry-qt else pkgs.pinentry-curses; extraConfig = "allow-preset-passphrase"; }; # Delete old generations (>month) diff --git a/modules/hm/gui/default.nix b/modules/hm/gui/default.nix index 75d6cea..cd4ab93 100644 --- a/modules/hm/gui/default.nix +++ b/modules/hm/gui/default.nix @@ -13,6 +13,7 @@ let cfg = jhome.gui; cursor = { package = pkgs.nordzy-cursor-theme; + size = 48; name = "Nordzy-cursors"; }; iconTheme = { @@ -27,20 +28,18 @@ in ]; config = lib.mkIf (jhome.enable && cfg.enable) { - 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; + 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; fonts.fontconfig = { enable = true; defaultFonts = lib.mkIf config.jhome.styling.enable { @@ -61,7 +60,75 @@ in }; # Browser programs = { - firefox.enable = true; + 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; + }; + }; + }; + }; # Dynamic Menu fuzzel = { enable = true; @@ -148,14 +215,19 @@ in # Notifications mako = { enable = true; - layer = "overlay"; - borderRadius = 8; - defaultTimeout = 15000; + settings = { + layer = "overlay"; + border-radius = 8; + default-timeout = 15000; + }; }; }; - # Set cursor style - stylix = lib.mkIf config.jhome.styling.enable { inherit cursor; }; + stylix = lib.mkIf config.jhome.styling.enable { + # Set cursor style + inherit cursor; + targets.firefox.profileNames = [ config.home.username ]; + }; home.pointerCursor = lib.mkIf config.jhome.styling.enable ( lib.mkDefault { gtk.enable = true; @@ -170,10 +242,7 @@ in gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; }; # Set Qt theme - qt = lib.mkIf config.jhome.styling.enable { - enable = true; - platformTheme.name = "gtk"; - }; + qt = lib.mkIf config.jhome.styling.enable { enable = true; }; xdg.systemDirs.data = [ "/usr/share" diff --git a/scripts/audiomenu/audiomenu.py b/scripts/audiomenu/audiomenu.py index f9ffe9d..88fe671 100644 --- a/scripts/audiomenu/audiomenu.py +++ b/scripts/audiomenu/audiomenu.py @@ -7,10 +7,10 @@ import typing import click -def expect[T](typ: type[T], value: object) -> T: - if not isinstance(value, typ): +def expect[T](type_: type[T], value: object) -> T: + if not isinstance(value, type_): raise ValueError( - f"expected value to be of type {typ} but was of type {type(value)}" + f"expected value to be of type {type_} but was of type {type(value)}" ) return value