From e68fffc8c214a68f2ab3cbdc4ba0a68cc21bf62e Mon Sep 17 00:00:00 2001 From: Lilith Date: Tue, 27 May 2025 23:57:29 +0200 Subject: [PATCH] update --- flake.lock | 105 ++++++++++++++++++------------------ flake.nix | 1 - home/lilith/env.nix | 2 +- home/lilith/packages.nix | 2 + hosts/lilith-pc/default.nix | 1 - system/optional/stylix.nix | 2 +- 6 files changed, 56 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 0031474f..35b38b80 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1745357003, - "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", + "lastModified": 1747864449, + "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", + "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", "type": "github" }, "original": { @@ -216,7 +216,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -357,16 +356,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" } @@ -378,11 +377,11 @@ ] }, "locked": { - "lastModified": 1747021744, - "narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -461,11 +460,11 @@ ] }, "locked": { - "lastModified": 1746964339, - "narHash": "sha256-yF8z6nFD+43KweC2/UCc6ZtCktGlzpa2EG4yonZfK5o=", + "lastModified": 1747913211, + "narHash": "sha256-SmYWv2WXgmaEa8dHfafEbaz5YpX0yxoRa17OC0rz/2U=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "51da8d137e042c117fe46a5c019ec38c0de0342a", + "rev": "f955664aca82dcd9f51d799faab32d8006656c3d", "type": "github" }, "original": { @@ -492,11 +491,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1747052147, - "narHash": "sha256-c0e3V7Rqu2DZuix1lRBXedInzSskow8ssQSsmqkW38o=", + "lastModified": 1748374007, + "narHash": "sha256-7PSKzswfo+jdXSLAaQmiKGz4+xwLs/wr5tihaMv76tQ=", "ref": "refs/heads/main", - "rev": "da3583fd5e86044d02af9fcfac84724e02545336", - "revCount": 6107, + "rev": "9b327ddfd1ad4cfef7a04a178e9f0aed16e95e0a", + "revCount": 6146, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -614,11 +613,11 @@ ] }, "locked": { - "lastModified": 1746655412, - "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", + "lastModified": 1747484975, + "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "557241780c179cf7ef224df392f8e67dab6cef83", + "rev": "163c83b3db48a17c113729c220a60b94596c9291", "type": "github" }, "original": { @@ -635,11 +634,11 @@ ] }, "locked": { - "lastModified": 1747029715, - "narHash": "sha256-F75IlhzUF+VTPOq+u2Exj+6PjHWPkLcBWDnhO+Vvch4=", + "lastModified": 1748328367, + "narHash": "sha256-/67J0XSAeqdaC5TCvpdlJ77fygd/qwoP4pBon4+gMiI=", "owner": "jas-singhfsu", "repo": "hyprpanel", - "rev": "2bb1449fb6ad60a736ce6fb4de2037d7655545ed", + "rev": "05cd1f5ade3f6eeb674301df7f78fb02ce280c35", "type": "github" }, "original": { @@ -685,11 +684,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1747584298, + "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", "type": "github" }, "original": { @@ -715,11 +714,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746576598, - "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", + "lastModified": 1748248602, + "narHash": "sha256-LanRAm0IRpL36KpCKSknEwkBFvTLc9mDHKeAmfTrHwg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", + "rev": "ad331efcaf680eb1c838cb339472399ea7b3cdab", "type": "github" }, "original": { @@ -754,11 +753,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747055697, - "narHash": "sha256-2MZBuYP/sWCbU0iBMz/g3LJOaMT5M5NrSARjLvKI480=", + "lastModified": 1748382391, + "narHash": "sha256-dz2mpjarTCcvbq1fAjWT4lwz6OyFXDzKbZ7jMj6Teu4=", "owner": "nix-community", "repo": "NUR", - "rev": "751508489cf6d7d29e39d35d3635df22bba533e9", + "rev": "262ee7ae124608aa3710bc5b7ef110fcdd71ac78", "type": "github" }, "original": { @@ -769,7 +768,10 @@ }, "nur_2": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -800,11 +802,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -845,11 +847,11 @@ ] }, "locked": { - "lastModified": 1740132177, - "narHash": "sha256-gNc20APKMefFdH5RONBuHhOps14aiMdgIT0I6RaSN64=", + "lastModified": 1748096947, + "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "568067f35a85932192bd43ddf64fc05eff850f9f", + "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1", "type": "github" }, "original": { @@ -865,11 +867,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -886,9 +888,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", - "flake-utils": [ - "flake-utils" - ], + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747005453, - "narHash": "sha256-78PfIpo3jCuX7pT3k4DkEES+KEy7pnrFGugsQ2w652o=", + "lastModified": 1748376235, + "narHash": "sha256-LIQnskjlVHTJC5dW4xoWlMCtrKeWOPW7/8HYd8IruLA=", "owner": "danth", "repo": "stylix", - "rev": "6b8309550e50358b63366d9bf3edb7ef08b9a7cc", + "rev": "e38a646e5cd3d000c8fffb14632f3bb8a45dd042", "type": "github" }, "original": { @@ -984,17 +984,16 @@ "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" } }, diff --git a/flake.nix b/flake.nix index 9f847777..cde275f1 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ url = "github:danth/stylix"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; home-manager.follows = "home-manager"; }; }; diff --git a/home/lilith/env.nix b/home/lilith/env.nix index 7dc13e47..282a9769 100644 --- a/home/lilith/env.nix +++ b/home/lilith/env.nix @@ -4,6 +4,7 @@ sessionVariables = { ELECTRON_OZONE_PLATFORM_HINT = "wayland"; NIXOS_OZONE_WL = "1"; + NH_FLAKE = "/home/lilith/nixos"; }; file.inbox.source = config.lib.file.mkOutOfStoreSymlink "/home/lilith/sync/inbox"; @@ -15,7 +16,6 @@ ll = "${pkgs.eza}/bin/eza -l"; la = "${pkgs.eza}/bin/eza -la"; grep = "grep --color=auto"; - os-switch = "nixos-rebuild build --flake $FLAKE -v --log-format internal-json |& nom --json && nvd diff /run/current-system $FLAKE/result && nixos-rebuild switch"; }; }; } diff --git a/home/lilith/packages.nix b/home/lilith/packages.nix index d266f5af..4897f9ab 100644 --- a/home/lilith/packages.nix +++ b/home/lilith/packages.nix @@ -27,6 +27,8 @@ logseq gimp + gqrx + btop htop nix-output-monitor diff --git a/hosts/lilith-pc/default.nix b/hosts/lilith-pc/default.nix index c4fca29d..38f950a3 100644 --- a/hosts/lilith-pc/default.nix +++ b/hosts/lilith-pc/default.nix @@ -12,7 +12,6 @@ in ollama.enable = true; sdr.enable = true; - hardware.opengl.extraPackages = [ pkgs.rocmPackages.clr.icd ]; hardware.graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ]; environment.systemPackages = [ pkgs.rocmPackages.clr.icd ]; boot.kernelModules = [ "amdgpu" ]; diff --git a/system/optional/stylix.nix b/system/optional/stylix.nix index a75ce6ca..d274e384 100644 --- a/system/optional/stylix.nix +++ b/system/optional/stylix.nix @@ -42,7 +42,7 @@ }; emoji = { - package = pkgs.twemoji-color-font; + package = pkgs.twitter-color-emoji; name = "Twemoji"; };