diff --git a/flake.lock b/flake.lock index 25d0ec1..aefa5d0 100755 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1702303850, - "narHash": "sha256-zzSiwSL4yojnwZ2+ZCq4XRrZ7ERf51AuC+rc6WdGbps=", + "lastModified": 1704989658, + "narHash": "sha256-+5GaXuIa4sPHgt4f8+OuvrDfFfsXqAMazkwufnbiBYs=", "owner": "berberman", "repo": "flakes", - "rev": "b574a4e7127ff2db8d4b750a32f043f15cc05234", + "rev": "8ea1454ea06359733b8761715c79778bbc9787cc", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1703439018, - "narHash": "sha256-VT+06ft/x3eMZ1MJxWzQP3zXFGcrxGo5VR2rB7t88hs=", + "lastModified": 1704819371, + "narHash": "sha256-oFUfPWrWGQTZaCM3byxwYwrMLwshDxVGOrMH5cVP/X8=", "owner": "ipetkov", "repo": "crane", - "rev": "afdcd41180e3dfe4dac46b5ee396e3b12ccc967a", + "rev": "5c234301a1277e4cc759c23a2a7a00a06ddd7111", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1704072400, - "narHash": "sha256-Es4zcFoCJ+Pa9TN46VoqgNlYznuhc6s50LRcDqQEATs=", + "lastModified": 1705075138, + "narHash": "sha256-0slYsXoR1Sd5FwTfFZLYxAsI015+J4lvgvo55u4Gw1A=", "owner": "nix-community", "repo": "disko", - "rev": "59f915b45a38cb0ec0e97a713237877a06b43386", + "rev": "f78b6498f69e04514cb84393e5daba669198c1c1", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1704152458, - "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1705169127, + "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1704209910, - "narHash": "sha256-M+FImUWkeJUsdZd+X9cWNmhqJDguoKKmzX0kGMQIXnA=", + "lastModified": 1705070596, + "narHash": "sha256-Xq3JOddIH7AnACEHGaSKg71IF8CATE1zSTzdgR4pnlo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4f26c4e1ebf868243dc628182c88d7feb52c8472", + "rev": "c4da4b026deefd58f532353b64e9f17130e760ca", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1704155430, - "narHash": "sha256-DPmWaqR5efLFM0wA69c3VsIjmjdElQ+zBHy9ekvOB9U=", + "lastModified": 1705105875, + "narHash": "sha256-okq/uETLLafEcsm7Tv7NAIsFJyta+VoCiCO9XxAih8E=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b378b7baa66e0ba1f7cc5c00505cca252f53f420", + "rev": "0fabc558d1edbbdb0501507354b44070589cc25a", "type": "github" }, "original": { @@ -256,6 +256,26 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704813604, + "narHash": "sha256-z7a9dGhucumb5N5Py0/7PUCO6KCM5LPgY85hiGVIGRw=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "25da0804b00fffeee17463afd146711b4a05e77b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1703656108, @@ -296,11 +316,11 @@ ] }, "locked": { - "lastModified": 1703712542, - "narHash": "sha256-317EoHaQ5OwRLEjwjQUY57FpLDl75kEBbrohH7zbfRQ=", + "lastModified": 1704813398, + "narHash": "sha256-AIsvUwu+tU9lizSOQeAPglZyZ8w3nByGLipeELZm6lM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7229dd85f98341520b02fd46662f38d0af511d6d", + "rev": "11e293475de0c010f86060f0ed74aafe5f593e8b", "type": "github" }, "original": { @@ -316,11 +336,11 @@ ] }, "locked": { - "lastModified": 1703990467, - "narHash": "sha256-LItEeQVwDfLnavNskwdfRnonbEdq8DYiJlWRtF+bwng=", + "lastModified": 1704277720, + "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "1a41453cba42a3a1af2fff003be455ddbd75386c", + "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", "type": "github" }, "original": { @@ -349,16 +369,14 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1704244428, - "narHash": "sha256-n3KZlxx1QS3919I1O77OhBouUeetlLpmQQcIx3dqAso=", + "lastModified": 1705195288, + "narHash": "sha256-DYrcYjSy0UsR8QfT/MZtRgW5IILHmYoaerhDBX7Vsho=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "bd7442917422de061bcf61323b07abbb93bdb766", + "rev": "a02a7e727096f25c2ba50495338f8365c5d18ff7", "type": "github" }, "original": { @@ -392,11 +410,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1704124233, - "narHash": "sha256-lBHs/yUtkcGgapHRS31oOb5NqvnVrikvktGOW8rK+sE=", + "lastModified": 1705187059, + "narHash": "sha256-dSj+iIYqLA+7/5rLXWfUxw9IXRm0w8Mrm39af8klUH0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f752581d6723a10da7dfe843e917a3b5e4d8115a", + "rev": "ef811636cc847355688804593282078bac7758d4", "type": "github" }, "original": { @@ -418,11 +436,11 @@ ] }, "locked": { - "lastModified": 1703730102, - "narHash": "sha256-oXEu4FYhIgS0+qMMf1YfnseMmOStK/45S4k6XUcGi4M=", + "lastModified": 1704939631, + "narHash": "sha256-JlcyZVdsr1haV0SNgKgYY1yrc3dNWr1C47Hy6RVEZ9k=", "owner": "nixpak", "repo": "nixpak", - "rev": "39e3350f9d473422c8cf9e7cb362241f8ed2b974", + "rev": "c9d0aac8356c4eb7e0b710545dd7196c9333c77b", "type": "github" }, "original": { @@ -444,11 +462,11 @@ ] }, "locked": { - "lastModified": 1703746062, - "narHash": "sha256-2pWqtvDbz7f/PG37ouHhj9j+gh0fiIRB+WrmCKR1lT8=", + "lastModified": 1704955796, + "narHash": "sha256-NFlJu9zaDz/tMu9dGntxNMi4xMRJgx7LyPt8TbCyvAM=", "owner": "nixpak", "repo": "pkgs", - "rev": "d0ab3d98ae8d2f29f35a8c82049bacfbaa86034a", + "rev": "ac9cac9728d2f1d474137cb6d3755f3f3c5303db", "type": "github" }, "original": { @@ -459,27 +477,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1703992652, - "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { @@ -489,6 +507,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvfetcher": { "inputs": { "flake-compat": [ @@ -534,11 +568,11 @@ ] }, "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", + "lastModified": 1705072518, + "narHash": "sha256-90dERRuG781f0EWjn2AOtScZqsTcpIFLpY8TN2VbkL8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", + "rev": "274ae3979a0eacae422e1bbcf63b8b7a335e1114", "type": "github" }, "original": { @@ -561,6 +595,7 @@ "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nix-darwin": "nix-darwin", @@ -570,7 +605,7 @@ "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", "nixpak-pkgs": "nixpak-pkgs", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nvfetcher": "nvfetcher", "pre-commit-hooks-nix": "pre-commit-hooks-nix", @@ -593,11 +628,11 @@ ] }, "locked": { - "lastModified": 1704075545, - "narHash": "sha256-L3zgOuVKhPjKsVLc3yTm2YJ6+BATyZBury7wnhyc8QU=", + "lastModified": 1705198720, + "narHash": "sha256-/pzqqQQ1aU4llyaCDVjhPjQWIWpcRxFCsiDzl0lcAIk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0df72e106322b67e9c6e591fe870380bd0da0d5", + "rev": "71d1d01578272b2294f6993b1860dfb22e4baac3", "type": "github" }, "original": { @@ -616,11 +651,11 @@ ] }, "locked": { - "lastModified": 1703991717, - "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", + "lastModified": 1705201153, + "narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", + "rev": "70dd0d521f7849338e487a219c1a07c429a66d77", "type": "github" }, "original": { @@ -686,11 +721,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1703963193, - "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", + "lastModified": 1704825542, + "narHash": "sha256-JOrvP2cSCdpFEArVbIwBdRtRcayd7MszbCREEefQFh8=", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "ce89f49b7aab281198fad64e9a825a24dbf72e3d", "type": "gitlab" }, "original": { @@ -705,6 +740,9 @@ "hyprland-protocols": [ "hyprland-protocols" ], + "hyprlang": [ + "hyprlang" + ], "nixpkgs": [ "nixpkgs" ], @@ -713,11 +751,11 @@ ] }, "locked": { - "lastModified": 1703981071, - "narHash": "sha256-uI25x7CUiZAA7utg2nE6Eu3BjXi0gP6WnvDvh4q9dm0=", + "lastModified": 1704659450, + "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "54a30259be0dd196ffc260d6a52b6bbdbf1d5273", + "rev": "6a5de92769d5b7038134044053f90e7458f6a197", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2f6f7d5..b0800a3 100755 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ }; nix-gaming = { url = "github:fufexan/nix-gaming"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; # NOTE: I have to build wine-osu... inputs.flake-parts.follows = "flake-parts"; }; nix-monitored = { @@ -118,6 +118,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems-linux"; }; + hyprlang = { + url = "github:hyprwm/hyprlang"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-filter = { url = "github:numtide/nix-filter"; }; @@ -152,6 +156,7 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.hyprland-protocols.follows = "hyprland-protocols"; inputs.systems.follows = "systems-linux"; + inputs.hyprlang.follows = "hyprlang"; }; }; diff --git a/nixos/profiles/common/core/packages/overlays/nautilus.nix b/nixos/profiles/common/core/packages/overlays/nautilus.nix index 56c7133..738f4de 100644 --- a/nixos/profiles/common/core/packages/overlays/nautilus.nix +++ b/nixos/profiles/common/core/packages/overlays/nautilus.nix @@ -9,7 +9,7 @@ url = let repo = "nautilus-typeahead"; file = "nautilus-restore-typeahead.patch"; - commit = "6f75fbb04f6b108324850a0956f4bbdff0b6060b"; + commit = "524d92c42ea768e5e4ab965511287152ed885d22"; # v45.2.1 in "https://aur.archlinux.org/cgit/aur.git/plain/${file}?h=${repo}&id=${commit}"; hash = "sha256-a40vNo2Nw068GBtjVPUz6WAYRtjD0DB2bG/N14vSTxI="; }) diff --git a/users/guanranwang/home-manager/default.nix b/users/guanranwang/home-manager/default.nix index 9415881..f1743e5 100644 --- a/users/guanranwang/home-manager/default.nix +++ b/users/guanranwang/home-manager/default.nix @@ -42,7 +42,7 @@ ./applications/hyperfine ./applications/ydict - #./applications/fastfetch # broken on x86_64-darwin, https://github.com/NixOS/nixpkgs/issues/273947 + ./applications/fastfetch ./applications/android-tools ./applications/tealdeer ]; diff --git a/users/guanranwang/home-manager/modules/terminal.nix b/users/guanranwang/home-manager/modules/terminal.nix index 17737d8..4ea883e 100644 --- a/users/guanranwang/home-manager/modules/terminal.nix +++ b/users/guanranwang/home-manager/modules/terminal.nix @@ -55,9 +55,12 @@ in { config = { programs = { alacritty.settings = { - import = - lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") - ["${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml"]; + import = [ + # Workaround until pkgs.vimPlugins.tokyonight-nvim switch to .toml formats + (lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") (pkgs.runCommandNoCC "tokyonight_night.toml" {} '' + ${lib.getExe pkgs.yj} -yt < "${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml" > $out + '')) + ]; cursor.style = cfg.cursorStyle; font.size = cfg.fontSize; window.padding.x = cfg.padding;