diff --git a/flake.lock b/flake.lock index c17566a6..0031474f 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1744289235, - "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", + "lastModified": 1745357003, + "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", + "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1744919155, - "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=", + "lastModified": 1747021744, + "narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=", "owner": "nix-community", "repo": "home-manager", - "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70", + "rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "lastModified": 1745948457, + "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "rev": "ac903e80b33ba6a88df83d02232483d99f327573", "type": "github" }, "original": { @@ -436,11 +436,11 @@ ] }, "locked": { - "lastModified": 1743953322, - "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", + "lastModified": 1745015490, + "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", + "rev": "60754910946b4e2dc1377b967b7156cb989c5873", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1744528518, - "narHash": "sha256-F3upSTM0XntGzO6VajVFLEEAJUHEKD4tUd7psn0+T0s=", + "lastModified": 1746964339, + "narHash": "sha256-yF8z6nFD+43KweC2/UCc6ZtCktGlzpa2EG4yonZfK5o=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "5106f7e6857935aed04f579752095fdd2df4d3d1", + "rev": "51da8d137e042c117fe46a5c019ec38c0de0342a", "type": "github" }, "original": { @@ -492,11 +492,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1744849150, - "narHash": "sha256-eaKqF4Oc7atN7Y2yTTeAOLN05q+G2YY0597ukgAD2Cs=", + "lastModified": 1747052147, + "narHash": "sha256-c0e3V7Rqu2DZuix1lRBXedInzSskow8ssQSsmqkW38o=", "ref": "refs/heads/main", - "rev": "225e13c3cc83308175f0a9aa18cfa31324155034", - "revCount": 6003, + "rev": "da3583fd5e86044d02af9fcfac84724e02545336", + "revCount": 6107, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -585,11 +585,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1745951494, + "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1746655412, + "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "557241780c179cf7ef224df392f8e67dab6cef83", "type": "github" }, "original": { @@ -635,11 +635,11 @@ ] }, "locked": { - "lastModified": 1744513377, - "narHash": "sha256-2ocy+qAVxTBmaK8MpAy7mpKIH+DYEzwf+KzXZX83oZ4=", + "lastModified": 1747029715, + "narHash": "sha256-F75IlhzUF+VTPOq+u2Exj+6PjHWPkLcBWDnhO+Vvch4=", "owner": "jas-singhfsu", "repo": "hyprpanel", - "rev": "42943b3def85d8787d703778951944c8e791202b", + "rev": "2bb1449fb6ad60a736ce6fb4de2037d7655545ed", "type": "github" }, "original": { @@ -660,11 +660,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1746635225, + "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", "type": "github" }, "original": { @@ -715,11 +715,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1746576598, + "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", "type": "github" }, "original": { @@ -754,11 +754,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744917937, - "narHash": "sha256-KzHhtTA54EwiOgxh3Vy81JhoIiQgZRDZlgo85a6K9TE=", + "lastModified": 1747055697, + "narHash": "sha256-2MZBuYP/sWCbU0iBMz/g3LJOaMT5M5NrSARjLvKI480=", "owner": "nix-community", "repo": "NUR", - "rev": "74f1b9f96f695deab80d45e6a9859f980b072436", + "rev": "751508489cf6d7d29e39d35d3635df22bba533e9", "type": "github" }, "original": { @@ -777,11 +777,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -865,11 +865,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744910471, - "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=", + "lastModified": 1747005453, + "narHash": "sha256-78PfIpo3jCuX7pT3k4DkEES+KEy7pnrFGugsQ2w652o=", "owner": "danth", "repo": "stylix", - "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51", + "rev": "6b8309550e50358b63366d9bf3edb7ef08b9a7cc", "type": "github" }, "original": { @@ -1001,11 +1001,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1742851696, - "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -1017,11 +1017,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { @@ -1117,11 +1117,11 @@ ] }, "locked": { - "lastModified": 1744644585, - "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", + "lastModified": 1745871725, + "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", + "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "type": "github" }, "original": { diff --git a/home/lilith/env.nix b/home/lilith/env.nix index ce94ee74..7dc13e47 100644 --- a/home/lilith/env.nix +++ b/home/lilith/env.nix @@ -3,6 +3,7 @@ home = { sessionVariables = { ELECTRON_OZONE_PLATFORM_HINT = "wayland"; + NIXOS_OZONE_WL = "1"; }; file.inbox.source = config.lib.file.mkOutOfStoreSymlink "/home/lilith/sync/inbox"; diff --git a/home/lilith/gpg.nix b/home/lilith/gpg.nix index c7af4648..f59b6492 100644 --- a/home/lilith/gpg.nix +++ b/home/lilith/gpg.nix @@ -9,6 +9,6 @@ services.gpg-agent = { enable = true; - pinentryPackage = pkgs.pinentry-gtk2; + pinentry.package = pkgs.pinentry-gtk2; }; } diff --git a/home/lilith/packages.nix b/home/lilith/packages.nix index b95c7505..d266f5af 100644 --- a/home/lilith/packages.nix +++ b/home/lilith/packages.nix @@ -21,6 +21,7 @@ keepassxc ncspot signal-desktop-bin + telegram-desktop vesktop logseq diff --git a/home/lilith/ssh.nix b/home/lilith/ssh.nix index 12a05c2e..fbddd070 100644 --- a/home/lilith/ssh.nix +++ b/home/lilith/ssh.nix @@ -18,7 +18,22 @@ "lilith-server" = { user = "lilith"; - hostname = "[2a01:4f9:4a:1ecb::2:]"; + hostname = "firelilith.org"; + }; + + "lilith-server-builder" = { + user = "nixremote"; + hostname = "firelilith.org"; + }; + + "lilith-pc-builder" = { + user = "nixremote"; + hostname = "lilith-pc"; + }; + + "lilith-pad-builder" = { + user = "nixremote"; + hostname = "lilith-pad"; }; }; }; diff --git a/home/lilith/zsh/default.nix b/home/lilith/zsh/default.nix index db1735e7..5dec2750 100644 --- a/home/lilith/zsh/default.nix +++ b/home/lilith/zsh/default.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.zsh = { enable = true; autosuggestion.enable = true; @@ -13,7 +14,7 @@ file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; } ]; - initExtra = '' + initContent = '' # p10k instant prompt P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh" [[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT" diff --git a/system/core/nix.nix b/system/core/nix.nix index 55ac2f00..7a7abe54 100644 --- a/system/core/nix.nix +++ b/system/core/nix.nix @@ -19,6 +19,10 @@ "@wheel" ]; + substituters = [ "https://hyprland.cachix.org" ]; + trusted-substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; + builders-use-substitutes = true; }; @@ -29,6 +33,32 @@ system = "x86_64-linux"; protocol = "ssh-ng"; + speedFactor = 4; + supportedFeatures = [ + "kvm" + "big-parallel" + "nixos-test" + "benchmark" + ]; + } + { + hostName = "lilith-pc-builder"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + + speedFactor = 8; + supportedFeatures = [ + "kvm" + "big-parallel" + "nixos-test" + "benchmark" + ]; + } + { + hostName = "lilith-pad-builder"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + speedFactor = 1; supportedFeatures = [ "kvm" @@ -37,19 +67,6 @@ "benchmark" ]; } - { - hostName = "lilith-pc"; - system = "x86_64-linux"; - protocol = "ssh-ng"; - - speedFactor = 2; - supportedFeatures = [ - "kvm" - "big-parallel" - "nixos-test" - "benchmark" - ]; - } ]; }; } diff --git a/system/core/persistence.nix b/system/core/persistence.nix index c3365d9f..07651d84 100644 --- a/system/core/persistence.nix +++ b/system/core/persistence.nix @@ -35,6 +35,7 @@ ".local/share/Steam" ".local/share/lutris" ".local/share/games" + ".local/share/TelegramDesktop" ]; files = [ ]; };