diff --git a/flake.lock b/flake.lock index 76d6ef3..7ff8a64 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1791505570, - "narHash": "sha256-2yRQ87dNTVr1kauBR6PTlfw7hnm90MAL0ObpA05xOTU=", + "lastModified": 1792020613, + "narHash": "sha256-31skutSMYGBAvGK5vs6wPGXAV4s0ietf1doMynL9FfI=", "owner": "9001", "repo": "copyparty", - "rev": "0dc1cb329120743ca85599ba3fba24849f137677", + "rev": "8b4593c9a286791eb5dc40862fa24198cea4def7", "type": "github" }, "original": { @@ -166,11 +166,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1791694748, - "narHash": "sha256-EuKPk2ArrYaFRw5zfSOtuR3qJDONkU+tKSUIQHpK0nA=", + "lastModified": 1792072733, + "narHash": "sha256-Q+c4fV/OShePs5FdPldh00mywqU0Wl1y8zF8ss07aRM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "383b1adaf66e95ef5976068ebc3d55ec13009b7b", + "rev": "08c72b09663805de26057dfed80b7153846336ca", "type": "github" }, "original": { @@ -472,38 +472,6 @@ "type": "github" } }, - "hyprgraphics_2": { - "inputs": { - "hyprutils": [ - "hyprland", - "xdph", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1786464367, - "narHash": "sha256-k58p4wbzIXWyRWrW84pP8tD+iaZSSYiiM+fr0Auk4oU=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "7c895c44e3ca6d28ed68ddd80ec02b02b925e7fc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -522,11 +490,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1791545463, - "narHash": "sha256-EuTde/DbLBZ0nm8Ctj4Il3M5SKsWAKeDITvUuatu5+g=", + "lastModified": 1792003461, + "narHash": "sha256-sqWBYgjkJd5xTJKd9Jz/SbtrJfY3eTqxyqn1xfH6O00=", "ref": "refs/heads/main", - "rev": "663b29b846e4bad17cfa29941f6d2fbb6b61f139", - "revCount": 7901, + "rev": "e2ad066c9ffd45ddfbe4dc76d2de16b382fbe3eb", + "revCount": 7911, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -571,11 +539,11 @@ ] }, "locked": { - "lastModified": 1786464504, - "narHash": "sha256-7sHwM86KILQyHDHDuE2SDBlQ2jvZ0EW3hY7sW009/cg=", + "lastModified": 1791805511, + "narHash": "sha256-p7R3xnbJf6MqvgWAmR86PkHUba97Fotm8RR16tYDF9I=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "4c30cf3097ea963c0e250749ee0c59f8b08816d6", + "rev": "204f39d6c7a4aca7042587d4638e19cdeccf63bc", "type": "github" }, "original": { @@ -626,11 +594,11 @@ ] }, "locked": { - "lastModified": 1789475883, - "narHash": "sha256-YRFLrPESYitsDYqQKquOFg8OWNI7tHKwPnTrTZWXxWY=", + "lastModified": 1791277361, + "narHash": "sha256-+dv/mMnrw+uBgY+WW3KpoKQ8Nl3bVLS3lknXsbJ03zQ=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "cc9a8fd253bdc00f48a967ecf4828211ef08751f", + "rev": "4c27ba9ce104782bf718aabf59df3f503afe7caa", "type": "github" }, "original": { @@ -700,11 +668,11 @@ ] }, "locked": { - "lastModified": 1789562890, - "narHash": "sha256-LFzeVJkDMQLjCpi55S9oc3N/wMrW2RCS1ShPL+1HB78=", + "lastModified": 1791849226, + "narHash": "sha256-q9Kgz/ZSo6ftVliPGQuRZYWYp3eK4vggO0IR6LcsWl0=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "b3f2d0e725e4eaf804af7e529cb69bbed43d1a04", + "rev": "2907e0d1f8a3a540737a0e738acc40d48ad7ba0d", "type": "github" }, "original": { @@ -886,11 +854,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1791373788, - "narHash": "sha256-c3oMt0QoE+4yiRk6u1m2L9ogjaUw0uTGn9yk808KkgE=", + "lastModified": 1791721963, + "narHash": "sha256-BYhx89XJltnRyQeuDKHVL5eSqbbfAcOKuDts7QRsrxQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4bc63156b109ee7b4103e3ec30565c8c92bde435", + "rev": "60a624466c08787ee8303393b7d4752d1826f14f", "type": "github" }, "original": { @@ -948,11 +916,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1791426274, - "narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=", + "lastModified": 1791883866, + "narHash": "sha256-yvkDdToRZ4IgPc9tSBzzCYJvTLf8n5eE3rgUkpCuD5A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c8764b7c7b09b34f632464276218ef9090eaa11", + "rev": "a033e66ab94a6bedf2c3d58d93a36319d3cbbbaf", "type": "github" }, "original": { @@ -1010,11 +978,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1791594108, - "narHash": "sha256-XK4KceonkwD8LuMAt/vNrz982mXJM5jeHAxMwsUXXAQ=", + "lastModified": 1791956154, + "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6510408d147d8c5e6d76043e899e9251756f6a75", + "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044", "type": "github" }, "original": { @@ -1026,11 +994,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1791048980, - "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=", + "lastModified": 1791734076, + "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed", + "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", "type": "github" }, "original": { @@ -1108,11 +1076,11 @@ ] }, "locked": { - "lastModified": 1791701131, - "narHash": "sha256-mBCtcZPGgBLfEYxFvBRsc0KeDz0JtN2BMhcIWGoMk94=", + "lastModified": 1792070304, + "narHash": "sha256-gCF1P9r0UzPah0fqBTg2nVuxuuNnRxnYYHklvq8VKZI=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "45084cf764f08c1f00e0c7e7432732f225105b7e", + "rev": "a33122c4208a385e19c9a252e65e2751b2c44fbb", "type": "github" }, "original": { @@ -1155,11 +1123,11 @@ ] }, "locked": { - "lastModified": 1790500375, - "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=", + "lastModified": 1791909798, + "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4", + "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9", "type": "github" }, "original": { @@ -1250,11 +1218,11 @@ ] }, "locked": { - "lastModified": 1791710405, - "narHash": "sha256-mVD4XIc5JkqMW2K04IkFUzHgHmyJZlzw5ktfgMDCbKU=", + "lastModified": 1792056300, + "narHash": "sha256-YU1LjDe1o2Ymg5zEiCHbmMXLkDCtxHQRiVqZ3nC5GGk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ee48786c6f9160d2c1a084aac841f68195b8420c", + "rev": "44931708c62937c2b1bf7953902989fa5bb9ee1b", "type": "github" }, "original": { @@ -1304,15 +1272,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1791574276, - "narHash": "sha256-UMnLnZ3JlA7UTBNNNx1rNsXYoPP/cirXLCKGiQ/yDx8=", - "owner": "nix-community", + "lastModified": 1790322631, + "narHash": "sha256-/EDdHSkJwOQUNDdlLXhC1FyMuERiL/fkPAF/LWZy+HY=", + "owner": "Azd325", "repo": "stylix", - "rev": "2856c4c6a845b9bec98828ef197abe176e4806bb", + "rev": "a1198612edba320a39c5cc5c4ab30dbee6fd66ea", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "Azd325", + "ref": "rofi-settings-font", "repo": "stylix", "type": "github" } @@ -1451,11 +1420,11 @@ }, "unstable": { "locked": { - "lastModified": 1791594108, - "narHash": "sha256-XK4KceonkwD8LuMAt/vNrz982mXJM5jeHAxMwsUXXAQ=", + "lastModified": 1791956154, + "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6510408d147d8c5e6d76043e899e9251756f6a75", + "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044", "type": "github" }, "original": { @@ -1472,11 +1441,11 @@ ] }, "locked": { - "lastModified": 1791642191, - "narHash": "sha256-0bK0A59rVUn1SRZzo4cNi4VSqAe7vR1gL2/MZl53Frw=", + "lastModified": 1792082440, + "narHash": "sha256-TppYgfBkqAs4IaO3AV+t4zlH9FZIL/AdJFI+PagXwVw=", "owner": "nix-community", "repo": "home-manager", - "rev": "c58f54c733a7894d84fa2fdff26cc12088c4b78c", + "rev": "6d9c00bad9a3c763f842c2b08193e5844bdcedfa", "type": "github" }, "original": { @@ -1535,7 +1504,10 @@ "hyprland", "aquamarine" ], - "hyprgraphics": "hyprgraphics_2", + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], "hyprland-protocols": [ "hyprland", "hyprland-protocols" @@ -1566,11 +1538,11 @@ ] }, "locked": { - "lastModified": 1790080407, - "narHash": "sha256-uKM+FAvcllYFcHoh4LEmyB0CGLaT3dMOjK4dxXyIIgc=", + "lastModified": 1791822904, + "narHash": "sha256-gsxPblA9YV+By4SxXWkj2HGGk7MKGxiNj/T9bU4q31U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e87ae7823e7bf0601385220c69b5a3b245123fc5", + "rev": "0121b2e3f85c7ebf6280173f1054f7e5606262d1", "type": "github" }, "original": { @@ -1585,11 +1557,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1791629930, - "narHash": "sha256-djG2tdpl/U+8eUmlozsRTRoU2yIvh8r1z8qj8gB/qWM=", + "lastModified": 1792047775, + "narHash": "sha256-Ks46+ZukSOvdgmextucbLykzpAmygNZ2I+HWxCe03ok=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1fd1ee43a0fd0bff17a8ba07e2a281406a92991f", + "rev": "9342d127aa8c585e82f3f57ddb25800fd546029f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6df702f..747b1f3 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,11 @@ emacs-overlay.url = "github:nix-community/emacs-overlay/master"; stylix = { - url = "github:nix-community/stylix"; + # TODO: revert to github:nix-community/stylix once + # https://github.com/nix-community/stylix/pull/2501 is merged; + # stylix master still sets `programs.rofi.font`, which + # home-manager renamed to `programs.rofi.settings.font`. + url = "github:Azd325/stylix/rofi-settings-font"; inputs.nixpkgs.follows = "unstable"; }; diff --git a/hm-modules/bar/noctalia/default.nix b/hm-modules/bar/noctalia/default.nix index b896672..7977501 100644 --- a/hm-modules/bar/noctalia/default.nix +++ b/hm-modules/bar/noctalia/default.nix @@ -70,7 +70,7 @@ in config = mkIf cfg.enable { programs.noctalia = { enable = true; - package = inputs.noctalia.packages.${pkgs.system}.default; + package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default; systemd.enable = true; customPalettes.stylix = { diff --git a/hm-modules/browser/zen/default.nix b/hm-modules/browser/zen/default.nix index 6e63281..0d3052e 100644 --- a/hm-modules/browser/zen/default.nix +++ b/hm-modules/browser/zen/default.nix @@ -8,8 +8,8 @@ in { options.dov.browser.zen.enable = mkEnableOption "zen config"; config = mkIf cfg.enable { - home.packages = with pkgs; [ - inputs.zen-browser.packages."${system}".default + home.packages = [ + inputs.zen-browser.packages."${pkgs.stdenv.hostPlatform.system}".default ]; }; } diff --git a/hm-modules/theme/default.nix b/hm-modules/theme/default.nix index 9f2be6c..90c7ae0 100644 --- a/hm-modules/theme/default.nix +++ b/hm-modules/theme/default.nix @@ -215,6 +215,7 @@ in { stylix = { enable = true; autoEnable = true; + overlays.enable = false; # Base scheme/polarity; overridable per specialisation below. base16Scheme = mkDefault themeVariants.${baseVariant}.scheme; polarity = mkDefault themeVariants.${baseVariant}.polarity; diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix index c13727b..68c8186 100644 --- a/machines/fujin/main/home.nix +++ b/machines/fujin/main/home.nix @@ -159,7 +159,7 @@ #mpd #mpv #mpc-cli - ] ++ [ inputs.thefuck.packages.${pkgs.system}.default ]; + ] ++ [ inputs.thefuck.packages.${pkgs.stdenv.hostPlatform.system}.default ]; # Stylix theming is driven by `dov.dynamic-theme` (hm-modules/theme), # which sets `enable`, `base16Scheme` and `polarity` + specialisations. diff --git a/modules/development/emacs/default.nix b/modules/development/emacs/default.nix index e4d6e1e..1561dc1 100644 --- a/modules/development/emacs/default.nix +++ b/modules/development/emacs/default.nix @@ -45,7 +45,7 @@ in { # :tools lookup & :lang org +roam sqlite # :lang latex & :lang org (latex previews) - texlive.combined.scheme-medium + texliveMedium # :lang nix nixfmt #nixd