From 2a2367e83513bcfe24db458f4a1c8fe287a51d34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 29 Mar 2025 02:06:36 +0100 Subject: [PATCH 001/204] update flake lock --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index c376c31..a47aff6 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742852783, - "narHash": "sha256-pgpFoMc1RGGSyOGJikcXzsQND7VQ1/ywTwFa537b/hQ=", + "lastModified": 1743176335, + "narHash": "sha256-AyMWk4Xt6CygLOUcGNMfavm6+j7bRPVVT1m8KGE/qec=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "6657ce2de3cdb25b14fb0183b90366e3e577fb9a", + "rev": "7c47145f6cdf9826f9dc24c935195b58268b1ec6", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1742851132, - "narHash": "sha256-8vEcDefstheV1whup+5fSpZu4g9Jr7WpYzOBKAMSHn4=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "c4d5d72805d14ea43c140eeb70401bf84c0f11b4", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742465245, - "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", + "lastModified": 1743144043, + "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", + "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24", "type": "github" }, "original": { @@ -659,11 +659,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1743167577, + "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "type": "github" }, "original": { @@ -706,11 +706,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1742855907, - "narHash": "sha256-7njF0f8vk19p0cCYP+9EgYWT2RPCTSD822Yi41THKcs=", + "lastModified": 1743209194, + "narHash": "sha256-J6qTp1Au1/4DZOoZ0JJi/ewGCPH7O0chVcm+9MceKA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d395b30f4825e4bfbc31ed2fbd06162da496217e", + "rev": "2e66644c42992e79a85cbecbd4ffc1ffdeb0d16b", "type": "github" }, "original": { @@ -721,11 +721,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -769,11 +769,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -1066,11 +1066,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742855382, - "narHash": "sha256-C/aBeGktWiRg2EoSc0Aug8v+cZirSkyoVtMx1P0Dex0=", + "lastModified": 1743075971, + "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", "owner": "danth", "repo": "stylix", - "rev": "5321ab0c763caa786c9756a8e8e85d1c35a8e650", + "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", "type": "github" }, "original": { @@ -1257,11 +1257,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1741803511, - "narHash": "sha256-DcCGBWvAvt+OWI+EcPRO+/IXZHkFgPxZUmxf2VLl8no=", + "lastModified": 1743151937, + "narHash": "sha256-SjfGN+3wrzgRvzpziowTQUIr/o6ac5iMniua0ra6elo=", "owner": "dj95", "repo": "zjstatus", - "rev": "df9c77718f7023de8406e593eda6b5b0bc09cddd", + "rev": "2772e18d1bf57b5fe24c7e2c86a6cbec0475cd88", "type": "github" }, "original": { From 42a6516376c20877e7b970bfc9cb11cafb7a598e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 31 Mar 2025 19:19:46 +0200 Subject: [PATCH 002/204] update flake lock --- flake.lock | 96 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index a47aff6..b742927 100644 --- a/flake.lock +++ b/flake.lock @@ -74,6 +74,7 @@ "flake-parts": [ "flake-parts" ], + "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" ], @@ -81,11 +82,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743176335, - "narHash": "sha256-AyMWk4Xt6CygLOUcGNMfavm6+j7bRPVVT1m8KGE/qec=", + "lastModified": 1743440092, + "narHash": "sha256-6ykgLcWM5nHYtl26DzvMW5/XKzvetb+PGyXlI/+lTtU=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "7c47145f6cdf9826f9dc24c935195b58268b1ec6", + "rev": "33483738c63542ce110ef74866a0d2468d87795c", "type": "github" }, "original": { @@ -115,11 +116,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1742599566, - "narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=", + "lastModified": 1743414153, + "narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=", "owner": "catppuccin", "repo": "nix", - "rev": "5e303e8d7e251868fa79f83bbda69da90aa62402", + "rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4", "type": "github" }, "original": { @@ -502,11 +503,11 @@ ] }, "locked": { - "lastModified": 1743136572, - "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", + "lastModified": 1743438213, + "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", + "rev": "ccd7df836e1f42ea84806760f25b77b586370259", "type": "github" }, "original": { @@ -539,7 +540,7 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions", + "nix-github-actions": "nix-github-actions_2", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -580,6 +581,27 @@ } }, "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "bcachefs-tools", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -608,11 +630,11 @@ ] }, "locked": { - "lastModified": 1742701275, - "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=", + "lastModified": 1743306489, + "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6", + "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d", "type": "github" }, "original": { @@ -659,11 +681,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { @@ -675,11 +697,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -706,11 +728,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1743209194, - "narHash": "sha256-J6qTp1Au1/4DZOoZ0JJi/ewGCPH7O0chVcm+9MceKA8=", + "lastModified": 1743441273, + "narHash": "sha256-Bi22mEJLbL+oVXZSkEKcOfAHnmh2DdJTBSWdEoIk3Mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2e66644c42992e79a85cbecbd4ffc1ffdeb0d16b", + "rev": "dd0d35a8829dce4ef4f657534df24a2b71569e28", "type": "github" }, "original": { @@ -721,11 +743,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -769,11 +791,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -800,11 +822,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1742578646, - "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", "type": "github" }, "original": { @@ -1031,11 +1053,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1742700801, - "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", + "lastModified": 1743305778, + "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", + "rev": "8e873886bbfc32163fe027b8676c75637b7da114", "type": "github" }, "original": { @@ -1066,11 +1088,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743075971, - "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", + "lastModified": 1743434236, + "narHash": "sha256-KH9Qdnjj9FJuktRHhK5hsQdeSPYsZfGRB7t+Q34In34=", "owner": "danth", "repo": "stylix", - "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", + "rev": "c546582bae1a2c8745295a167b8db779215d780b", "type": "github" }, "original": { From e4839e4d2ef1e3962301247c54352bc318981da9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 1 Apr 2025 17:26:15 +0200 Subject: [PATCH 003/204] all the work to make stylix work again, just need to update the flake lock when it's time --- flake.nix | 4 +- .../desktop/package-configs/foot/default.nix | 1 + .../package-configs/plasma-desktop.nix | 55 ++--- home-manager/shared/default.nix | 59 +++-- nixos/shared/default.nix | 110 +++++----- pkgs/fcast/default.nix | 202 ------------------ 6 files changed, 114 insertions(+), 317 deletions(-) delete mode 100644 pkgs/fcast/default.nix diff --git a/flake.nix b/flake.nix index 0e94b48..b95b68a 100644 --- a/flake.nix +++ b/flake.nix @@ -131,7 +131,7 @@ nix-index-database.nixosModules.nix-index { home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin + inputs.catppuccin.homeModules.catppuccin ./home-manager/shared sops-nix.homeManagerModules.sops ]; @@ -164,7 +164,7 @@ nixosModules = import ./modules/nixos; # Reusable home-manager modules you might want to export # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; + # homeManagerModules = import ./modules/home-manager; # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index aada26e..3591d14 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -4,6 +4,7 @@ # catppuccin.enable = true; settings = { main = { + font = "Atkinson Monolegible:size=12"; }; mouse = { diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 870d2ac..ab636fe 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -13,33 +13,33 @@ programs.plasma = { enable = true; desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; - # kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; - # fonts = { - # fixedWidth = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.monospace.name}"; - # }; - # general = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.serif.name}"; - # }; - # menu = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # small = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # toolbar = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # windowTitle = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # }; + kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; + fonts = { + fixedWidth = { + pointSize = 11; + family = "${osConfig.stylix.fonts.monospace.name}"; + }; + general = { + pointSize = 11; + family = "${osConfig.stylix.fonts.serif.name}"; + }; + menu = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + small = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + toolbar = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + windowTitle = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + }; panels = [ { alignment = "left"; @@ -82,6 +82,7 @@ "qBittorrent" "vlc" "steam" + "Thunderbird Daily" ]; }; } diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index e769ee2..aeb1963 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -54,36 +54,33 @@ # }; }; }; - # stylix.enable = true; - # qt.platformTheme.name = lib.mkForce "kvantum"; - # qt.style.name = lib.mkForce "kvantum"; - # stylix = { - # enable = true; - # autoEnable = true; - # base16Scheme = { - # scheme = "Catppuccin Macchiato"; - # author = "https://github.com/catppuccin/catppuccin"; - # base00 = "24273a"; - # base01 = "1e2030"; - # base02 = "363a4f"; - # base03 = "494d64"; - # base04 = "5b6078"; - # base05 = "cad3f5"; - # base06 = "f4dbd6"; - # base07 = "b7bdf8"; - # base08 = "ed8796"; - # base09 = "f5a97f"; - # base0A = "eed49f"; - # base0B = "a6da95"; - # base0C = "8bd5ca"; - # base0D = "8aadf4"; - # base0E = "c6a0f6"; - # base0F = "f0c6c6"; - # }; - # image = ./background.jpg; - # cursor.package = pkgs.catppuccin-cursors; - # cursor.name = "catppuccin-macchiato-mauve-cursors"; - # cursor.size = 16; - # }; + stylix = { + enable = true; + autoEnable = true; + base16Scheme = { + scheme = "Catppuccin Macchiato"; + author = "https://github.com/catppuccin/catppuccin"; + base00 = "24273a"; + base01 = "1e2030"; + base02 = "363a4f"; + base03 = "494d64"; + base04 = "5b6078"; + base05 = "cad3f5"; + base06 = "f4dbd6"; + base07 = "b7bdf8"; + base08 = "ed8796"; + base09 = "f5a97f"; + base0A = "eed49f"; + base0B = "a6da95"; + base0C = "8bd5ca"; + base0D = "8aadf4"; + base0E = "c6a0f6"; + base0F = "f0c6c6"; + }; + image = ./background.jpg; + cursor.package = pkgs.catppuccin-cursors; + cursor.name = "catppuccin-macchiato-mauve-cursors"; + cursor.size = 16; + }; } diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 5a5e04c..d0e057a 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -70,8 +70,8 @@ catppuccin = { flavor = "macchiato"; tty.enable = true; - # sddm.enable = true; - # sddm.flavor = "macchiato"; + sddm.enable = true; + sddm.flavor = "macchiato"; forgejo.enable = true; forgejo.flavor = "macchiato"; # plymouth.enable = false; @@ -87,70 +87,70 @@ enableBrowserSocket = true; }; - # stylix = { - # enable = true; - # # targets.qt.platform = "kde6"; - # autoEnable = true; - # base16Scheme = { - # scheme = "Catppuccin Macchiato"; - # author = "https://github.com/catppuccin/catppuccin"; - # base00 = "24273a"; - # base01 = "1e2030"; - # base02 = "363a4f"; - # base03 = "494d64"; - # base04 = "5b6078"; - # base05 = "cad3f5"; - # base06 = "f4dbd6"; - # base07 = "b7bdf8"; - # base08 = "ed8796"; - # base09 = "f5a97f"; - # base0A = "eed49f"; - # base0B = "a6da95"; - # base0C = "8bd5ca"; - # base0D = "8aadf4"; - # base0E = "c6a0f6"; - # base0F = "f0c6c6"; - # }; - # image = ./background.jpg; - # cursor.package = pkgs.catppuccin-cursors.macchiatoMauve; - # cursor.name = "catppuccin-macchiato-mauve-cursors"; - # cursor.size = 16; - # homeManagerIntegration.followSystem = true; - # fonts = { - # serif = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Serif"; - # }; + stylix = { + enable = true; + autoEnable = true; + base16Scheme = { + scheme = "Catppuccin Macchiato"; + author = "https://github.com/catppuccin/catppuccin"; + base00 = "24273a"; + base01 = "1e2030"; + base02 = "363a4f"; + base03 = "494d64"; + base04 = "5b6078"; + base05 = "cad3f5"; + base06 = "f4dbd6"; + base07 = "b7bdf8"; + base08 = "ed8796"; + base09 = "f5a97f"; + base0A = "eed49f"; + base0B = "a6da95"; + base0C = "8bd5ca"; + base0D = "8aadf4"; + base0E = "c6a0f6"; + base0F = "f0c6c6"; + }; + image = ./background.jpg; + cursor.package = pkgs.catppuccin-cursors.macchiatoMauve; + cursor.name = "catppuccin-macchiato-mauve-cursors"; + cursor.size = 16; + homeManagerIntegration.followSystem = true; + fonts = { + serif = { + package = pkgs.atkinson-hyperlegible; + name = "Atkinson Hyperlegible"; + }; - # monospace = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Sans Mono"; - # }; + monospace = { + package = pkgs.atkinson-monolegible; + name = "Atkinson Monolegible"; + }; - # sansSerif = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Sans"; - # }; + sansSerif = { + package = pkgs.atkinson-hyperlegible; + name = "Atkinson Hyperlegible"; + }; - # emoji = { - # package = pkgs.noto-fonts-emoji-blob-bin; - # name = "Blobmoji"; - # }; - # }; - # }; + emoji = { + package = pkgs.noto-fonts-emoji-blob-bin; + name = "Blobmoji"; + }; + }; + }; fonts.packages = [ pkgs.atkinson-hyperlegible pkgs.atkinson-monolegible + pkgs.noto-fonts-emoji-blob-bin pkgs.noto-fonts pkgs.nerd-fonts.fira-mono ]; - fonts.fontconfig.defaultFonts = { - emoji = ["Blobmoji"]; - monospace = ["Atkinson Monolegible"]; - sansSerif = ["Atkinson Hyperlegible"]; - }; + # fonts.fontconfig.defaultFonts = { + # emoji = ["Blobmoji"]; + # monospace = ["Atkinson Monolegible"]; + # sansSerif = ["Atkinson Hyperlegible"]; + # }; networking = if config.services.vpn-ip.enable diff --git a/pkgs/fcast/default.nix b/pkgs/fcast/default.nix deleted file mode 100644 index 3919a72..0000000 --- a/pkgs/fcast/default.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ - lib, - buildNpmPackage, - cargo, - copyDesktopItems, - dbus, - electron_28, - fetchFromGitLab, - glib, - gnome, - gtk3, - jq, - libsecret, - makeDesktopItem, - makeWrapper, - moreutils, - napi-rs-cli, - nodejs_18, - patchutils_0_4_2, - pkg-config, - python3, - runCommand, - rustc, - rustPlatform, -}: let - description = "A secure and free password manager for all of your devices"; - icon = "bitwarden"; - electron = electron_28; -in - buildNpmPackage rec { - pname = "bitwarden-desktop"; - version = "2024.3.0"; - - src = fetchFromGitLab { - owner = "videostreaming"; - repo = "fcast"; - rev = "b13d0f7e8150c279d377a78f89d338b7fc0f5539"; - hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g="; - }; - - patches = [ - ./electron-builder-package-lock.patch - ]; - - # The nested package-lock.json from upstream is out-of-date, so copy the - # lock metadata from the root package-lock.json. - postPatch = '' - cat {,apps/desktop/src/}package-lock.json \ - | ${lib.getExe jq} -s ' - .[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2 - | .[0].packages."" = .[1].packages."" - | .[1].packages = .[0].packages - | .[1] - ' \ - | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json - ''; - - nodejs = nodejs_18; - - makeCacheWritable = true; - npmFlags = ["--legacy-peer-deps"]; - npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc="; - - cargoDeps = rustPlatform.fetchCargoTarball { - name = "${pname}-${version}"; - inherit src; - patches = - map - ( - patch: - runCommand - (builtins.baseNameOf patch) - {nativeBuildInputs = [patchutils_0_4_2];} - '' - < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out - '' - ) - patches; - patchFlags = ["-p4"]; - sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI="; - }; - cargoRoot = "apps/desktop/desktop_native"; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - nativeBuildInputs = [ - cargo - copyDesktopItems - jq - makeWrapper - moreutils - napi-rs-cli - pkg-config - python3 - rustc - rustPlatform.cargoCheckHook - rustPlatform.cargoSetupHook - ]; - - buildInputs = [ - glib - gtk3 - libsecret - ]; - - preBuild = '' - if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then - echo 'ERROR: electron version mismatch' - exit 1 - fi - ''; - - postBuild = '' - pushd apps/desktop - - # desktop_native/index.js loads a file of that name regarldess of the libc being used - mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node - - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} - - popd - ''; - - doCheck = true; - - nativeCheckInputs = [ - dbus - (gnome.gnome-keyring.override {useWrappedDaemon = false;}) - ]; - - checkFlags = [ - "--skip=password::password::tests::test" - ]; - - checkPhase = '' - runHook preCheck - - pushd ${cargoRoot} - export HOME=$(mktemp -d) - export -f cargoCheckHook runHook _eval _callImplicitHook - export cargoCheckType=release - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - -- bash -e -c cargoCheckHook - popd - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir $out - - pushd apps/desktop/dist/linux-unpacked - mkdir -p $out/opt/Bitwarden - cp -r locales resources{,.pak} $out/opt/Bitwarden - popd - - makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ - --add-flags $out/opt/Bitwarden/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set-default ELECTRON_IS_DEV 0 \ - --inherit-argv0 - - pushd apps/desktop/resources/icons - for icon in *.png; do - dir=$out/share/icons/hicolor/"''${icon%.png}"/apps - mkdir -p "$dir" - cp "$icon" "$dir"/${icon}.png - done - popd - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "bitwarden"; - exec = "bitwarden %U"; - inherit icon; - comment = description; - desktopName = "Bitwarden"; - categories = ["Utility"]; - }) - ]; - - meta = { - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; - inherit description; - homepage = "https://bitwarden.com"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [amarshall kiwi]; - platforms = ["x86_64-linux"]; - mainProgram = "bitwarden"; - }; - } From 7232b225b7b2fa1e17b0a67decce575c47e91805 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 1 Apr 2025 17:52:43 +0200 Subject: [PATCH 004/204] update flake lock, fix all errors (small tweaks) --- flake.lock | 36 ++-- flake.nix | 4 +- home-manager/shared/shell/helix/helix.nix | 3 +- nixos/shared/packages/default.nix | 2 +- pkgs/fcast/default.nix | 202 ------------------ .../default.nix | 7 +- 6 files changed, 27 insertions(+), 227 deletions(-) delete mode 100644 pkgs/fcast/default.nix diff --git a/flake.lock b/flake.lock index b742927..ca628e1 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743440092, - "narHash": "sha256-6ykgLcWM5nHYtl26DzvMW5/XKzvetb+PGyXlI/+lTtU=", + "lastModified": 1743460818, + "narHash": "sha256-NmpDlQORTW1T2xot97mim7+4CQySFMMoWF10Ix8CXcY=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "33483738c63542ce110ef74866a0d2468d87795c", + "rev": "3aa2a4c47ce57ff3965b75df9dde1a7b40ed6ae1", "type": "github" }, "original": { @@ -503,11 +503,11 @@ ] }, "locked": { - "lastModified": 1743438213, - "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=", + "lastModified": 1743519130, + "narHash": "sha256-Nw6sLnuwDPW7pBJ5jIvFFMqBfeK31xcp7/w1oYH1Q7U=", "owner": "nix-community", "repo": "home-manager", - "rev": "ccd7df836e1f42ea84806760f25b77b586370259", + "rev": "0afad8f08014c992c832466c1d46a0aa96ca2563", "type": "github" }, "original": { @@ -728,11 +728,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1743441273, - "narHash": "sha256-Bi22mEJLbL+oVXZSkEKcOfAHnmh2DdJTBSWdEoIk3Mc=", + "lastModified": 1743520842, + "narHash": "sha256-5lWR/Ku1xrwDGacNRyCUrCYr66AdR6BntH6vfHUpZns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd0d35a8829dce4ef4f657534df24a2b71569e28", + "rev": "963f97c0792f299d42f6ff9245618383bbce825e", "type": "github" }, "original": { @@ -822,11 +822,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1743076231, - "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", + "lastModified": 1743441817, + "narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c5963357f3c1c840201eda129a99d455074db04", + "rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e", "type": "github" }, "original": { @@ -1053,11 +1053,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1743305778, - "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", + "lastModified": 1743502316, + "narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8e873886bbfc32163fe027b8676c75637b7da114", + "rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8", "type": "github" }, "original": { @@ -1088,11 +1088,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743434236, - "narHash": "sha256-KH9Qdnjj9FJuktRHhK5hsQdeSPYsZfGRB7t+Q34In34=", + "lastModified": 1743496321, + "narHash": "sha256-xhHg8ixBhZngvGOMb2SJuJEHhHA10n8pA02fEKuKzek=", "owner": "danth", "repo": "stylix", - "rev": "c546582bae1a2c8745295a167b8db779215d780b", + "rev": "54721996d6590267d095f63297d9051e9342a33d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0e94b48..bc86997 100644 --- a/flake.nix +++ b/flake.nix @@ -131,7 +131,7 @@ nix-index-database.nixosModules.nix-index { home-manager.sharedModules = [ - inputs.catppuccin.homeManagerModules.catppuccin + catppuccin.homeModules.catppuccin ./home-manager/shared sops-nix.homeManagerModules.sops ]; @@ -164,7 +164,7 @@ nixosModules = import ./modules/nixos; # Reusable home-manager modules you might want to export # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; + # homeManagerModules = import ./modules/home-manager; # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; diff --git a/home-manager/shared/shell/helix/helix.nix b/home-manager/shared/shell/helix/helix.nix index 3b224db..bbadd82 100644 --- a/home-manager/shared/shell/helix/helix.nix +++ b/home-manager/shared/shell/helix/helix.nix @@ -7,7 +7,7 @@ }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "24.07"; + version = "25.01.1"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. @@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec { stripRoot = false; }; + useFetchCargoVendor = true; cargoHash = ""; nativeBuildInputs = [git installShellFiles]; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index fae8d58..0d4f668 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -22,7 +22,7 @@ install-nix-no-inhibit update upgrade - # simple-completion-language-server + simple-completion-language-server # System tools age diff --git a/pkgs/fcast/default.nix b/pkgs/fcast/default.nix deleted file mode 100644 index 3919a72..0000000 --- a/pkgs/fcast/default.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ - lib, - buildNpmPackage, - cargo, - copyDesktopItems, - dbus, - electron_28, - fetchFromGitLab, - glib, - gnome, - gtk3, - jq, - libsecret, - makeDesktopItem, - makeWrapper, - moreutils, - napi-rs-cli, - nodejs_18, - patchutils_0_4_2, - pkg-config, - python3, - runCommand, - rustc, - rustPlatform, -}: let - description = "A secure and free password manager for all of your devices"; - icon = "bitwarden"; - electron = electron_28; -in - buildNpmPackage rec { - pname = "bitwarden-desktop"; - version = "2024.3.0"; - - src = fetchFromGitLab { - owner = "videostreaming"; - repo = "fcast"; - rev = "b13d0f7e8150c279d377a78f89d338b7fc0f5539"; - hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g="; - }; - - patches = [ - ./electron-builder-package-lock.patch - ]; - - # The nested package-lock.json from upstream is out-of-date, so copy the - # lock metadata from the root package-lock.json. - postPatch = '' - cat {,apps/desktop/src/}package-lock.json \ - | ${lib.getExe jq} -s ' - .[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2 - | .[0].packages."" = .[1].packages."" - | .[1].packages = .[0].packages - | .[1] - ' \ - | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json - ''; - - nodejs = nodejs_18; - - makeCacheWritable = true; - npmFlags = ["--legacy-peer-deps"]; - npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc="; - - cargoDeps = rustPlatform.fetchCargoTarball { - name = "${pname}-${version}"; - inherit src; - patches = - map - ( - patch: - runCommand - (builtins.baseNameOf patch) - {nativeBuildInputs = [patchutils_0_4_2];} - '' - < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out - '' - ) - patches; - patchFlags = ["-p4"]; - sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI="; - }; - cargoRoot = "apps/desktop/desktop_native"; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - nativeBuildInputs = [ - cargo - copyDesktopItems - jq - makeWrapper - moreutils - napi-rs-cli - pkg-config - python3 - rustc - rustPlatform.cargoCheckHook - rustPlatform.cargoSetupHook - ]; - - buildInputs = [ - glib - gtk3 - libsecret - ]; - - preBuild = '' - if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then - echo 'ERROR: electron version mismatch' - exit 1 - fi - ''; - - postBuild = '' - pushd apps/desktop - - # desktop_native/index.js loads a file of that name regarldess of the libc being used - mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node - - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} - - popd - ''; - - doCheck = true; - - nativeCheckInputs = [ - dbus - (gnome.gnome-keyring.override {useWrappedDaemon = false;}) - ]; - - checkFlags = [ - "--skip=password::password::tests::test" - ]; - - checkPhase = '' - runHook preCheck - - pushd ${cargoRoot} - export HOME=$(mktemp -d) - export -f cargoCheckHook runHook _eval _callImplicitHook - export cargoCheckType=release - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - -- bash -e -c cargoCheckHook - popd - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir $out - - pushd apps/desktop/dist/linux-unpacked - mkdir -p $out/opt/Bitwarden - cp -r locales resources{,.pak} $out/opt/Bitwarden - popd - - makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ - --add-flags $out/opt/Bitwarden/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set-default ELECTRON_IS_DEV 0 \ - --inherit-argv0 - - pushd apps/desktop/resources/icons - for icon in *.png; do - dir=$out/share/icons/hicolor/"''${icon%.png}"/apps - mkdir -p "$dir" - cp "$icon" "$dir"/${icon}.png - done - popd - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "bitwarden"; - exec = "bitwarden %U"; - inherit icon; - comment = description; - desktopName = "Bitwarden"; - categories = ["Utility"]; - }) - ]; - - meta = { - changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; - inherit description; - homepage = "https://bitwarden.com"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [amarshall kiwi]; - platforms = ["x86_64-linux"]; - mainProgram = "bitwarden"; - }; - } diff --git a/pkgs/simple-completion-language-server/default.nix b/pkgs/simple-completion-language-server/default.nix index 00d16a2..474f9f3 100644 --- a/pkgs/simple-completion-language-server/default.nix +++ b/pkgs/simple-completion-language-server/default.nix @@ -5,16 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "simple-completion-language-server"; - version = "ff9f90bc96c347f284571bc6310bc31f95508d55"; + version = "6c797949ad5a6e9548b60b5475d1c9977f26c811"; src = fetchFromGitHub { owner = "estin"; repo = pname; rev = version; - hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM="; + hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM="; }; - cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo="; + useFetchCargoVendor = true; + cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM="; meta = with lib; { description = "Language server to enable word completion and snippets for Helix editor"; homepage = "https://github.com/estin/simple-completion-language-server"; From b0b86f6ac41cb711510bedd1ccc993e1484f2bdd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 4 Apr 2025 20:54:44 +0200 Subject: [PATCH 005/204] disable weird LLM shit in firefox pre-emtpively --- nixos/desktop/package-configs/firefox/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index f2bf654..95b8aad 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -160,6 +160,8 @@ "floorp.tabbar.style" = 2; "floorp.browser.user.interface" = 8; "signon.rememberSignons" = true; + "browser.ml.chat.enabled" = false; + "browser.ml.chat.shortcuts" = false; }; # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks # Bookmarks = [ From 6e9214860069f86e57451882aad8b2abc98ba22e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Apr 2025 14:36:00 +0200 Subject: [PATCH 006/204] update nextcloud and conduwuit --- flake.nix | 10 +++++----- nixos/server/package-configs/nextcloud/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index bc86997..1344852 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,10 @@ catppuccin.url = "github:catppuccin/nix"; # Conduit fork without all the fuss and drama - # conduwuit = { - # url = "github:girlbossceo/conduwuit"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -99,7 +99,7 @@ jovian, nixos-hardware, nix-index-database, - # conduwuit, + conduwuit, stylix, ... } @ inputs: let diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 4f588b9..3367dbd 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -50,7 +50,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud30; + package = pkgs.nextcloud31; # Use HTTPS for links https = true; From 9b7bd4222cf7226656daf3133bdb462351c588bc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 6 Apr 2025 15:29:45 +0200 Subject: [PATCH 007/204] update flake lock --- flake.lock | 946 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 796 insertions(+), 150 deletions(-) diff --git a/flake.lock b/flake.lock index ca628e1..1379359 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1738524606, + "narHash": "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -82,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743460818, - "narHash": "sha256-NmpDlQORTW1T2xot97mim7+4CQySFMMoWF10Ix8CXcY=", + "lastModified": 1743904248, + "narHash": "sha256-7yncAIBxrHiWKXPh6RTwyP2kUMsvJvunKqoTTmte6r4=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "3aa2a4c47ce57ff3965b75df9dde1a7b40ed6ae1", + "rev": "592f04256fa0411d871f4e9e2926fb13241b8eb2", "type": "github" }, "original": { @@ -111,16 +135,72 @@ "type": "gitlab" } }, + "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_3", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1737621947, + "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=", + "owner": "cachix", + "repo": "cachix", + "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": [ + "conduwuit", + "cachix", + "devenv" + ], + "flake-compat": [ + "conduwuit", + "cachix", + "devenv" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv" + ], + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "owner": "cachix", + "repo": "cachix", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1743414153, - "narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=", + "lastModified": 1743801669, + "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=", "owner": "catppuccin", "repo": "nix", - "rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4", + "rev": "07beb389d69a52c4dd5895da9553463c3740a26a", "type": "github" }, "original": { @@ -129,6 +209,53 @@ "type": "github" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1741891349, + "narHash": "sha256-YvrzOWcX7DH1drp5SGa+E/fc7wN3hqFtPbqPjZpOu1Q=", + "owner": "girlbossceo", + "repo": "complement", + "rev": "e587b3df569cba411aeac7c20b6366d03c143745", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic", + "cachix": "cachix", + "complement": "complement", + "crane": "crane_3", + "fenix": "fenix", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils", + "liburing": "liburing", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ], + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1743780871, + "narHash": "sha256-xmDepDLHsIWiwpWYjhI40XOrV9jCKrYJQ+EK1EOIdRg=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "4e5b87d0cd16f3d015f4b61285b369d027bb909d", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1742394900, @@ -145,6 +272,44 @@ } }, "crane_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "locked": { + "lastModified": 1739936662, + "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { "locked": { "lastModified": 1741148495, "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", @@ -159,13 +324,13 @@ "type": "github" } }, - "crane_3": { + "crane_5": { "locked": { - "lastModified": 1739053031, - "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", + "lastModified": 1743700120, + "narHash": "sha256-8BjG/P0xnuCyVOXlYRwdI1B8nVtyYLf3oDwPSimqREY=", "owner": "ipetkov", "repo": "crane", - "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", + "rev": "e316f19ee058e6db50075115783be57ac549c389", "type": "github" }, "original": { @@ -174,6 +339,40 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "git-hooks" + ], + "nix": "nix", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733323168, + "narHash": "sha256-d5DwB4MZvlaQpN6OQ4SLYxb5jA4UH5EtV5t5WOtjLPU=", + "owner": "cachix", + "repo": "devenv", + "rev": "efa9010b8b1cfd5dd3c7ed1e172a470c3b84a064", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -181,11 +380,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -194,14 +393,37 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1740724364, + "narHash": "sha256-D1jLIueJx1dPrP09ZZwTrPf4cubV+TsFMYbpYYTVj6A=", + "owner": "nix-community", + "repo": "fenix", + "rev": "edf7d9e431cda8782e729253835f178a356d3aab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1741628778, - "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", + "lastModified": 1743774811, + "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", + "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", "type": "github" }, "original": { @@ -227,6 +449,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -242,7 +480,40 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -258,7 +529,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_7": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -276,15 +547,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "conduwuit", + "attic", "nixpkgs" ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -294,6 +567,50 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -314,7 +631,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -350,11 +667,30 @@ }, "original": { "owner": "numtide", + "ref": "main", "repo": "flake-utils", "type": "github" } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": [ "stylix", @@ -375,9 +711,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -410,23 +746,52 @@ } }, "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { "inputs": { "flake-compat": [ "stylix", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "stylix", "nixpkgs" ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -436,6 +801,29 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -457,7 +845,7 @@ "type": "github" } }, - "gitignore_2": { + "gitignore_3": { "inputs": { "nixpkgs": [ "stylix", @@ -503,11 +891,11 @@ ] }, "locked": { - "lastModified": 1743519130, - "narHash": "sha256-Nw6sLnuwDPW7pBJ5jIvFFMqBfeK31xcp7/w1oYH1Q7U=", + "lastModified": 1743869639, + "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "0afad8f08014c992c832466c1d46a0aa96ca2563", + "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", "type": "github" }, "original": { @@ -525,11 +913,11 @@ ] }, "locked": { - "lastModified": 1741635347, - "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", + "lastModified": 1743869639, + "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", "type": "github" }, "original": { @@ -540,15 +928,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_2" + "nix-github-actions": "nix-github-actions_3", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1743144043, - "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=", + "lastModified": 1743879910, + "narHash": "sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24", + "rev": "96a7fbb4a892696ff89d3d42fc743ab5d6714222", "type": "github" }, "original": { @@ -559,10 +947,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", + "crane": "crane_4", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, @@ -580,6 +968,96 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1740613216, + "narHash": "sha256-NpPOBqNND3Qe9IwqYs0mJLGTmIx7e6FgUEBAnJ+1ZLA=", + "owner": "axboe", + "repo": "liburing", + "rev": "e1003e496e66f9b0ae06674869795edf772d5500", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_4", + "nixpkgs-23-11": [ + "conduwuit", + "cachix", + "devenv" + ], + "nixpkgs-regression": [ + "conduwuit", + "cachix", + "devenv" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv" + ] + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -602,6 +1080,28 @@ } }, "nix-github-actions_2": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_3": { "inputs": { "nixpkgs": [ "jovian", @@ -630,11 +1130,11 @@ ] }, "locked": { - "lastModified": 1743306489, - "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=", + "lastModified": 1743911143, + "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d", + "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb", "type": "github" }, "original": { @@ -697,11 +1197,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -728,11 +1228,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1743520842, - "narHash": "sha256-5lWR/Ku1xrwDGacNRyCUrCYr66AdR6BntH6vfHUpZns=", + "lastModified": 1743946057, + "narHash": "sha256-IKZA+v1UtHya6WabPXF94t4NN+pV1dIDJrtbjsR3Cw0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "963f97c0792f299d42f6ff9245618383bbce825e", + "rev": "8c76204343580c4b5b7ca0ff1d96031a3dac39d4", "type": "github" }, "original": { @@ -741,13 +1241,45 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -757,13 +1289,77 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1743689281, + "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1743689281, + "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -773,7 +1369,55 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1741241576, "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=", @@ -789,13 +1433,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_8": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -805,7 +1449,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_9": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -820,57 +1464,9 @@ "type": "indirect" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1743441817, - "narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1739138025, - "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b2243f41e860ac85c0b446eadc6930359b294e79", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_5", "nixpkgs": [ "stylix", "nixpkgs" @@ -878,11 +1474,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1741693509, - "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "lastModified": 1743884191, + "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", "owner": "nix-community", "repo": "NUR", - "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", "type": "github" }, "original": { @@ -920,7 +1516,7 @@ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -940,20 +1536,38 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1741308171, + "narHash": "sha256-YdBvdQ75UJg5ffwNjxizpviCVwVDJnBkM8ZtGIduMgY=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "3ce04794bcfbbb0d2e6f81ae35fc4acf688b6986", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.11.1", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", + "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts_3", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_8", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -963,6 +1577,23 @@ "zjstatus": "zjstatus" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1740691488, + "narHash": "sha256-Fs6vBrByuiOf2WO77qeMDMTXcTGzrIMqLBv+lNeywwM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "fe3eda77d3a7ce212388bda7b6cec8bffcc077e5", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1013,11 +1644,11 @@ ] }, "locked": { - "lastModified": 1739240901, - "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=", + "lastModified": 1743682350, + "narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c", + "rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382", "type": "github" }, "original": { @@ -1029,8 +1660,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_5", + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_9", "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { @@ -1050,14 +1681,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1743502316, - "narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=", + "lastModified": 1743910657, + "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8", + "rev": "523f58a4faff6c67f5f685bed33a7721e984c304", "type": "github" }, "original": { @@ -1073,14 +1704,14 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_2", - "git-hooks": "git-hooks", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_3", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_11", "nur": "nur", - "systems": "systems_2", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1088,11 +1719,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743496321, - "narHash": "sha256-xhHg8ixBhZngvGOMb2SJuJEHhHA10n8pA02fEKuKzek=", + "lastModified": 1743888894, + "narHash": "sha256-FZG4+KaspfpmDbTeOA3CfsIFqrOWW9j/K6wNgpge17s=", "owner": "danth", "repo": "stylix", - "rev": "54721996d6590267d095f63297d9051e9342a33d", + "rev": "9a3fb931fdfc5d6be48dc3c90fe775aada78efba", "type": "github" }, "original": { @@ -1146,6 +1777,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1183,11 +1829,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1741468895, - "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "lastModified": 1742851696, + "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", "owner": "tinted-theming", "repo": "schemes", - "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", "type": "github" }, "original": { @@ -1199,11 +1845,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740877430, - "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", + "lastModified": 1743296873, + "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", + "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", "type": "github" }, "original": { @@ -1273,17 +1919,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_8", + "crane": "crane_5", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_12", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1743151937, - "narHash": "sha256-SjfGN+3wrzgRvzpziowTQUIr/o6ac5iMniua0ra6elo=", + "lastModified": 1743838985, + "narHash": "sha256-7fmg1fPEJWdCrw2QsanIAA0TT10IvUImZyWbvoSPebA=", "owner": "dj95", "repo": "zjstatus", - "rev": "2772e18d1bf57b5fe24c7e2c86a6cbec0475cd88", + "rev": "d27f0819903b5f31d527affa875c71cb5c2a8578", "type": "github" }, "original": { From 9149ac1c77eb54a992fc02def76d140be98d94c0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 6 Apr 2025 16:48:20 +0200 Subject: [PATCH 008/204] doesn't compile with that option --- nixos/server/package-configs/conduit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index fb52a62..db53c61 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -117,6 +117,7 @@ in { locations."=/.well-known/matrix/client" = { # Use the contents of the derivation built previously alias = "${well_known_client}"; + return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}"; extraConfig = '' # Set the header since by default NGINX thinks it's just bytes @@ -130,6 +131,7 @@ in { proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; recommendedProxySettings = false; + return = "200 {\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}"; extraConfig = '' proxy_set_header Host $host; proxy_buffering off; From db0db2d2339ad44309a127dc1bc9091c795c0851 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 6 Apr 2025 16:54:05 +0200 Subject: [PATCH 009/204] set main branch conduwuit as the instance for conduwuit to run --- nixos/server/package-configs/conduit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index db53c61..307e8c3 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -1,5 +1,6 @@ { config, + inputs, pkgs, ... }: let @@ -34,8 +35,8 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - # package = inputs.conduwuit.packages.${pkgs.system}.default; - package = pkgs.conduwuit; + package = inputs.conduwuit.packages.${pkgs.system}.default; + # package = pkgs.conduwuit; settings.global = { inherit server_name; From 9256051dc8884401a6692bae965f0eb9d082634f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 6 Apr 2025 18:09:23 +0200 Subject: [PATCH 010/204] use the conduwuit setting not the conduit one --- nixos/server/package-configs/conduit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 307e8c3..9c7964f 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -30,7 +30,7 @@ ''; in { # Configure Conduit itself - services.matrix-conduit = { + services.conduwuit = { enable = true; # This causes NixOS to use the flake defined in this repository instead of From cdcfcd2a8df68f630fb748e610d645468903a562 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 6 Apr 2025 18:17:30 +0200 Subject: [PATCH 011/204] fix nginx configuration hopefully --- nixos/server/package-configs/conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 9c7964f..f2b6ac8 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -40,7 +40,6 @@ in { settings.global = { inherit server_name; - database_backend = "rocksdb"; allow_registration = false; # emergency_password = "testpassword"; turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"]; @@ -118,7 +117,7 @@ in { locations."=/.well-known/matrix/client" = { # Use the contents of the derivation built previously alias = "${well_known_client}"; - return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}"; + return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}';"; extraConfig = '' # Set the header since by default NGINX thinks it's just bytes @@ -132,7 +131,7 @@ in { proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; recommendedProxySettings = false; - return = "200 {\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}"; + return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}';"; extraConfig = '' proxy_set_header Host $host; proxy_buffering off; From 6e83786862a6d8a66418b1172c0a4405fc3da87b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 6 Apr 2025 18:20:38 +0200 Subject: [PATCH 012/204] try again for the nginx configuration --- nixos/server/package-configs/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index f2b6ac8..5fc0bde 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -117,7 +117,7 @@ in { locations."=/.well-known/matrix/client" = { # Use the contents of the derivation built previously alias = "${well_known_client}"; - return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}';"; + return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}'"; extraConfig = '' # Set the header since by default NGINX thinks it's just bytes @@ -131,7 +131,7 @@ in { proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; recommendedProxySettings = false; - return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}';"; + return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}'"; extraConfig = '' proxy_set_header Host $host; proxy_buffering off; From 5e8278a67556f525db206962858ef924f9b427c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 02:27:01 +0200 Subject: [PATCH 013/204] add jellyfin to steam deck --- nixos/hosts/shodan/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 44eed8c..b451d17 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -146,6 +146,7 @@ # noto-fonts-emoji-blob-bin # noto-fonts-emoji qjackctl + jellyfin #rustdesk sbctl From 7163a072784e32c9c1271c468a9f2db1b8e4240c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 02:40:18 +0200 Subject: [PATCH 014/204] the media player, not the server silly --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b451d17..d00397d 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -146,7 +146,7 @@ # noto-fonts-emoji-blob-bin # noto-fonts-emoji qjackctl - jellyfin + jellyfin-media-player #rustdesk sbctl From 01ffe970848091f5f0db04b835aef9135184d141 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 14:42:08 +0200 Subject: [PATCH 015/204] never mind, just disable it, don't rebuild queen unless you want to lose conduwuit --- flake.lock | 96 +++++++++---------- .../package-configs/conduit/default.nix | 2 +- nixos/server/package-configs/default.nix | 2 +- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 1379359..06968fd 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743904248, - "narHash": "sha256-7yncAIBxrHiWKXPh6RTwyP2kUMsvJvunKqoTTmte6r4=", + "lastModified": 1744593024, + "narHash": "sha256-3hr5l47W4R9O6NDNqnEpIpqcBkOstx/Hoix9WJJ8YxQ=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "592f04256fa0411d871f4e9e2926fb13241b8eb2", + "rev": "c9ee6467183b224b40ca437fd23eeabe0ae6a158", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1743801669, - "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=", + "lastModified": 1744447794, + "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=", "owner": "catppuccin", "repo": "nix", - "rev": "07beb389d69a52c4dd5895da9553463c3740a26a", + "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1743780871, - "narHash": "sha256-xmDepDLHsIWiwpWYjhI40XOrV9jCKrYJQ+EK1EOIdRg=", + "lastModified": 1744169934, + "narHash": "sha256-5YyHmPUUrXXrczWayji9327knihVTKnmjX+vX6+p6d0=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "4e5b87d0cd16f3d015f4b61285b369d027bb909d", + "rev": "d8311a5ff672fdc4729d956af5e3af8646b0670d", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1743598667, - "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", + "lastModified": 1744145203, + "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "owner": "nix-community", "repo": "disko", - "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", + "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1744618730, + "narHash": "sha256-n3gN7aHwVRnnBZI64EDoKyJnWidNYJ0xezhqQtdjH2Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "85dd758c703ffbf9d97f34adcef3a898b54b4014", "type": "github" }, "original": { @@ -932,11 +932,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1743879910, - "narHash": "sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo=", + "lastModified": 1744436521, + "narHash": "sha256-3Q3+H8YeuRRGXZqL0FgWAcPg2bX416M6NX/VpLGRw+c=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96a7fbb4a892696ff89d3d42fc743ab5d6714222", + "rev": "1dd888cc60079910fba27eb43b959b633e3b466c", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ ] }, "locked": { - "lastModified": 1743911143, - "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=", + "lastModified": 1744518957, + "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb", + "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -1197,11 +1197,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "type": "github" }, "original": { @@ -1228,11 +1228,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1743946057, - "narHash": "sha256-IKZA+v1UtHya6WabPXF94t4NN+pV1dIDJrtbjsR3Cw0=", + "lastModified": 1744632434, + "narHash": "sha256-s4H8cFLNMs5ohRC46kS6DIptarUttiNbpGBG5R9/IBk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c76204343580c4b5b7ca0ff1d96031a3dac39d4", + "rev": "fb777966eb979e6798888d740f8e856dd5c2b312", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "lastModified": 1744502386, + "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -1665,11 +1665,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1742413977, - "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=", + "lastModified": 1744611752, + "narHash": "sha256-5Qm/pHxs8Og1GAxc2gNgc3Em28UPR7R7IYqiaHvZ+8M=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b4fbffe79c00f19be94b86b4144ff67541613659", + "rev": "7bdf5003c730650cd9f57a3f8beaa5a435c53b2a", "type": "gitlab" }, "original": { @@ -1684,11 +1684,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1743910657, - "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=", + "lastModified": 1744518500, + "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "523f58a4faff6c67f5f685bed33a7721e984c304", + "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", "type": "github" }, "original": { @@ -1719,11 +1719,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1743888894, - "narHash": "sha256-FZG4+KaspfpmDbTeOA3CfsIFqrOWW9j/K6wNgpge17s=", + "lastModified": 1744572782, + "narHash": "sha256-CFNluxLqxmDPQYxi37nBd4wrpB0lI4Os8nRA7UWAJK0=", "owner": "danth", "repo": "stylix", - "rev": "9a3fb931fdfc5d6be48dc3c90fe775aada78efba", + "rev": "042db377bccc99b1a724b076c89ba803e411d889", "type": "github" }, "original": { diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 5fc0bde..f8bcf35 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -30,7 +30,7 @@ ''; in { # Configure Conduit itself - services.conduwuit = { + services.conduit = { enable = true; # This causes NixOS to use the flake defined in this repository instead of diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 91ff838..25e9db5 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - ./conduit + # ./conduit ./forgejo ./gotosocial ./mail-server From c5ccfd86f9cf5b5a81a921942ae9806ad3c2ccdb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 20:02:52 +0200 Subject: [PATCH 016/204] disable decky loader since it seems to crash --- nixos/hosts/shodan/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index d00397d..3305f53 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -186,11 +186,11 @@ user = "lillian"; desktopSession = "plasma"; }; - decky-loader = { - enable = true; - package = pkgs.decky-loader-prerelease; - extraPackages = [pkgs.python3]; - }; + # decky-loader = { + # enable = true; + # package = pkgs.decky-loader-prerelease; + # extraPackages = [pkgs.python3]; + # }; devices.steamdeck = { enable = true; autoUpdate = true; From 33fade22193c553bf47d8ac31a5b6b992228d874 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 20:13:22 +0200 Subject: [PATCH 017/204] giving some LD_PRELOAD errors on steam on shodan, let's see if disabling extest works to fix it --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 3305f53..a1bfa48 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -205,7 +205,7 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - extest.enable = true; + # extest.enable = true; }; kdeconnect.enable = true; From 9c45bdb552c95a2e5efc9eb21fc5a4badd19c898 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 20:47:19 +0200 Subject: [PATCH 018/204] disable plymouth to see if there's any errors in the boot sequence --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index a1bfa48..de68301 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -50,7 +50,7 @@ }; consoleLogLevel = 0; kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; - plymouth.enable = true; + # plymouth.enable = true; }; zramSwap.enable = false; networking = { From 4f42202f836589ea6f9cf78fe347f97268c224a9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 20:55:18 +0200 Subject: [PATCH 019/204] disable the console thingies as well to see output from boot --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index de68301..8dbe9a2 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -49,7 +49,7 @@ pkiBundle = "/etc/secureboot"; }; consoleLogLevel = 0; - kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; + # kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; # plymouth.enable = true; }; zramSwap.enable = false; From 498035504b0f33ccbc7d3ca9fcd1e39f6334e1db Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 14 Apr 2025 22:46:37 +0200 Subject: [PATCH 020/204] remove jellyfin media player to see if that fixes the deck somehow magically --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 8dbe9a2..8285aa3 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -146,7 +146,7 @@ # noto-fonts-emoji-blob-bin # noto-fonts-emoji qjackctl - jellyfin-media-player + # jellyfin-media-player #rustdesk sbctl From 9c39dc31361b2e573996c372822643f413a38796 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 15 Apr 2025 12:40:35 +0200 Subject: [PATCH 021/204] all shodan issues seemed to have been caused by steam itself so let's revert all those changes --- nixos/hosts/shodan/configuration.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 8285aa3..32c695b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -49,8 +49,8 @@ pkiBundle = "/etc/secureboot"; }; consoleLogLevel = 0; - # kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; - # plymouth.enable = true; + kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; + plymouth.enable = true; }; zramSwap.enable = false; networking = { @@ -142,11 +142,11 @@ decky-loader efitools jq - # noto-fonts - # noto-fonts-emoji-blob-bin - # noto-fonts-emoji + noto-fonts + noto-fonts-emoji-blob-bin + noto-fonts-emoji qjackctl - # jellyfin-media-player + jellyfin-media-player #rustdesk sbctl @@ -186,11 +186,11 @@ user = "lillian"; desktopSession = "plasma"; }; - # decky-loader = { - # enable = true; - # package = pkgs.decky-loader-prerelease; - # extraPackages = [pkgs.python3]; - # }; + decky-loader = { + enable = true; + package = pkgs.decky-loader-prerelease; + extraPackages = [pkgs.python3]; + }; devices.steamdeck = { enable = true; autoUpdate = true; @@ -205,7 +205,7 @@ enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - # extest.enable = true; + extest.enable = true; }; kdeconnect.enable = true; From aca3039f1a7a292eb9940ef2696eac12cd8a9d03 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 15 Apr 2025 13:33:02 +0200 Subject: [PATCH 022/204] add brightness decrease/increase with keyboard volume and ctrl --- home-manager/desktop/package-configs/plasma-desktop.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 870d2ac..f8ad235 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -218,12 +218,12 @@ "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = ["Monitor Brightness Down" "Ctrl+Volume Down"]; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = ["Monitor Brightness Down" "Ctrl+Shift+Volume Down"]; "org_kde_powerdevil"."Hibernate" = "Hibernate"; "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = ["Monitor Brightness Up" "Ctrl+Volume Up"]; + "org_kde_powerdevil"."Increase Screen Brightness Small" = ["Shift+Monitor Brightness Up" "Ctrl+Shift+Volume Up"]; "org_kde_powerdevil"."PowerDown" = "Power Down"; "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; From af805b96252d2459bfe1cb8d57b44823f98808ed Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 15 Apr 2025 14:10:35 +0200 Subject: [PATCH 023/204] add kodi to shodan --- nixos/hosts/shodan/configuration.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 32c695b..76906b4 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -177,6 +177,29 @@ protontricks rare lutris + + (kodi.withPackages (kodiPkgs: + with kodiPkgs; [ + steam-controller + invidious + youtube + netflix + upnext + sponsorblock + sendtokodi + jellyfin + inputstream-adaptive + inputstreamhelper + inputstream-ffmpegdirect + upnext + sponsorblock + sendtokodi + routing + requests-cache + requests + plugin-cache + a4ksubtitles + ])) ]; jovian = { From 98d0e7a25ffe11639c16d2cc8a5f292d45118409 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 15 Apr 2025 15:19:32 +0200 Subject: [PATCH 024/204] see if default audio fixes my issues with it on shodan --- nixos/hosts/shodan/configuration.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 76906b4..44f1098 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -115,12 +115,12 @@ # Enable fwupd daemon and user space client fwupd.enable = true; - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; + # pipewire = { + # enable = true; + # alsa.enable = true; + # alsa.support32Bit = true; + # pulse.enable = true; + # }; }; nixpkgs = { From b6b44ad60e63bf505ebcd18a96ae5533921cbcff Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 25 Apr 2025 16:53:47 +0200 Subject: [PATCH 025/204] update flake lock, fix changed settings for eg zsh, and finally fix stylix --- flake.lock | 180 +++++++++--------- home-manager/desktop/default.nix | 2 +- .../desktop/package-configs/firefox.nix | 1 + .../package-configs/plasma-desktop.nix | 54 +++--- home-manager/hosts/shodan/lillian.nix | 2 +- home-manager/shared/shell/zsh.nix | 2 +- nixos/shared/default.nix | 106 +++++------ 7 files changed, 174 insertions(+), 173 deletions(-) diff --git a/flake.lock b/flake.lock index 06968fd..9088797 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1745523430, + "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744593024, - "narHash": "sha256-3hr5l47W4R9O6NDNqnEpIpqcBkOstx/Hoix9WJJ8YxQ=", + "lastModified": 1745323559, + "narHash": "sha256-j9p2id8B9kYEy9VYrXDV63iqbL5oSOKgartrOI6qhzE=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "c9ee6467183b224b40ca437fd23eeabe0ae6a158", + "rev": "2d61df87876ddf4bd4980f9b3bc9f8a5de02e982", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744447794, - "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=", + "lastModified": 1745571143, + "narHash": "sha256-BndQEgBtQh6kPC+2PYdf9iWTSmrbaPjTFkVei2OtuKk=", "owner": "catppuccin", "repo": "nix", - "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42", + "rev": "19919d666ead54e97f7886813db08f76ae0981dc", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "crane_4": { "locked": { - "lastModified": 1741148495, - "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", "owner": "ipetkov", "repo": "crane", - "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1745502102, + "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", "type": "github" }, "original": { @@ -419,11 +419,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": { @@ -618,11 +618,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1744618730, - "narHash": "sha256-n3gN7aHwVRnnBZI64EDoKyJnWidNYJ0xezhqQtdjH2Q=", + "lastModified": 1745555634, + "narHash": "sha256-lhVyVn1utb2UVTbyKJ6mfKB7wLTjrj14OlebvO0WU2s=", "owner": "nix-community", "repo": "home-manager", - "rev": "85dd758c703ffbf9d97f34adcef3a898b54b4014", + "rev": "98f4fef7fd7b4a77245db12e33616023162bc6d9", "type": "github" }, "original": { @@ -913,11 +913,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1745439012, + "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8", "type": "github" }, "original": { @@ -932,11 +932,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1744436521, - "narHash": "sha256-3Q3+H8YeuRRGXZqL0FgWAcPg2bX416M6NX/VpLGRw+c=", + "lastModified": 1745487384, + "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1dd888cc60079910fba27eb43b959b633e3b466c", + "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148", "type": "github" }, "original": { @@ -955,11 +955,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1741442524, - "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", + "lastModified": 1745271491, + "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", + "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ ] }, "locked": { - "lastModified": 1744518957, - "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", + "lastModified": 1745120797, + "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", + "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -1197,11 +1197,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -1228,11 +1228,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1744632434, - "narHash": "sha256-s4H8cFLNMs5ohRC46kS6DIptarUttiNbpGBG5R9/IBk=", + "lastModified": 1745582947, + "narHash": "sha256-Lw7VLYdOldSFE8ujVuffSeJZ7lvRgr2opA3MlhRvli8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb777966eb979e6798888d740f8e856dd5c2b312", + "rev": "acd6de32b94ba222f49c34d9db57a32b7da8e9c7", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -1291,11 +1291,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -1403,11 +1403,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -1419,11 +1419,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1741241576, - "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=", + "lastModified": 1741516043, + "narHash": "sha256-Hv0S630U4GVZBM1Q+NCEwyN5ct7cic+8r6qLIaUaVqI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee", + "rev": "8adda98a4e637d0d8a867f19ace5ed6680ecc94a", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1745459908, + "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", "type": "github" }, "original": { @@ -1523,11 +1523,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -1623,11 +1623,11 @@ ] }, "locked": { - "lastModified": 1741228283, - "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", + "lastModified": 1741573199, + "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", + "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", "type": "github" }, "original": { @@ -1665,11 +1665,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1744611752, - "narHash": "sha256-5Qm/pHxs8Og1GAxc2gNgc3Em28UPR7R7IYqiaHvZ+8M=", + "lastModified": 1745416927, + "narHash": "sha256-jg725STLRgsIAgrvjbRJQEP0F0w+rmvDJ64EN65p6EI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "7bdf5003c730650cd9f57a3f8beaa5a435c53b2a", + "rev": "ab52efd622a9f7dca269a49edbbea6b6b7294f57", "type": "gitlab" }, "original": { @@ -1684,11 +1684,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1744518500, - "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -1719,11 +1719,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744572782, - "narHash": "sha256-CFNluxLqxmDPQYxi37nBd4wrpB0lI4Os8nRA7UWAJK0=", + "lastModified": 1745577420, + "narHash": "sha256-gSuONtA2iSFpzvc7Gu5woDyjnu55YhDJt6cSt/f6Elk=", "owner": "danth", "repo": "stylix", - "rev": "042db377bccc99b1a724b076c89ba803e411d889", + "rev": "2dc32d8bf0239ed025971853a1b6ad9ebddd93ba", "type": "github" }, "original": { @@ -1829,11 +1829,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": { @@ -1845,11 +1845,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": { @@ -1925,11 +1925,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1743838985, - "narHash": "sha256-7fmg1fPEJWdCrw2QsanIAA0TT10IvUImZyWbvoSPebA=", + "lastModified": 1745230073, + "narHash": "sha256-OER99U7MiqQ47myvbsiljsax7OsK19NMds4NBM9XXLs=", "owner": "dj95", "repo": "zjstatus", - "rev": "d27f0819903b5f31d527affa875c71cb5c2a8578", + "rev": "a819e3bfe6bfef0438d811cdbb1bcfdc29912c62", "type": "github" }, "original": { diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 2f83b66..e1e7b39 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -175,7 +175,7 @@ fzf nextcloud-client nitrokey-app - protonvpn-gui + # protonvpn-gui virtualbox #watchmate qbittorrent diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 7184a64..bff6738 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + stylix.targets.firefox.profileNames = ["lillian"]; programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index f8ad235..695d895 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -13,33 +13,33 @@ programs.plasma = { enable = true; desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; - # kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; - # fonts = { - # fixedWidth = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.monospace.name}"; - # }; - # general = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.serif.name}"; - # }; - # menu = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # small = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # toolbar = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # windowTitle = { - # pointSize = 11; - # family = "${osConfig.stylix.fonts.sansSerif.name}"; - # }; - # }; + kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; + fonts = { + fixedWidth = { + pointSize = 11; + family = "${osConfig.stylix.fonts.monospace.name}"; + }; + general = { + pointSize = 11; + family = "${osConfig.stylix.fonts.serif.name}"; + }; + menu = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + small = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + toolbar = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + windowTitle = { + pointSize = 11; + family = "${osConfig.stylix.fonts.sansSerif.name}"; + }; + }; panels = [ { alignment = "left"; diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 3ea8fa4..38c0d3f 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -67,7 +67,7 @@ fzf nextcloud-client nitrokey-app - protonvpn-gui + # protonvpn-gui sops #watchmate qbittorrent diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index c6cd56c..7579669 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -61,7 +61,7 @@ ]; }; # Extra commands that take more complex forms - initExtra = '' + initContent = '' eval "$(zoxide init --cmd cd zsh)" tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } zhx() { command zellij action new-tab --layout $HOME/.config/zellij/layouts/helix.kdl; } diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 5a5e04c..81c302b 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -87,57 +87,57 @@ enableBrowserSocket = true; }; - # stylix = { - # enable = true; - # # targets.qt.platform = "kde6"; - # autoEnable = true; - # base16Scheme = { - # scheme = "Catppuccin Macchiato"; - # author = "https://github.com/catppuccin/catppuccin"; - # base00 = "24273a"; - # base01 = "1e2030"; - # base02 = "363a4f"; - # base03 = "494d64"; - # base04 = "5b6078"; - # base05 = "cad3f5"; - # base06 = "f4dbd6"; - # base07 = "b7bdf8"; - # base08 = "ed8796"; - # base09 = "f5a97f"; - # base0A = "eed49f"; - # base0B = "a6da95"; - # base0C = "8bd5ca"; - # base0D = "8aadf4"; - # base0E = "c6a0f6"; - # base0F = "f0c6c6"; - # }; - # image = ./background.jpg; - # cursor.package = pkgs.catppuccin-cursors.macchiatoMauve; - # cursor.name = "catppuccin-macchiato-mauve-cursors"; - # cursor.size = 16; - # homeManagerIntegration.followSystem = true; - # fonts = { - # serif = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Serif"; - # }; + stylix = { + enable = true; + # targets.qt.platform = "kde6"; + autoEnable = true; + base16Scheme = { + scheme = "Catppuccin Macchiato"; + author = "https://github.com/catppuccin/catppuccin"; + base00 = "24273a"; + base01 = "1e2030"; + base02 = "363a4f"; + base03 = "494d64"; + base04 = "5b6078"; + base05 = "cad3f5"; + base06 = "f4dbd6"; + base07 = "b7bdf8"; + base08 = "ed8796"; + base09 = "f5a97f"; + base0A = "eed49f"; + base0B = "a6da95"; + base0C = "8bd5ca"; + base0D = "8aadf4"; + base0E = "c6a0f6"; + base0F = "f0c6c6"; + }; + image = ./background.jpg; + cursor.package = pkgs.catppuccin-cursors.macchiatoMauve; + cursor.name = "catppuccin-macchiato-mauve-cursors"; + cursor.size = 16; + homeManagerIntegration.followSystem = true; + fonts = { + serif = { + package = pkgs.atkinson-hyperlegible; + name = "Atkinson Hyperlegible"; + }; - # monospace = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Sans Mono"; - # }; + monospace = { + package = pkgs.atkinson-monolegible; + name = "Atkinson Monolegible"; + }; - # sansSerif = { - # package = pkgs.dejavu_fonts; - # name = "DejaVu Sans"; - # }; + sansSerif = { + package = pkgs.atkinson-hyperlegible; + name = "Atkinson Hyperlegible"; + }; - # emoji = { - # package = pkgs.noto-fonts-emoji-blob-bin; - # name = "Blobmoji"; - # }; - # }; - # }; + emoji = { + package = pkgs.noto-fonts-emoji-blob-bin; + name = "Blobmoji"; + }; + }; + }; fonts.packages = [ pkgs.atkinson-hyperlegible @@ -146,11 +146,11 @@ pkgs.nerd-fonts.fira-mono ]; - fonts.fontconfig.defaultFonts = { - emoji = ["Blobmoji"]; - monospace = ["Atkinson Monolegible"]; - sansSerif = ["Atkinson Hyperlegible"]; - }; + # fonts.fontconfig.defaultFonts = { + # emoji = ["Blobmoji"]; + # monospace = ["Atkinson Monolegible"]; + # sansSerif = ["Atkinson Hyperlegible"]; + # }; networking = if config.services.vpn-ip.enable From 354f3fa14ff05b576f6b40ec2ef4de0c7f1741fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 27 Apr 2025 23:04:41 +0200 Subject: [PATCH 026/204] make the cursor bigger 16>24 --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 81c302b..132d5b4 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -114,7 +114,7 @@ image = ./background.jpg; cursor.package = pkgs.catppuccin-cursors.macchiatoMauve; cursor.name = "catppuccin-macchiato-mauve-cursors"; - cursor.size = 16; + cursor.size = 24; homeManagerIntegration.followSystem = true; fonts = { serif = { From 89fd94959dce6269f938786dfc0f800fed5dc1ee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 2 May 2025 16:09:34 +0200 Subject: [PATCH 027/204] update flake lock --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 9088797..2bb64b0 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745323559, - "narHash": "sha256-j9p2id8B9kYEy9VYrXDV63iqbL5oSOKgartrOI6qhzE=", + "lastModified": 1745963817, + "narHash": "sha256-8lS2/aFUSoPXOUuvvy6Xb+bt07vsIm4twobBdjigFFI=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "2d61df87876ddf4bd4980f9b3bc9f8a5de02e982", + "rev": "4013ed4dfb85afd0b73ef1c389d74aa7e6233051", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745571143, - "narHash": "sha256-BndQEgBtQh6kPC+2PYdf9iWTSmrbaPjTFkVei2OtuKk=", + "lastModified": 1746175539, + "narHash": "sha256-/wjcn1CDQqOhwOoYKS8Xp0KejrdXSJZQMF1CbbrVtMw=", "owner": "catppuccin", "repo": "nix", - "rev": "19919d666ead54e97f7886813db08f76ae0981dc", + "rev": "a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1745502102, - "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", + "lastModified": 1745812220, + "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", "owner": "nix-community", "repo": "disko", - "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", + "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1745555634, - "narHash": "sha256-lhVyVn1utb2UVTbyKJ6mfKB7wLTjrj14OlebvO0WU2s=", + "lastModified": 1746193516, + "narHash": "sha256-7KqthzbP7LbJpo6DtxlTg2Fqcs7HL1iV1vd1mM8q/u0=", "owner": "nix-community", "repo": "home-manager", - "rev": "98f4fef7fd7b4a77245db12e33616023162bc6d9", + "rev": "355a6b937d07a95cb0b753ef513bcaad09128dea", "type": "github" }, "original": { @@ -913,11 +913,11 @@ ] }, "locked": { - "lastModified": 1745439012, - "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=", + "lastModified": 1746040799, + "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8", + "rev": "5f217e5a319f6c186283b530f8c975e66c028433", "type": "github" }, "original": { @@ -932,11 +932,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1745487384, - "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=", + "lastModified": 1746158343, + "narHash": "sha256-i/1os9oEq0m/Da4FTdSqKUdI4+wzrvoDTuk1/dHSVDc=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148", + "rev": "8b45a8efb2829adf2996b51965ada1e4620631ac", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ ] }, "locked": { - "lastModified": 1745120797, - "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", + "lastModified": 1746054057, + "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", + "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745503349, - "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -1228,11 +1228,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1745582947, - "narHash": "sha256-Lw7VLYdOldSFE8ujVuffSeJZ7lvRgr2opA3MlhRvli8=", + "lastModified": 1746194699, + "narHash": "sha256-XONo9xGd3zGt/iHmIDZ+Uj/FZxRRFmrDrIFqYtzoPnM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "acd6de32b94ba222f49c34d9db57a32b7da8e9c7", + "rev": "d66115b18ccf2fbb03da4f2ea8a41499eb8d3136", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1745459908, - "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -1719,11 +1719,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1745577420, - "narHash": "sha256-gSuONtA2iSFpzvc7Gu5woDyjnu55YhDJt6cSt/f6Elk=", + "lastModified": 1746158690, + "narHash": "sha256-Pe2emz36QL8GOILXvvmH/agqkspZFrcOrQxv6uufaEc=", "owner": "danth", "repo": "stylix", - "rev": "2dc32d8bf0239ed025971853a1b6ad9ebddd93ba", + "rev": "bc38629511dd9cc78c5ca37a6e546fa66330d50e", "type": "github" }, "original": { From 69f43fb9437e4587a96bcd6b6f5132e4152c3506 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 3 May 2025 14:24:37 +0200 Subject: [PATCH 028/204] set catpuccin stuff to on, add a todo for tuwunel, remove matrix-conduit package --- nixos/hosts/queen/configuration.nix | 2 +- nixos/server/package-configs/conduit/default.nix | 1 + nixos/shared/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1f643b8..1aabb0e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -55,7 +55,6 @@ environment.systemPackages = with pkgs; [ fzf - matrix-conduit docker docker-compose gitea @@ -86,6 +85,7 @@ youtube-dl sqlite rocksdb + janus-gateway ]; services.vpn-ip = { enable = false; diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index f8bcf35..3a5a98f 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -28,6 +28,7 @@ } } ''; + # TODO: replace conduwuit with tuwunnel in { # Configure Conduit itself services.conduit = { diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 132d5b4..5e5bea7 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -70,8 +70,8 @@ catppuccin = { flavor = "macchiato"; tty.enable = true; - # sddm.enable = true; - # sddm.flavor = "macchiato"; + sddm.enable = true; + sddm.flavor = "macchiato"; forgejo.enable = true; forgejo.flavor = "macchiato"; # plymouth.enable = false; From 039310ddd6c344f14473b47bfda62bdcc741af6e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 May 2025 12:28:01 +0200 Subject: [PATCH 029/204] enable comma at the shared flake level --- flake.nix | 1 + nixos/desktop/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 1344852..aa3b462 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,7 @@ catppuccin.nixosModules.catppuccin stylix.nixosModules.stylix nix-index-database.nixosModules.nix-index + {programs.nix-index-database.comma.enable = true;} { home-manager.sharedModules = [ catppuccin.homeModules.catppuccin diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 50f1252..ac4febd 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -106,8 +106,8 @@ programs = { # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently command-not-found.enable = lib.mkForce false; - nix-index.enable = true; - nix-index-database.comma.enable = true; + # nix-index.enable = true; + # nix-index-database.comma.enable = true; direnv = { enable = true; From 619f020dc045ddae0794d89583049ee95608be25 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 May 2025 12:51:11 +0200 Subject: [PATCH 030/204] set ssh pub keys correctly --- home-manager/hosts/queen/id_ed25519.pub | 2 +- home-manager/hosts/shodan/id_ed25519.pub | 2 +- home-manager/hosts/wheatley/id_ed25519.pub | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/hosts/queen/id_ed25519.pub b/home-manager/hosts/queen/id_ed25519.pub index d06bc9c..bf8d43c 100644 --- a/home-manager/hosts/queen/id_ed25519.pub +++ b/home-manager/hosts/queen/id_ed25519.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINl+QRyKBYm+sx0hUiD2u6FBdT7aXsZBGUxm4cb7r24k lillian@GLaDOS +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGtwcWXnwOOI8G3NqAMfTeuSuDk9ly5xqwQDH2Iey3u+ lillian@queen diff --git a/home-manager/hosts/shodan/id_ed25519.pub b/home-manager/hosts/shodan/id_ed25519.pub index c5065c3..2f2ee8f 100644 --- a/home-manager/hosts/shodan/id_ed25519.pub +++ b/home-manager/hosts/shodan/id_ed25519.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRT5MqPrYUhhD5rJFp0PQbkTRtGcNaCaTxEkZw9RiVT lillian@GLaDOS +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL279XPFj1nzLDozFclntPh8rOcn3d1B5iJNGds9Ray6 lillian@shodan diff --git a/home-manager/hosts/wheatley/id_ed25519.pub b/home-manager/hosts/wheatley/id_ed25519.pub index 0c84515..dbfe237 100644 --- a/home-manager/hosts/wheatley/id_ed25519.pub +++ b/home-manager/hosts/wheatley/id_ed25519.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMrmRjLF2tVkWeV7EOgUiF77Q9t+rBziRAdOPo92pyvF lillian@GLaDOS +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILxXVL6QAiMLwvUYBtXCbkHEh6ENgaEO/rkZWSPJrjLJ lillian@wheatley From 9294173af0b5bd8b2553e700207b002c8e0883e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 May 2025 15:15:01 +0200 Subject: [PATCH 031/204] ugly way to hopefully delete the gtk theme files --- flake.lock | 60 ++++++++++++++-------------- home-manager/shared/default.nix | 30 +++++++------- nixos/hosts/GLaDOS/configuration.nix | 11 ++--- nixos/shared/default.nix | 13 ++++++ 4 files changed, 64 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 2bb64b0..4547318 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745963817, - "narHash": "sha256-8lS2/aFUSoPXOUuvvy6Xb+bt07vsIm4twobBdjigFFI=", + "lastModified": 1746304023, + "narHash": "sha256-/CCABasYHrzz8w1OJ1dHVUMlnzpg2eeHfVal+6iEvyo=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "4013ed4dfb85afd0b73ef1c389d74aa7e6233051", + "rev": "6e4bda5ad5f7a43b90d9f22b8e86011e51569bf1", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1746193516, - "narHash": "sha256-7KqthzbP7LbJpo6DtxlTg2Fqcs7HL1iV1vd1mM8q/u0=", + "lastModified": 1746317522, + "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "355a6b937d07a95cb0b753ef513bcaad09128dea", + "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", "type": "github" }, "original": { @@ -913,11 +913,11 @@ ] }, "locked": { - "lastModified": 1746040799, - "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", + "lastModified": 1746317522, + "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f217e5a319f6c186283b530f8c975e66c028433", + "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ ] }, "locked": { - "lastModified": 1746054057, - "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746341346, + "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", "type": "github" }, "original": { @@ -1228,11 +1228,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1746194699, - "narHash": "sha256-XONo9xGd3zGt/iHmIDZ+Uj/FZxRRFmrDrIFqYtzoPnM=", + "lastModified": 1746356139, + "narHash": "sha256-Up5VXdT/G0i9dKBXlTUtgVJe4EJyIYe3gVuL7TYzr/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d66115b18ccf2fbb03da4f2ea8a41499eb8d3136", + "rev": "c9a5d4563732095cb0dd2f335210bc8a650abed6", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -1435,11 +1435,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -1665,11 +1665,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1745416927, - "narHash": "sha256-jg725STLRgsIAgrvjbRJQEP0F0w+rmvDJ64EN65p6EI=", + "lastModified": 1746220417, + "narHash": "sha256-cN2Vf/d9KKy3V6eJIoxYHD7X0HQHfgP+lMnj3AdbsEc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ab52efd622a9f7dca269a49edbbea6b6b7294f57", + "rev": "95e2de368fe76ec0675b3d380168c5ca1c1b955d", "type": "gitlab" }, "original": { @@ -1719,11 +1719,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746158690, - "narHash": "sha256-Pe2emz36QL8GOILXvvmH/agqkspZFrcOrQxv6uufaEc=", + "lastModified": 1746331108, + "narHash": "sha256-iaBTiEmpjbIzEtGPXJguhqFyeeF50N3bu7HAusORR1c=", "owner": "danth", "repo": "stylix", - "rev": "bc38629511dd9cc78c5ca37a6e546fa66330d50e", + "rev": "b631dffa61e04b6d13ef6f1d86020e1e7df4153e", "type": "github" }, "original": { diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index e769ee2..5889b96 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -1,7 +1,6 @@ { pkgs, osConfig, - lib, ... }: { imports = [ @@ -13,6 +12,7 @@ ./shell/eza.nix ./shell/hyfetch.nix ]; + home = { username = "lillian"; homeDirectory = "/home/lillian"; @@ -21,6 +21,20 @@ target = ".ssh/id_ed25519.pub"; force = true; }; + + packages = with pkgs; [ + # System tools: + vscode-langservers-extracted + sops + zsh + bat + btop + broot + lazygit + navi + nil + gh + ]; }; catppuccin = { @@ -31,20 +45,6 @@ freetube.enable = true; freetube.flavor = "macchiato"; }; - - home.packages = with pkgs; [ - # System tools: - vscode-langservers-extracted - sops - zsh - bat - btop - broot - lazygit - navi - nil - gh - ]; programs = { navi.enable = true; yazi = { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index ef21414..f225830 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -85,14 +85,15 @@ }; hardware.has.amd.gpu = true; }; - boot = { loader.systemd-boot.enable = false; - }; - boot.lanzaboote = { - enable = true; - pkiBundle = "/var/lib/sbctl"; + binfmt.emulatedSystems = ["aarch64-linux"]; + + lanzaboote = { + enable = true; + pkiBundle = "/var/lib/sbctl"; + }; }; users.users.lillian.extraGroups = ["gamemode"]; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 5e5bea7..7e0579a 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -67,6 +67,19 @@ ]; }; }; + + #TODO: ugly hardcoded delete, if it ever becomes a problem fix this, else just leave it I guess + system.userActivationScripts = { + removeConflictingFiles = { + text = '' + rm -f /home/lillian/.config/gtk-3.0/settings.ini + rm -f /home/lillian/.config/gtk-3.0/gtk.css + rm -f /home/lillian/.config/gtk-4.0/settings.ini + rm -f /home/lillian/.config/gtk-4.0/gtk.css + ''; + }; + }; + catppuccin = { flavor = "macchiato"; tty.enable = true; From 63e74350fb543d1cb7120780d7493f7dd00272ab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 4 May 2025 15:22:59 +0200 Subject: [PATCH 032/204] delete the backup instead --- nixos/shared/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 7e0579a..d05e020 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -72,10 +72,10 @@ system.userActivationScripts = { removeConflictingFiles = { text = '' - rm -f /home/lillian/.config/gtk-3.0/settings.ini - rm -f /home/lillian/.config/gtk-3.0/gtk.css - rm -f /home/lillian/.config/gtk-4.0/settings.ini - rm -f /home/lillian/.config/gtk-4.0/gtk.css + rm -f /home/lillian/.config/gtk-3.0/settings.ini.backup + rm -f /home/lillian/.config/gtk-3.0/gtk.css.backup + rm -f /home/lillian/.config/gtk-4.0/settings.ini.backup + rm -f /home/lillian/.config/gtk-4.0/gtk.css.backup ''; }; }; From 65032788b2ea559e652263a113f6275a40c9c0a0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 24 May 2025 03:20:31 +0200 Subject: [PATCH 033/204] added nom for the build (sudo prompt won't show up but password input still works) --- flake.lock | 355 ++++++++++-------- flake.nix | 18 +- justfile | 6 +- .../package-configs/conduit/default.nix | 9 +- nixos/shared/default.nix | 10 +- pkgs/rebuild-no-inhibit/default.nix | 10 +- 6 files changed, 231 insertions(+), 177 deletions(-) diff --git a/flake.lock b/flake.lock index 4547318..be20053 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746304023, - "narHash": "sha256-/CCABasYHrzz8w1OJ1dHVUMlnzpg2eeHfVal+6iEvyo=", + "lastModified": 1747878064, + "narHash": "sha256-mmVlGlSW/c7EY7kGzpIEB5mGedNnr3LU1o3M7dOcT0o=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "6e4bda5ad5f7a43b90d9f22b8e86011e51569bf1", + "rev": "fa0a54c45c44e8ff3885ccc72a43fd2d96e01b14", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1746175539, - "narHash": "sha256-/wjcn1CDQqOhwOoYKS8Xp0KejrdXSJZQMF1CbbrVtMw=", + "lastModified": 1747989804, + "narHash": "sha256-FACXQA+OH5jHx/MZIJoGNxg5H5XolsxOMmBLMWUCIQs=", "owner": "catppuccin", "repo": "nix", - "rev": "a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04", + "rev": "21e495cba91b63e8897d1a00155d58787d0e6e18", "type": "github" }, "original": { @@ -237,23 +237,19 @@ "flake-utils": "flake-utils", "liburing": "liburing", "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_6", "rocksdb": "rocksdb" }, "locked": { "lastModified": 1744169934, "narHash": "sha256-5YyHmPUUrXXrczWayji9327knihVTKnmjX+vX6+p6d0=", - "owner": "girlbossceo", - "repo": "conduwuit", + "path": "/nix/store/bh47b0x5bcyni1mj6x92ddax8b4qh083-source", "rev": "d8311a5ff672fdc4729d956af5e3af8646b0670d", - "type": "github" + "type": "path" }, "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" + "id": "conduwuit", + "type": "indirect" } }, "crane": { @@ -311,11 +307,11 @@ }, "crane_4": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -380,11 +376,11 @@ ] }, "locked": { - "lastModified": 1745812220, - "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -516,11 +512,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -618,11 +614,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -635,7 +631,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -691,27 +686,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -777,10 +751,36 @@ "git-hooks_2": { "inputs": { "flake-compat": [ - "stylix", + "simple-nixos-mailserver", "flake-compat" ], "gitignore": "gitignore_3", + "nixpkgs": [ + "simple-nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_3": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_4", "nixpkgs": [ "stylix", "nixpkgs" @@ -846,6 +846,28 @@ } }, "gitignore_3": { + "inputs": { + "nixpkgs": [ + "simple-nixos-mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_4": { "inputs": { "nixpkgs": [ "stylix", @@ -870,16 +892,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" } @@ -891,11 +913,11 @@ ] }, "locked": { - "lastModified": 1746317522, - "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -913,11 +935,11 @@ ] }, "locked": { - "lastModified": 1746317522, - "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=", + "lastModified": 1747763032, + "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b", + "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "type": "github" }, "original": { @@ -929,14 +951,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1746158343, - "narHash": "sha256-i/1os9oEq0m/Da4FTdSqKUdI4+wzrvoDTuk1/dHSVDc=", + "lastModified": 1747990026, + "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8b45a8efb2829adf2996b51965ada1e4620631ac", + "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00", "type": "github" }, "original": { @@ -950,16 +972,16 @@ "crane": "crane_4", "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745271491, - "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", + "lastModified": 1747056319, + "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", + "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "type": "github" }, "original": { @@ -1130,11 +1152,11 @@ ] }, "locked": { - "lastModified": 1746330942, - "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "137fd2bd726fff343874f85601b51769b48685cc", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -1166,11 +1188,11 @@ ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -1181,11 +1203,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746341346, - "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -1211,28 +1233,29 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-edge": { "locked": { - "lastModified": 1746356139, - "narHash": "sha256-Up5VXdT/G0i9dKBXlTUtgVJe4EJyIYe3gVuL7TYzr/M=", + "lastModified": 1748042033, + "narHash": "sha256-4jHW/Az7DSPnKB+R4QUnT+t7/mFABy1Ukd+BPg8ke6A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9a5d4563732095cb0dd2f335210bc8a650abed6", + "rev": "a61befb69a171c7fe6fb141fca18e40624d7f55f", "type": "github" }, "original": { @@ -1275,11 +1298,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -1290,6 +1313,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -1305,13 +1344,13 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -1321,7 +1360,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1743689281, "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", @@ -1403,11 +1442,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1740547748, + "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "3a05eebede89661660945da1f151959900903b6a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -1417,13 +1472,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1741516043, - "narHash": "sha256-Hv0S630U4GVZBM1Q+NCEwyN5ct7cic+8r6qLIaUaVqI=", + "lastModified": 1746916775, + "narHash": "sha256-TGHTAbjauY7kK8tX8HdFh0A9eXhiRIbwZH6vBHLsofc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8adda98a4e637d0d8a867f19ace5ed6680ecc94a", + "rev": "7fb53a7bf9a07f97c34910aa45388083c67751e9", "type": "github" }, "original": { @@ -1433,40 +1488,28 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "NixOS", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "nixos", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nur": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -1523,11 +1566,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -1567,7 +1610,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1623,11 +1666,11 @@ ] }, "locked": { - "lastModified": 1741573199, - "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", + "rev": "5b07506ae89b025b14de91f697eba23b48654c52", "type": "github" }, "original": { @@ -1661,15 +1704,16 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_9", - "nixpkgs-24_11": "nixpkgs-24_11" + "git-hooks": "git-hooks_2", + "nixpkgs": "nixpkgs_10", + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1746220417, - "narHash": "sha256-cN2Vf/d9KKy3V6eJIoxYHD7X0HQHfgP+lMnj3AdbsEc=", + "lastModified": 1747965231, + "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "95e2de368fe76ec0675b3d380168c5ca1c1b955d", + "rev": "53007af63fade28853408370c4c600a63dd97f41", "type": "gitlab" }, "original": { @@ -1681,14 +1725,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -1705,11 +1749,11 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_3", - "git-hooks": "git-hooks_2", + "flake-parts": "flake-parts_5", + "git-hooks": "git-hooks_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nur": "nur", "systems": "systems_3", "tinted-foot": "tinted-foot", @@ -1719,11 +1763,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746331108, - "narHash": "sha256-iaBTiEmpjbIzEtGPXJguhqFyeeF50N3bu7HAusORR1c=", + "lastModified": 1748028561, + "narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=", "owner": "danth", "repo": "stylix", - "rev": "b631dffa61e04b6d13ef6f1d86020e1e7df4153e", + "rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff", "type": "github" }, "original": { @@ -1812,17 +1856,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" } }, @@ -1920,8 +1963,8 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_12", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_13", "rust-overlay": "rust-overlay_3" }, "locked": { diff --git a/flake.nix b/flake.nix index aa3b462..1be4bcc 100644 --- a/flake.nix +++ b/flake.nix @@ -33,11 +33,7 @@ # catpuccin theme catppuccin.url = "github:catppuccin/nix"; - # Conduit fork without all the fuss and drama - conduwuit = { - url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # Conduwuit fork after it shut down # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -103,6 +99,12 @@ stylix, ... } @ inputs: let + supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; + forEachSupportedSystem = f: + nixpkgs.lib.genAttrs supportedSystems (system: + f { + pkgs = import nixpkgs {inherit system;}; + }); inherit (self) outputs; inherit (inputs) nixpkgs-edge; # Supported systems for your flake packages, shell, etc. @@ -149,6 +151,12 @@ } ]; in { + devShells = forEachSupportedSystem ({pkgs}: { + default = pkgs.mkShell { + packages = with pkgs; [nom just git]; + }; + }); + # Your custom packages # Accessible through 'nix build', 'nix shell', etc packages = forAllSystems (system: diff --git a/justfile b/justfile index 3dbeb05..fea1c70 100644 --- a/justfile +++ b/justfile @@ -1,14 +1,14 @@ build: - sudo nixos-rebuild switch --flake .# --show-trace + sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json && zsh run: nix-repl -f flake:nixpkgs test: - sudo nix flake check --show-trace + sudo nix flake check --show-trace --log-format internal-json -v |& nom --json && zsh update: - nix flake update + nix flake update --log-format internal-json -v |& nom --json && zsh clean: sudo nix-collect-garbage diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 3a5a98f..17424c4 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -1,6 +1,5 @@ { config, - inputs, pkgs, ... }: let @@ -28,17 +27,11 @@ } } ''; - # TODO: replace conduwuit with tuwunnel in { # Configure Conduit itself - services.conduit = { + services.matrix-continuwuity = { enable = true; - # This causes NixOS to use the flake defined in this repository instead of - # the build of Conduit built into nixpkgs. - package = inputs.conduwuit.packages.${pkgs.system}.default; - # package = pkgs.conduwuit; - settings.global = { inherit server_name; allow_registration = false; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index d05e020..4978ed4 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -190,8 +190,14 @@ } else {}; - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; + environment = { + systemPackages = with pkgs; [ + nix-output-monitor + ]; + + # Enable completion of system packages by zsh + pathsToLink = ["/share/zsh"]; + }; home-manager = { backupFileExtension = "backup"; diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index e4bd280..8593023 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -1,9 +1,13 @@ -{writeShellApplication}: +{ + writeShellApplication, + nom, + just, +}: writeShellApplication { name = "rebuild-no-inhibit"; - runtimeInputs = []; + runtimeInputs = [nom just]; text = '' # A rebuild script for NixOS @@ -14,7 +18,7 @@ writeShellApplication git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - sudo nixos-rebuild switch --flake .# + just build popd > /dev/null echo "Cleaning up repository in '/tmp/rebuild'..." rm -rf ./rebuild From d7e685f7a391ea4196af08315523d7aabe3fa848 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 15:58:27 +0200 Subject: [PATCH 034/204] remove some programs I might not need on queen and add a sudo check to the justfile --- justfile | 4 ++-- nixos/hosts/queen/configuration.nix | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/justfile b/justfile index fea1c70..525d7a3 100644 --- a/justfile +++ b/justfile @@ -1,11 +1,11 @@ build: - sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json && zsh + sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json && zsh run: nix-repl -f flake:nixpkgs test: - sudo nix flake check --show-trace --log-format internal-json -v |& nom --json && zsh + sudo echo "sudo check..." && sudo nix flake check --show-trace --log-format internal-json -v |& nom --json && zsh update: nix flake update --log-format internal-json -v |& nom --json && zsh diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 1aabb0e..10ff532 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -70,7 +70,6 @@ nginx onlyoffice-documentserver openssl - phanpy postgresql_16 python310 # python310Packages.nbconvert @@ -84,8 +83,6 @@ roundcubePlugins.thunderbird_labels youtube-dl sqlite - rocksdb - janus-gateway ]; services.vpn-ip = { enable = false; From 176cc548a3d7259082eb4cb964fdb072121fd7c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 16:05:07 +0200 Subject: [PATCH 035/204] update flake lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index be20053..35affaa 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747878064, - "narHash": "sha256-mmVlGlSW/c7EY7kGzpIEB5mGedNnr3LU1o3M7dOcT0o=", + "lastModified": 1748210385, + "narHash": "sha256-kGicDnV0l1D2TtBbLBwoiZq7xTlON2nq10GAhnGL3mY=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "fa0a54c45c44e8ff3885ccc72a43fd2d96e01b14", + "rev": "6cb4160e0c1de2562b40f30206f80f96303c1ee8", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747989804, - "narHash": "sha256-FACXQA+OH5jHx/MZIJoGNxg5H5XolsxOMmBLMWUCIQs=", + "lastModified": 1748080874, + "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", "owner": "catppuccin", "repo": "nix", - "rev": "21e495cba91b63e8897d1a00155d58787d0e6e18", + "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -913,11 +913,11 @@ ] }, "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -1152,11 +1152,11 @@ ] }, "locked": { - "lastModified": 1747540584, - "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", + "lastModified": 1748145500, + "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", + "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", "type": "github" }, "original": { @@ -1251,11 +1251,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1748042033, - "narHash": "sha256-4jHW/Az7DSPnKB+R4QUnT+t7/mFABy1Ukd+BPg8ke6A=", + "lastModified": 1748267578, + "narHash": "sha256-AIk8u+A93MSXmBugtK9qdpif80/wMhfEOa+0bvHN6Rw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a61befb69a171c7fe6fb141fca18e40624d7f55f", + "rev": "e238475cdeff0b1bed370f92d01fe4829fe47fbe", "type": "github" }, "original": { @@ -1298,11 +1298,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -1490,11 +1490,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -1540,11 +1540,11 @@ ] }, "locked": { - "lastModified": 1742765550, - "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", + "lastModified": 1748196248, + "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16", + "rev": "b7697abe89967839b273a863a3805345ea54ab56", "type": "github" }, "original": { @@ -1763,11 +1763,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748028561, - "narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=", + "lastModified": 1748264079, + "narHash": "sha256-ROBuBxMUBvj3QWUIBqABzzIWCnZHapCmAdPXramjf8E=", "owner": "danth", "repo": "stylix", - "rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff", + "rev": "225b2ddbbaa4ae3c2076c1bd1616fefd35e11670", "type": "github" }, "original": { From cd7846dcd68c1361597fd55981ae2d34373a1ca8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 16:13:19 +0200 Subject: [PATCH 036/204] remove conduwuit completely --- flake.lock | 860 +++++++---------------------------------------------- flake.nix | 1 - 2 files changed, 101 insertions(+), 760 deletions(-) diff --git a/flake.lock b/flake.lock index 35affaa..74221c5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1738524606, - "narHash": "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -135,62 +111,6 @@ "type": "gitlab" } }, - "cachix": { - "inputs": { - "devenv": "devenv", - "flake-compat": "flake-compat_3", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1737621947, - "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=", - "owner": "cachix", - "repo": "cachix", - "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "master", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": [ - "conduwuit", - "cachix", - "devenv" - ], - "flake-compat": [ - "conduwuit", - "cachix", - "devenv" - ], - "git-hooks": [ - "conduwuit", - "cachix", - "devenv" - ], - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", - "owner": "cachix", - "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" @@ -209,49 +129,6 @@ "type": "github" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1741891349, - "narHash": "sha256-YvrzOWcX7DH1drp5SGa+E/fc7wN3hqFtPbqPjZpOu1Q=", - "owner": "girlbossceo", - "repo": "complement", - "rev": "e587b3df569cba411aeac7c20b6366d03c143745", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic", - "cachix": "cachix", - "complement": "complement", - "crane": "crane_3", - "fenix": "fenix", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils", - "liburing": "liburing", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_6", - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1744169934, - "narHash": "sha256-5YyHmPUUrXXrczWayji9327knihVTKnmjX+vX6+p6d0=", - "path": "/nix/store/bh47b0x5bcyni1mj6x92ddax8b4qh083-source", - "rev": "d8311a5ff672fdc4729d956af5e3af8646b0670d", - "type": "path" - }, - "original": { - "id": "conduwuit", - "type": "indirect" - } - }, "crane": { "locked": { "lastModified": 1742394900, @@ -268,44 +145,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", - "owner": "ipetkov", - "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { "locked": { "lastModified": 1746291859, "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", @@ -320,7 +159,7 @@ "type": "github" } }, - "crane_5": { + "crane_3": { "locked": { "lastModified": 1743700120, "narHash": "sha256-8BjG/P0xnuCyVOXlYRwdI1B8nVtyYLf3oDwPSimqREY=", @@ -335,40 +174,6 @@ "type": "github" } }, - "devenv": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "git-hooks": [ - "conduwuit", - "cachix", - "git-hooks" - ], - "nix": "nix", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733323168, - "narHash": "sha256-d5DwB4MZvlaQpN6OQ4SLYxb5jA4UH5EtV5t5WOtjLPU=", - "owner": "cachix", - "repo": "devenv", - "rev": "efa9010b8b1cfd5dd3c7ed1e172a470c3b84a064", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -389,29 +194,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1740724364, - "narHash": "sha256-D1jLIueJx1dPrP09ZZwTrPf4cubV+TsFMYbpYYTVj6A=", - "owner": "nix-community", - "repo": "fenix", - "rev": "edf7d9e431cda8782e729253835f178a356d3aab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -447,11 +229,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -461,55 +243,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1747046372, @@ -525,7 +258,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -541,52 +274,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "conduwuit", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -606,7 +293,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -627,7 +314,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -662,32 +349,13 @@ }, "original": { "owner": "numtide", - "ref": "main", "repo": "flake-utils", "type": "github" } }, "flake-utils_2": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -720,41 +388,12 @@ } }, "git-hooks": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "conduwuit", - "cachix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { "inputs": { "flake-compat": [ "simple-nixos-mailserver", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "nixpkgs": [ "simple-nixos-mailserver", "nixpkgs" @@ -774,13 +413,13 @@ "type": "github" } }, - "git-hooks_3": { + "git-hooks_2": { "inputs": { "flake-compat": [ "stylix", "flake-compat" ], - "gitignore": "gitignore_4", + "gitignore": "gitignore_3", "nixpkgs": [ "stylix", "nixpkgs" @@ -801,29 +440,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "cachix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -845,7 +461,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "simple-nixos-mailserver", @@ -867,7 +483,7 @@ "type": "github" } }, - "gitignore_4": { + "gitignore_3": { "inputs": { "nixpkgs": [ "stylix", @@ -950,8 +566,8 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_3", - "nixpkgs": "nixpkgs_7" + "nix-github-actions": "nix-github-actions_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1747990026, @@ -969,10 +585,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_8", + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, @@ -990,96 +606,6 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1740613216, - "narHash": "sha256-NpPOBqNND3Qe9IwqYs0mJLGTmIx7e6FgUEBAnJ+1ZLA=", - "owner": "axboe", - "repo": "liburing", - "rev": "e1003e496e66f9b0ae06674869795edf772d5500", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": [ - "conduwuit", - "cachix", - "devenv" - ], - "flake-parts": "flake-parts_2", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_4", - "nixpkgs-23-11": [ - "conduwuit", - "cachix", - "devenv" - ], - "nixpkgs-regression": [ - "conduwuit", - "cachix", - "devenv" - ], - "pre-commit-hooks": [ - "conduwuit", - "cachix", - "devenv" - ] - }, - "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1102,28 +628,6 @@ } }, "nix-github-actions_2": { - "inputs": { - "nixpkgs": [ - "conduwuit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729742964, - "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_3": { "inputs": { "nixpkgs": [ "jovian", @@ -1264,38 +768,6 @@ "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1748026106, @@ -1312,151 +784,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1726042813, - "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1740547748, - "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3a05eebede89661660945da1f151959900903b6a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1747744144, "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", @@ -1472,7 +800,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_3": { "locked": { "lastModified": 1746916775, "narHash": "sha256-TGHTAbjauY7kK8tX8HdFh0A9eXhiRIbwZH6vBHLsofc=", @@ -1488,7 +816,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_4": { "locked": { "lastModified": 1748026106, "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", @@ -1504,6 +832,70 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1743689281, + "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -1559,7 +951,7 @@ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -1579,38 +971,20 @@ "type": "github" } }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1741308171, - "narHash": "sha256-YdBvdQ75UJg5ffwNjxizpviCVwVDJnBkM8ZtGIduMgY=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "3ce04794bcfbbb0d2e6f81ae35fc4acf688b6986", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.11.1", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts_3", - "flake-utils": "flake-utils_2", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_4", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1620,23 +994,6 @@ "zjstatus": "zjstatus" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1740691488, - "narHash": "sha256-Fs6vBrByuiOf2WO77qeMDMTXcTGzrIMqLBv+lNeywwM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "fe3eda77d3a7ce212388bda7b6cec8bffcc077e5", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1703,9 +1060,9 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_6", - "git-hooks": "git-hooks_2", - "nixpkgs": "nixpkgs_10", + "flake-compat": "flake-compat_3", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_5", "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { @@ -1725,7 +1082,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1747603214, @@ -1748,14 +1105,14 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_7", - "flake-parts": "flake-parts_5", - "git-hooks": "git-hooks_3", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_7", "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1821,21 +1178,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1962,9 +1304,9 @@ }, "zjstatus": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_13", + "crane": "crane_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 1be4bcc..af26ea8 100644 --- a/flake.nix +++ b/flake.nix @@ -95,7 +95,6 @@ jovian, nixos-hardware, nix-index-database, - conduwuit, stylix, ... } @ inputs: let From b9381b91a0777eb97906a8b55dca705c7707a3cc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 16:42:46 +0200 Subject: [PATCH 037/204] enable continuwuity --- nixos/server/package-configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 25e9db5..91ff838 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -1,6 +1,6 @@ {...}: { imports = [ - # ./conduit + ./conduit ./forgejo ./gotosocial ./mail-server From 29fe3c6bd6197054a3b82c06a19c060f656d50d3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 16:48:53 +0200 Subject: [PATCH 038/204] let's try this --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index 525d7a3..60f43e4 100644 --- a/justfile +++ b/justfile @@ -1,11 +1,11 @@ build: - sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json && zsh + sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json run: nix-repl -f flake:nixpkgs test: - sudo echo "sudo check..." && sudo nix flake check --show-trace --log-format internal-json -v |& nom --json && zsh + sudo echo "sudo check..." && sudo nix flake check --show-trace --log-format internal-json -v |& nom --json update: nix flake update --log-format internal-json -v |& nom --json && zsh From 18e7258241b1f47ea3be0eace687d52494d582c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 16:51:18 +0200 Subject: [PATCH 039/204] json seems to fail on queen so let's delete it --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index 60f43e4..ae765cb 100644 --- a/justfile +++ b/justfile @@ -1,11 +1,11 @@ build: - sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json + sudo echo "sudo check..." && sudo nixos-rebuild -v switch --flake .# --show-trace |& nom run: nix-repl -f flake:nixpkgs test: - sudo echo "sudo check..." && sudo nix flake check --show-trace --log-format internal-json -v |& nom --json + sudo echo "sudo check..." && sudo nix flake check --show-trace -v |& nom update: nix flake update --log-format internal-json -v |& nom --json && zsh From 81a76efc8df892a861af517601392cb004e25e09 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 16:54:08 +0200 Subject: [PATCH 040/204] fixed the nom thing, wrong one in the rebuild script --- justfile | 4 ++-- pkgs/rebuild-no-inhibit/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/justfile b/justfile index ae765cb..60f43e4 100644 --- a/justfile +++ b/justfile @@ -1,11 +1,11 @@ build: - sudo echo "sudo check..." && sudo nixos-rebuild -v switch --flake .# --show-trace |& nom + sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json run: nix-repl -f flake:nixpkgs test: - sudo echo "sudo check..." && sudo nix flake check --show-trace -v |& nom + sudo echo "sudo check..." && sudo nix flake check --show-trace --log-format internal-json -v |& nom --json update: nix flake update --log-format internal-json -v |& nom --json && zsh diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index 8593023..ab38581 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -1,13 +1,13 @@ { writeShellApplication, - nom, + nix-output-monitor, just, }: writeShellApplication { name = "rebuild-no-inhibit"; - runtimeInputs = [nom just]; + runtimeInputs = [nix-output-monitor just]; text = '' # A rebuild script for NixOS From 785cd8fd089e652d196caa482932e72fc7fe185d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 19:00:08 +0200 Subject: [PATCH 041/204] signal-desktop desktop entry renamed to just signal --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 695d895..7331c1b 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -120,7 +120,7 @@ "applications:floorp.desktop" "applications:systemsettings.desktop" "applications:org.kde.dolphin.desktop" - "applications:signal-desktop.desktop" + "applications:signal.desktop" "applications:vesktop.desktop" "applications:thunderbird.desktop" "applications:cinny.desktop" From cd198626c7bd86ef13ddf8ab30501044ad52d849 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 26 May 2025 19:06:02 +0200 Subject: [PATCH 042/204] re-add cinny desktop now that the vuln is fixed --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index e1e7b39..686dabd 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -152,7 +152,7 @@ # Chat applications: signal-desktop vesktop - # cinny-desktop + cinny-desktop # Gaming: prismlauncher From 86f11363c0d261ea4f6e06c84d486b3705d5edbf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 27 May 2025 16:52:03 +0200 Subject: [PATCH 043/204] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 74221c5..3ff51c0 100644 --- a/flake.lock +++ b/flake.lock @@ -755,11 +755,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1748267578, - "narHash": "sha256-AIk8u+A93MSXmBugtK9qdpif80/wMhfEOa+0bvHN6Rw=", + "lastModified": 1748357078, + "narHash": "sha256-H43F25mYtaF23FEF8Jf+6KNQ6yGoX1mSLmqxKcAn5dg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e238475cdeff0b1bed370f92d01fe4829fe47fbe", + "rev": "33ceef1505f9f741e3c117e6723446eecf027a63", "type": "github" }, "original": { @@ -770,11 +770,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -818,11 +818,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -1120,11 +1120,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748264079, - "narHash": "sha256-ROBuBxMUBvj3QWUIBqABzzIWCnZHapCmAdPXramjf8E=", + "lastModified": 1748276618, + "narHash": "sha256-reC7nvUfJMaIYJb5pVOuTFbOfj/L9eo21drj+9EbrkE=", "owner": "danth", "repo": "stylix", - "rev": "225b2ddbbaa4ae3c2076c1bd1616fefd35e11670", + "rev": "1fdbf01ebe4b7838aa3d95334325ce8445625332", "type": "github" }, "original": { From 51f2c83b8cc2295215f05b49e3833eec1771edf3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 30 May 2025 23:31:32 +0200 Subject: [PATCH 044/204] add dev toolbox & update flake lock --- home-manager/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 686dabd..904ec83 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -148,6 +148,7 @@ git-credential-manager git-credential-manager ruff + devtoolbox # Chat applications: signal-desktop From c330e249b36b279bf732ec91d545bfabf8c122bd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 31 May 2025 16:19:14 +0200 Subject: [PATCH 045/204] add nom and fix gum in install command --- pkgs/install-nix-no-inhibit/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index 622170a..a1dff9e 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -1,5 +1,6 @@ { git, + nix-output-monitor, gum, writeShellApplication, }: @@ -7,7 +8,7 @@ writeShellApplication { name = "install-nix-no-inhibit"; - runtimeInputs = [git gum]; + runtimeInputs = [git gum nix-output-monitor]; text = '' # An install script for NixOS installation to /tmp @@ -36,8 +37,8 @@ writeShellApplication --mode zap_create_mount \ "./disko/''${dir}/default.nix" echo "NixOS Installing..." - sudo nixos-install --flake .#"''${dir}" - sudo nixos-install --flake .#"''${dir}" + sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json + sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." rm -rf ./install-nix From 4c3810dccf9783aba0efb9acbb6042af8f8ae9ba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 5 Jun 2025 16:33:35 +0200 Subject: [PATCH 046/204] remove bcachefs from the inputs --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index af26ea8..9382a34 100644 --- a/flake.nix +++ b/flake.nix @@ -13,11 +13,11 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - bcachefs-tools = { - url = "github:koverstreet/bcachefs-tools"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - }; + # bcachefs-tools = { + # url = "github:koverstreet/bcachefs-tools"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.flake-parts.follows = "flake-parts"; + # }; flake-parts = { url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management From 985a1eed883dfe37e18042e3e1968fb887a041d5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 8 Jun 2025 15:30:06 +0200 Subject: [PATCH 047/204] update flake lock and set mailserver stateVersion --- flake.lock | 339 ++++++------------ .../package-configs/mail-server/default.nix | 1 + 2 files changed, 109 insertions(+), 231 deletions(-) diff --git a/flake.lock b/flake.lock index 3ff51c0..07adb87 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -67,34 +67,6 @@ "type": "github" } }, - "bcachefs-tools": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": [ - "flake-parts" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1748210385, - "narHash": "sha256-kGicDnV0l1D2TtBbLBwoiZq7xTlON2nq10GAhnGL3mY=", - "owner": "koverstreet", - "repo": "bcachefs-tools", - "rev": "6cb4160e0c1de2562b40f30206f80f96303c1ee8", - "type": "github" - }, - "original": { - "owner": "koverstreet", - "repo": "bcachefs-tools", - "type": "github" - } - }, "blobs": { "flake": false, "locked": { @@ -116,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748080874, - "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", + "lastModified": 1749223974, + "narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=", "owner": "catppuccin", "repo": "nix", - "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", + "rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4", "type": "github" }, "original": { @@ -131,11 +103,11 @@ }, "crane": { "locked": { - "lastModified": 1742394900, - "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", + "lastModified": 1748047550, + "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", "owner": "ipetkov", "repo": "crane", - "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", + "rev": "b718a78696060df6280196a6f992d04c87a16aef", "type": "github" }, "original": { @@ -145,21 +117,6 @@ } }, "crane_2": { - "locked": { - "lastModified": 1746291859, - "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", - "owner": "ipetkov", - "repo": "crane", - "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { "locked": { "lastModified": 1743700120, "narHash": "sha256-8BjG/P0xnuCyVOXlYRwdI1B8nVtyYLf3oDwPSimqREY=", @@ -181,11 +138,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1749200714, + "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", "type": "github" }, "original": { @@ -197,11 +154,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -211,38 +168,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -258,13 +183,29 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_2": { + "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -280,11 +221,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -322,11 +263,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -426,11 +367,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -529,11 +470,11 @@ ] }, "locked": { - "lastModified": 1748227609, - "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", + "lastModified": 1749358668, + "narHash": "sha256-V91nN4Q9ZwX0N+Gzu+F8SnvzMcdURYnMcIvpfLQzD5M=", "owner": "nix-community", "repo": "home-manager", - "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", + "rev": "06451df423dd5e555f39857438ffc16c5b765862", "type": "github" }, "original": { @@ -551,11 +492,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -566,15 +507,15 @@ }, "jovian": { "inputs": { - "nix-github-actions": "nix-github-actions_2", + "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1747990026, - "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=", + "lastModified": 1749312278, + "narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00", + "rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", "type": "github" }, "original": { @@ -585,19 +526,19 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", + "crane": "crane", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_3", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747056319, - "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", + "lastModified": 1748959397, + "narHash": "sha256-hq+njWbMLAfQIFEP+8G/7xLz1ZELWC+780332FdpnW0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", + "rev": "20721e48123f1f900b323a76349130080a2f8343", "type": "github" }, "original": { @@ -607,27 +548,6 @@ } }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "bcachefs-tools", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737420293, - "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "jovian", @@ -656,11 +576,11 @@ ] }, "locked": { - "lastModified": 1748145500, - "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", + "lastModified": 1749355504, + "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", + "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", "type": "github" }, "original": { @@ -707,11 +627,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -755,11 +675,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1748357078, - "narHash": "sha256-H43F25mYtaF23FEF8Jf+6KNQ6yGoX1mSLmqxKcAn5dg=", + "lastModified": 1749388081, + "narHash": "sha256-/o7NAmc8TnxzMXKqpDXucCMAO88UTaC8imG2GWhaGSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33ceef1505f9f741e3c117e6723446eecf027a63", + "rev": "a70efe6be05efe8ed907dc309d8fbdc820c3f7a7", "type": "github" }, "original": { @@ -770,11 +690,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -802,11 +722,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746916775, - "narHash": "sha256-TGHTAbjauY7kK8tX8HdFh0A9eXhiRIbwZH6vBHLsofc=", + "lastModified": 1748199909, + "narHash": "sha256-sTPSlPb2quY5Mki+mEbSb2g0QF2AyhN5uD4MEaHudl4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fb53a7bf9a07f97c34910aa45388083c67751e9", + "rev": "886356e9f87a19221db51e90adb55599a1eb28e2", "type": "github" }, "original": { @@ -818,11 +738,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -866,11 +786,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -906,14 +826,14 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -958,11 +878,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -973,7 +893,6 @@ }, "root": { "inputs": { - "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", "disko": "disko", "flake-parts": "flake-parts", @@ -997,16 +916,16 @@ "rust-overlay": { "inputs": { "nixpkgs": [ - "bcachefs-tools", + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1742524367, - "narHash": "sha256-KzTwk/5ETJavJZYV1DEWdCx05M4duFCxCpRbQSKWpng=", + "lastModified": 1748227081, + "narHash": "sha256-RLnN7LBxhEdCJ6+rIL9sbhjBVDaR6jG377M/CLP/fmE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "70bf752d176b2ce07417e346d85486acea9040ef", + "rev": "1cbe817fd8c64a9f77ba4d7861a4839b0b15983e", "type": "github" }, "original": { @@ -1016,27 +935,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747017456, - "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5b07506ae89b025b14de91f697eba23b48654c52", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "zjstatus", @@ -1060,17 +958,17 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "git-hooks": "git-hooks", "nixpkgs": "nixpkgs_5", "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1747965231, - "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", + "lastModified": 1749244584, + "narHash": "sha256-BGmEptAyP2NrP4gX7VMYWo53h5e8r2iE/uo2+YPMcfo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "53007af63fade28853408370c4c600a63dd97f41", + "rev": "8b27add0883067e990bff4f847b6f7b6f53324b9", "type": "gitlab" }, "original": { @@ -1105,7 +1003,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", @@ -1120,11 +1018,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748276618, - "narHash": "sha256-reC7nvUfJMaIYJb5pVOuTFbOfj/L9eo21drj+9EbrkE=", + "lastModified": 1749385866, + "narHash": "sha256-VKwEp9apUAu6I21GTJMa6NwFVYbSJX9s67sWWrER2E0=", "owner": "danth", "repo": "stylix", - "rev": "1fdbf01ebe4b7838aa3d95334325ce8445625332", + "rev": "b3e8f15fe3b361f753a5f85587fd731d076ce821", "type": "github" }, "original": { @@ -1214,11 +1112,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -1230,11 +1128,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -1260,27 +1158,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "bcachefs-tools", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix", @@ -1304,10 +1181,10 @@ }, "zjstatus": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1745230073, diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index eabc625..2a65c9b 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -6,6 +6,7 @@ # services.dovecot2.sieve.extensions = ["fileinto"]; mailserver = { + stateVersion = 1; enable = true; enableImap = true; enableSubmission = true; From f0f4e9b1063335d2aa1331f839f492bb8ed7fdf4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 12 Jun 2025 14:48:17 +0200 Subject: [PATCH 048/204] add rust findutils --- nixos/shared/packages/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 0d4f668..d82be3b 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -28,6 +28,7 @@ age alejandra e2fsprogs + uutils-findutils git git-filter-repo pre-commit From 698897667a3c45df4d2a32e4a256729fc4f37052 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 12 Jun 2025 16:04:21 +0200 Subject: [PATCH 049/204] add flatpak to decky loader on deck --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 44f1098..f514afd 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -212,7 +212,7 @@ decky-loader = { enable = true; package = pkgs.decky-loader-prerelease; - extraPackages = [pkgs.python3]; + extraPackages = [pkgs.python3 pkgs.flatpak]; }; devices.steamdeck = { enable = true; From 3928eee4ca8b48812ec3e55d107df14d61479b31 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 12 Jun 2025 16:13:27 +0200 Subject: [PATCH 050/204] add findutils to decky too --- nixos/hosts/shodan/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f514afd..51260f0 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -212,7 +212,7 @@ decky-loader = { enable = true; package = pkgs.decky-loader-prerelease; - extraPackages = [pkgs.python3 pkgs.flatpak]; + extraPackages = [pkgs.python3 pkgs.flatpak pkgs.uutils-findutils]; }; devices.steamdeck = { enable = true; From bb616b83f24d94777b80381208fb49e23c56fda2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 14 Jun 2025 12:21:12 +0200 Subject: [PATCH 051/204] update flake lock --- flake.lock | 138 ++++++++++++++++++++++++++--------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 07adb87..9649987 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ }, "crane": { "locked": { - "lastModified": 1748047550, - "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", + "lastModified": 1748970125, + "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", "owner": "ipetkov", "repo": "crane", - "rev": "b718a78696060df6280196a6f992d04c87a16aef", + "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "crane_2": { "locked": { - "lastModified": 1743700120, - "narHash": "sha256-8BjG/P0xnuCyVOXlYRwdI1B8nVtyYLf3oDwPSimqREY=", + "lastModified": 1748970125, + "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", "owner": "ipetkov", "repo": "crane", - "rev": "e316f19ee058e6db50075115783be57ac549c389", + "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1749200714, - "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", + "lastModified": 1749436314, + "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", "owner": "nix-community", "repo": "disko", - "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", + "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -341,11 +341,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1749358668, - "narHash": "sha256-V91nN4Q9ZwX0N+Gzu+F8SnvzMcdURYnMcIvpfLQzD5M=", + "lastModified": 1749821119, + "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "06451df423dd5e555f39857438ffc16c5b765862", + "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", "type": "github" }, "original": { @@ -511,11 +511,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749312278, - "narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", + "lastModified": 1749627191, + "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", + "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1748959397, - "narHash": "sha256-hq+njWbMLAfQIFEP+8G/7xLz1ZELWC+780332FdpnW0=", + "lastModified": 1749471908, + "narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "20721e48123f1f900b323a76349130080a2f8343", + "rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85", "type": "github" }, "original": { @@ -627,11 +627,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1749832440, + "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "db030f62a449568345372bd62ed8c5be4824fa49", "type": "github" }, "original": { @@ -659,11 +659,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -675,11 +675,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1749388081, - "narHash": "sha256-/o7NAmc8TnxzMXKqpDXucCMAO88UTaC8imG2GWhaGSQ=", + "lastModified": 1749896157, + "narHash": "sha256-zB5/c6FUOKVOt9+yJQkxG3RHKNQlBsR1JsD5tLimY24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a70efe6be05efe8ed907dc309d8fbdc820c3f7a7", + "rev": "0a83273d06fbea81e12d90d83ff7178b9ad78465", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748199909, - "narHash": "sha256-sTPSlPb2quY5Mki+mEbSb2g0QF2AyhN5uD4MEaHudl4=", + "lastModified": 1749411262, + "narHash": "sha256-gRBkeW9l5lb/90lv1waQFNT+18OhITs11HENarh6vNo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "886356e9f87a19221db51e90adb55599a1eb28e2", + "rev": "0fc422d6c394191338c9d6a05786c63fc52a0f29", "type": "github" }, "original": { @@ -738,11 +738,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -754,11 +754,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -802,11 +802,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "lastModified": 1749401433, + "narHash": "sha256-HXIQzULIG/MEUW2Q/Ss47oE3QrjxvpUX7gUl4Xp6lnc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "rev": "08fcb0dcb59df0344652b38ea6326a2d8271baff", "type": "github" }, "original": { @@ -921,11 +921,11 @@ ] }, "locked": { - "lastModified": 1748227081, - "narHash": "sha256-RLnN7LBxhEdCJ6+rIL9sbhjBVDaR6jG377M/CLP/fmE=", + "lastModified": 1749436897, + "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1cbe817fd8c64a9f77ba4d7861a4839b0b15983e", + "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", "type": "github" }, "original": { @@ -942,11 +942,11 @@ ] }, "locked": { - "lastModified": 1743682350, - "narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=", + "lastModified": 1749436897, + "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382", + "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", "type": "github" }, "original": { @@ -964,11 +964,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1749244584, - "narHash": "sha256-BGmEptAyP2NrP4gX7VMYWo53h5e8r2iE/uo2+YPMcfo=", + "lastModified": 1749856827, + "narHash": "sha256-HOhyPMWlt+UQIaVqYG/uq/RDGN6W7r3E4/wh8ncF54o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "8b27add0883067e990bff4f847b6f7b6f53324b9", + "rev": "e0ab4eeb673391ac148f7c6951fe1181a61f1fdb", "type": "gitlab" }, "original": { @@ -983,11 +983,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749385866, - "narHash": "sha256-VKwEp9apUAu6I21GTJMa6NwFVYbSJX9s67sWWrER2E0=", + "lastModified": 1749824792, + "narHash": "sha256-fhEA3GngWkfktSI/7dLdlirgUS9nmXmJGisOs5ozTMw=", "owner": "danth", "repo": "stylix", - "rev": "b3e8f15fe3b361f753a5f85587fd731d076ce821", + "rev": "c79ad485612a0277c1e25a0bcc562eea11b563d8", "type": "github" }, "original": { @@ -1187,11 +1187,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745230073, - "narHash": "sha256-OER99U7MiqQ47myvbsiljsax7OsK19NMds4NBM9XXLs=", + "lastModified": 1749470933, + "narHash": "sha256-TEb495xtK9PsCATFezzg6HXThjtveMs7EkWkGJVxPXU=", "owner": "dj95", "repo": "zjstatus", - "rev": "a819e3bfe6bfef0438d811cdbb1bcfdc29912c62", + "rev": "25adf0c5968b4e8253e8e40e648d05cf15c9430d", "type": "github" }, "original": { From 636d3d77857dd5df22f602bffacfff474c50edae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 14 Jun 2025 15:50:24 +0200 Subject: [PATCH 052/204] open 8080 on shodan for kodi --- nixos/hosts/shodan/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 51260f0..17b81d5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -61,7 +61,8 @@ firewall.enable = true; - firewall.allowedTCPPorts = [22]; + firewall.allowedTCPPorts = [22 8080]; + firewall.allowedUDPPorts = [8080]; hostName = "shodan"; }; From ee6fb8d40a99e2dc6466291c9f9212ad0f635885 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 14 Jun 2025 16:02:02 +0200 Subject: [PATCH 053/204] open the other ports too --- nixos/hosts/shodan/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 17b81d5..235954b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -61,8 +61,8 @@ firewall.enable = true; - firewall.allowedTCPPorts = [22 8080]; - firewall.allowedUDPPorts = [8080]; + firewall.allowedTCPPorts = [22 8080 9090 9777]; + firewall.allowedUDPPorts = [8080 9090 9777]; hostName = "shodan"; }; From 41168bf8366704accbb14866b59fb2887768dcf7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 14 Jun 2025 16:11:10 +0200 Subject: [PATCH 054/204] add port 22 and 24 as well --- nixos/hosts/shodan/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 235954b..ad4dcbd 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -61,8 +61,8 @@ firewall.enable = true; - firewall.allowedTCPPorts = [22 8080 9090 9777]; - firewall.allowedUDPPorts = [8080 9090 9777]; + firewall.allowedTCPPorts = [22 24 8080 9090 9777]; + firewall.allowedUDPPorts = [22 24 8080 9090 9777]; hostName = "shodan"; }; From f1a669d409fabdc04c9bbec09380e8d4f0644e63 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 14 Jun 2025 16:23:40 +0200 Subject: [PATCH 055/204] try doing it on wg0 --- nixos/hosts/shodan/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index ad4dcbd..851c69a 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -60,9 +60,10 @@ networkmanager.enable = true; firewall.enable = true; - - firewall.allowedTCPPorts = [22 24 8080 9090 9777]; - firewall.allowedUDPPorts = [22 24 8080 9090 9777]; + firewall.interfaces."wg0".allowedTCPPorts = [8080]; + firewall.interfaces."wg0".allowedUDPPorts = [8080]; + firewall.allowedTCPPorts = [22 8080 9090 9777]; + firewall.allowedUDPPorts = [22 8080 9090 9777]; hostName = "shodan"; }; From e88c82f55d0049bf9c5d512aeb5b7c40c2ad0138 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 15 Jun 2025 18:27:55 +0200 Subject: [PATCH 056/204] add connect/disconnect command for headset to KDE connect --- home-manager/kde-connect-commands.json | 94 ++++++++++++++------------ 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/home-manager/kde-connect-commands.json b/home-manager/kde-connect-commands.json index e69e236..ebe234e 100644 --- a/home-manager/kde-connect-commands.json +++ b/home-manager/kde-connect-commands.json @@ -1,46 +1,50 @@ [ - { - "command": "systemctl poweroff", - "name": "shutdown" - }, - { - "command": "systemctl reboot", - "name": "reboot" - }, - { - "command": "systemctl suspend", - "name": "suspend" - }, - { - "command": "systemctl hibernate", - "name": "hibernate" - }, - { - "command": "loginctl lock-session", - "name": "lock" - }, - { - "command": "loginctl unlock-session", - "name": "unlock" - }, - { - "command": "qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \"mute\"", - "name": "mute" - }, - { - "command": "qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \"mic_mute\"", - "name": "mute mic" - }, - { - "command": "file=/tmp/$(hostname)_$(date \"+%Y%m%d_%H%M%S\").png; spectacle -bo \"${file}\" && while ! [ -f \"${file}\" ]; do sleep 0.5; done && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \"${file}\"", - "name": "screenshot to phone" - }, - { - "command": "file=\"$HOME/Images/WebcamImage_$(date \"+%Y%m%d_%H%M%S\").jpg\"; ffmpeg -f video4linux2 -s 1280x720 -i /dev/video0 -ss 0:0:2 -frames 1 \"${file}\" && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \"${file}\"", - "name": "webcam to phone" - }, - { - "command": "", - "name": "" - } -] + { + "command": "systemctl poweroff", + "name": "shutdown" + }, + { + "command": "systemctl reboot", + "name": "reboot" + }, + { + "command": "systemctl suspend", + "name": "suspend" + }, + { + "command": "systemctl hibernate", + "name": "hibernate" + }, + { + "command": "loginctl lock-session", + "name": "lock" + }, + { + "command": "loginctl unlock-session", + "name": "unlock" + }, + { + "command": "qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \"mute\"", + "name": "mute" + }, + { + "command": "qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \"mic_mute\"", + "name": "mute mic" + }, + { + "command": "file=/tmp/$(hostname)_$(date \"+%Y%m%d_%H%M%S\").png; spectacle -bo \"${file}\" && while ! [ -f \"${file}\" ]; do sleep 0.5; done && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \"${file}\"", + "name": "screenshot to phone" + }, + { + "command": "file=\"$HOME/Images/WebcamImage_$(date \"+%Y%m%d_%H%M%S\").jpg\"; ffmpeg -f video4linux2 -s 1280x720 -i /dev/video0 -ss 0:0:2 -frames 1 \"${file}\" && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \"${file}\"", + "name": "webcam to phone" + }, + { + "command": "bluetoothctl connect 38:18:4C:11:56:99", + "name": "connect headset" + }, + { + "command": "bluetoothctl disconnect 38:18:4C:11:56:99", + "name": "disconnect headset" + } +] \ No newline at end of file From 427dddd2155a226fcdf72946571160691d2462b3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 16 Jun 2025 20:47:56 +0200 Subject: [PATCH 057/204] add codium to glados for now and update flake lock --- flake.lock | 48 +++++++++---------- home-manager/hosts/GLaDOS/lillian.nix | 1 + .../{ => shared}/kde-connect-commands.json | 0 3 files changed, 25 insertions(+), 24 deletions(-) rename home-manager/{ => shared}/kde-connect-commands.json (100%) diff --git a/flake.lock b/flake.lock index 9649987..7e0280a 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749223974, - "narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=", + "lastModified": 1750013871, + "narHash": "sha256-UQx3rC3QDjD/sIen51+5Juk1rqN3y/sTeMY1WinmhqQ=", "owner": "catppuccin", "repo": "nix", - "rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4", + "rev": "fe78fa558d6603481c03eb03a946eadb970d1801", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1749436314, - "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", + "lastModified": 1750040002, + "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "owner": "nix-community", "repo": "disko", - "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", + "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "type": "github" }, "original": { @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1749821119, - "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", + "lastModified": 1750033262, + "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", "owner": "nix-community", "repo": "home-manager", - "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", + "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", "type": "github" }, "original": { @@ -576,11 +576,11 @@ ] }, "locked": { - "lastModified": 1749355504, - "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", + "lastModified": 1749960154, + "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", + "rev": "424a40050cdc5f494ec45e46462d288f08c64475", "type": "github" }, "original": { @@ -627,11 +627,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749832440, - "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "db030f62a449568345372bd62ed8c5be4824fa49", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -675,11 +675,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1749896157, - "narHash": "sha256-zB5/c6FUOKVOt9+yJQkxG3RHKNQlBsR1JsD5tLimY24=", + "lastModified": 1750099436, + "narHash": "sha256-vbVvGHOnhCykOdsLs+S4uJ78nERLsCdsjo4tHpqvQRE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0a83273d06fbea81e12d90d83ff7178b9ad78465", + "rev": "bd1fe9d0848277ed401a90bbd987fe24401aa286", "type": "github" }, "original": { @@ -964,11 +964,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1749856827, - "narHash": "sha256-HOhyPMWlt+UQIaVqYG/uq/RDGN6W7r3E4/wh8ncF54o=", + "lastModified": 1750052062, + "narHash": "sha256-sRiACsZZgKfm5zqz/2Kzd/R7MsldTI2FlxYGhBUD4pY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e0ab4eeb673391ac148f7c6951fe1181a61f1fdb", + "rev": "7405122ddeefa690b9fa6f25a23195ba57f5f599", "type": "gitlab" }, "original": { @@ -1018,11 +1018,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749824792, - "narHash": "sha256-fhEA3GngWkfktSI/7dLdlirgUS9nmXmJGisOs5ozTMw=", + "lastModified": 1750023464, + "narHash": "sha256-gBsstni5rgh1vt2SNThh51GNvxMDCjEBfpPksS0ig/c=", "owner": "danth", "repo": "stylix", - "rev": "c79ad485612a0277c1e25a0bcc562eea11b563d8", + "rev": "a14e525723c1c837b2ceacd8a37cba1f0b5e76c2", "type": "github" }, "original": { diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 4599605..37ed67b 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -19,6 +19,7 @@ r2modman ryujinx lutris + vscodium ]; programs.mangohud = { diff --git a/home-manager/kde-connect-commands.json b/home-manager/shared/kde-connect-commands.json similarity index 100% rename from home-manager/kde-connect-commands.json rename to home-manager/shared/kde-connect-commands.json From 6844ccaf9af514df14b40545ffc0097833fe0d34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Jun 2025 00:31:43 +0200 Subject: [PATCH 058/204] replace ryujinx with ryubing --- home-manager/hosts/shodan/lillian.nix | 2 +- nixos/shared/default.nix | 1 + temp.nix | 0 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 temp.nix diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 38c0d3f..e3e8ffb 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -52,7 +52,7 @@ #Gaming: prismlauncher r2modman - ryujinx + ryubing # Multimedia: freetube diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 4978ed4..b9663e3 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -157,6 +157,7 @@ pkgs.atkinson-monolegible pkgs.noto-fonts pkgs.nerd-fonts.fira-mono + pkgs.font-awesome ]; # fonts.fontconfig.defaultFonts = { diff --git a/temp.nix b/temp.nix new file mode 100644 index 0000000..e69de29 From 1c5cc3c60dfa1b9ab7fc6c0ea964f905983691c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Jul 2025 14:03:37 +0200 Subject: [PATCH 059/204] update flake lock --- flake.lock | 152 +++++++++--------- .../desktop/package-configs/firefox.nix | 2 + home-manager/hosts/GLaDOS/lillian.nix | 1 + .../package-configs/firefox/default.nix | 8 +- 4 files changed, 81 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index 7e0280a..2c20b2e 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750013871, - "narHash": "sha256-UQx3rC3QDjD/sIen51+5Juk1rqN3y/sTeMY1WinmhqQ=", + "lastModified": 1751705516, + "narHash": "sha256-Y099OGYWYHtpYFP4offuV6rldBnpUv4CYk+HwuaQwLU=", "owner": "catppuccin", "repo": "nix", - "rev": "fe78fa558d6603481c03eb03a946eadb970d1801", + "rev": "719bb50ca2c99bc9c077669a48bfd9815493a11d", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "crane": { "locked": { - "lastModified": 1748970125, - "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "owner": "ipetkov", "repo": "crane", - "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "crane_2": { "locked": { - "lastModified": 1748970125, - "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "owner": "ipetkov", "repo": "crane", - "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1751607816, + "narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -449,16 +449,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", "type": "github" }, "original": { "owner": "GNOME", - "ref": "48.1", + "ref": "48.2", "repo": "gnome-shell", "type": "github" } @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1750033262, - "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", + "lastModified": 1751693185, + "narHash": "sha256-+LKghTO5wWBcR/MJAeoSarWR7c7dO6GyA8+jM8DHV08=", "owner": "nix-community", "repo": "home-manager", - "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", + "rev": "36c57c6a1d03a5efbf5e23c04dbe21259d25f992", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1748737919, - "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", + "lastModified": 1751146119, + "narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=", "owner": "nix-community", "repo": "home-manager", - "rev": "5675a9686851d9626560052a032c4e14e533c1fa", + "rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656", "type": "github" }, "original": { @@ -511,11 +511,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749627191, - "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "lastModified": 1751529406, + "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1749471908, - "narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=", + "lastModified": 1751381593, + "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85", + "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", "type": "github" }, "original": { @@ -576,11 +576,11 @@ ] }, "locked": { - "lastModified": 1749960154, - "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "424a40050cdc5f494ec45e46462d288f08c64475", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -627,11 +627,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -643,11 +643,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -675,11 +675,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1750099436, - "narHash": "sha256-vbVvGHOnhCykOdsLs+S4uJ78nERLsCdsjo4tHpqvQRE=", + "lastModified": 1751716659, + "narHash": "sha256-J2JSKWFx1mHQSlWwzy6e6YGn2u0EX7CFn0PeVHwJnv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd1fe9d0848277ed401a90bbd987fe24401aa286", + "rev": "a2024a38422a2cf4cc9d3548759573381076dfe4", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1749411262, - "narHash": "sha256-gRBkeW9l5lb/90lv1waQFNT+18OhITs11HENarh6vNo=", + "lastModified": 1751203939, + "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0fc422d6c394191338c9d6a05786c63fc52a0f29", + "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", "type": "github" }, "original": { @@ -738,11 +738,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -802,11 +802,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1749401433, - "narHash": "sha256-HXIQzULIG/MEUW2Q/Ss47oE3QrjxvpUX7gUl4Xp6lnc=", + "lastModified": 1750865895, + "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08fcb0dcb59df0344652b38ea6326a2d8271baff", + "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", "type": "github" }, "original": { @@ -878,11 +878,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -921,11 +921,11 @@ ] }, "locked": { - "lastModified": 1749436897, - "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { @@ -942,11 +942,11 @@ ] }, "locked": { - "lastModified": 1749436897, - "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", + "lastModified": 1750905536, + "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", + "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", "type": "github" }, "original": { @@ -964,11 +964,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1750052062, - "narHash": "sha256-sRiACsZZgKfm5zqz/2Kzd/R7MsldTI2FlxYGhBUD4pY=", + "lastModified": 1750949569, + "narHash": "sha256-dTWYv7EPfS5fM+61AUGUd7CD/8DGYdVw/KzGY7XgKq0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "7405122ddeefa690b9fa6f25a23195ba57f5f599", + "rev": "b10c54606bb5293158c37b1fac3909dc3a26449f", "type": "gitlab" }, "original": { @@ -983,11 +983,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1749592509, - "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "50754dfaa0e24e313c626900d44ef431f3210138", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750023464, - "narHash": "sha256-gBsstni5rgh1vt2SNThh51GNvxMDCjEBfpPksS0ig/c=", + "lastModified": 1751656637, + "narHash": "sha256-x1uJ6wQ7C+N/Zx9liQzjyVOEwGf5tcKogSoGgxASZOg=", "owner": "danth", "repo": "stylix", - "rev": "a14e525723c1c837b2ceacd8a37cba1f0b5e76c2", + "rev": "606944b16862d43934fec3311f9cb9f478b7f99b", "type": "github" }, "original": { @@ -1187,11 +1187,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749470933, - "narHash": "sha256-TEb495xtK9PsCATFezzg6HXThjtveMs7EkWkGJVxPXU=", + "lastModified": 1750957292, + "narHash": "sha256-2CYTG+jxP5e7GHAj1t5aMsgb0Rom4jdOb3rsdLKpVNA=", "owner": "dj95", "repo": "zjstatus", - "rev": "25adf0c5968b4e8253e8e40e648d05cf15c9430d", + "rev": "abd848f23eff00d21ec09278072111d97dfd7fe6", "type": "github" }, "original": { diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index bff6738..77f7fd8 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -4,8 +4,10 @@ enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; package = pkgs.floorp; + profiles.default = {isDefault = false;}; profiles.lillian = { isDefault = true; + id = 1; settings = { "browser.aboutConfig.showWarning" = false; "browser.bookmarks.addedImportButton" = true; diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 37ed67b..ce63b26 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -20,6 +20,7 @@ ryujinx lutris vscodium + intiface-central ]; programs.mangohud = { diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 95b8aad..3dc7310 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -1,11 +1,7 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.firefox = { enable = true; - package = pkgs.floorp; + package = pkgs.librewolf; policies = { DisableTelemetry = true; DisableFirefoxStudies = true; From 9e95c576a0fbf958e3279f4e8413a47519be3ab6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Jul 2025 14:13:29 +0200 Subject: [PATCH 060/204] update flake lock --- nixos/hosts/queen/configuration.nix | 1 - nixos/server/package-configs/mail-server/default.nix | 2 +- nixos/shared/default.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 10ff532..2a3bd54 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -81,7 +81,6 @@ roundcubePlugins.custom_from roundcubePlugins.persistent_login roundcubePlugins.thunderbird_labels - youtube-dl sqlite ]; services.vpn-ip = { diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index 2a65c9b..5bad2ac 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -6,7 +6,7 @@ # services.dovecot2.sieve.extensions = ["fileinto"]; mailserver = { - stateVersion = 1; + stateVersion = 3; enable = true; enableImap = true; enableSubmission = true; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index b9663e3..d63d9ba 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -29,7 +29,6 @@ }; #TODO: remove this when unneeded for freetube nixpkgs.config.permittedInsecurePackages = [ - "python3.12-youtube-dl-2021.12.17" ]; nix = { From 8015d1f721236959ac1c258d799fb9cfb89e2d2e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Jul 2025 16:44:37 +0200 Subject: [PATCH 061/204] switch to librewolf and add all the fixes for it --- home-manager/desktop/default.nix | 4 ++++ home-manager/desktop/package-configs/firefox.nix | 2 ++ home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- nixos/desktop/package-configs/firefox/default.nix | 8 ++++---- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 904ec83..9ae465b 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -135,6 +135,10 @@ source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.mozilla/firefox"; target = ".floorp"; }; + librewolf = { + source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.mozilla/firefox"; + target = ".librewolf"; + }; }; # Add stuff for your user as you see fit: diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 77f7fd8..8049699 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -9,6 +9,8 @@ isDefault = true; id = 1; settings = { + "sidebar.verticalTabs" = true; + "sidebar.visibility" = "expand-on-hover"; "browser.aboutConfig.showWarning" = false; "browser.bookmarks.addedImportButton" = true; "browser.bookmarks.restore_default_bookmarks" = false; diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 7331c1b..86a6cb9 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -117,7 +117,7 @@ config = { General = { launchers = [ - "applications:floorp.desktop" + "applications:librewolf.desktop" "applications:systemsettings.desktop" "applications:org.kde.dolphin.desktop" "applications:signal.desktop" diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 3dc7310..c57887f 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -115,10 +115,10 @@ installation_mode = "force_installed"; }; # Tree Style Tabs - "treestyletab@piro.sakura.ne.jp" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/tree-style-tab/latest.xpi"; - installation_mode = "force_installed"; - }; + # "treestyletab@piro.sakura.ne.jp" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/tree-style-tab/latest.xpi"; + # installation_mode = "force_installed"; + # }; # Adaptive Tab Bar Colour "ATBC@EasonWong" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/Adaptive-Tab-Bar-Colour/latest.xpi"; From 8c5c08d78f974ce479e03296ff13dc54eca2d3bf Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 5 Jul 2025 17:17:37 +0200 Subject: [PATCH 062/204] add some more tweaks --- home-manager/desktop/package-configs/plasma-desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 86a6cb9..42bb24f 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -81,6 +81,7 @@ "Nitrokey App" "qBittorrent" "vlc" + "obs" "steam" ]; }; From 910febb5f29864ee41f22c9533986a1607967985 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 8 Jul 2025 15:24:47 +0200 Subject: [PATCH 063/204] push all updates queued up --- home-manager/desktop/package-configs/plasma-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 42bb24f..bb42cec 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -81,8 +81,8 @@ "Nitrokey App" "qBittorrent" "vlc" - "obs" "steam" + "nitrokey-app" ]; }; } From add9e97e3285af98e4e170adbde66fd608cbd55d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 8 Jul 2025 15:29:59 +0200 Subject: [PATCH 064/204] update flake lock --- flake.lock | 165 +++++++++++++---------------------------------------- 1 file changed, 39 insertions(+), 126 deletions(-) diff --git a/flake.lock b/flake.lock index 2c20b2e..fa3c98b 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751705516, - "narHash": "sha256-Y099OGYWYHtpYFP4offuV6rldBnpUv4CYk+HwuaQwLU=", + "lastModified": 1751880463, + "narHash": "sha256-aSQllMKqsTYAUp4yhpspZn0Hj5yIj7Mh4UD5iyk5iMM=", "owner": "catppuccin", "repo": "nix", - "rev": "719bb50ca2c99bc9c077669a48bfd9815493a11d", + "rev": "9474347c69e93e392f194dda7a57c641ba4b998e", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1751607816, - "narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", + "lastModified": 1751854533, + "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", "owner": "nix-community", "repo": "disko", - "rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", + "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", "type": "github" }, "original": { @@ -199,21 +199,6 @@ "type": "github" } }, - "flake-compat_3": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -341,37 +326,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -424,28 +383,6 @@ "type": "github" } }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -470,11 +407,11 @@ ] }, "locked": { - "lastModified": 1751693185, - "narHash": "sha256-+LKghTO5wWBcR/MJAeoSarWR7c7dO6GyA8+jM8DHV08=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "36c57c6a1d03a5efbf5e23c04dbe21259d25f992", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -484,27 +421,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751146119, - "narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -576,11 +492,11 @@ ] }, "locked": { - "lastModified": 1751170039, - "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9c932ae632d6b5150515e5749b198c175d8565db", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -612,11 +528,11 @@ ] }, "locked": { - "lastModified": 1747663185, - "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", + "lastModified": 1751903740, + "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", + "rev": "032decf9db65efed428afd2fa39d80f7089085eb", "type": "github" }, "original": { @@ -659,11 +575,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -675,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1751716659, - "narHash": "sha256-J2JSKWFx1mHQSlWwzy6e6YGn2u0EX7CFn0PeVHwJnv8=", + "lastModified": 1751981146, + "narHash": "sha256-hAm10OSZtWS4b8hUKB8F6PG0vH+Eom5657g8Gv+X0uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2024a38422a2cf4cc9d3548759573381076dfe4", + "rev": "95e89b7eb2fa4a552484fa9b6fd67ffb8bb49db2", "type": "github" }, "original": { @@ -690,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -738,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -754,11 +670,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -964,11 +880,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1750949569, - "narHash": "sha256-dTWYv7EPfS5fM+61AUGUd7CD/8DGYdVw/KzGY7XgKq0=", + "lastModified": 1751942376, + "narHash": "sha256-sSrGM/zFfVPuwZi3eFB02XDCnspDDpvCEEKlpcGR4Ac=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b10c54606bb5293158c37b1fac3909dc3a26449f", + "rev": "0aeb2849ad16024da3ae44310cdcc94432b88184", "type": "gitlab" }, "original": { @@ -1003,11 +919,8 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_7", "nur": "nur", "systems": "systems_2", @@ -1018,11 +931,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751656637, - "narHash": "sha256-x1uJ6wQ7C+N/Zx9liQzjyVOEwGf5tcKogSoGgxASZOg=", + "lastModified": 1751914048, + "narHash": "sha256-xHO3xlw35tCC0f3pN3osPNjgwwwAgusTuZk5iC8oDiE=", "owner": "danth", "repo": "stylix", - "rev": "606944b16862d43934fec3311f9cb9f478b7f99b", + "rev": "bf0ef81c8fcc30c32db9dab32d379f8d9db835e4", "type": "github" }, "original": { From d285d0aeb5973f6f625e3ddf6d7b70a0c7f135b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 11 Jul 2025 15:17:46 +0200 Subject: [PATCH 065/204] update flake lock --- flake.lock | 127 ++++++++++++++++++++++------------------------------- 1 file changed, 52 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index fa3c98b..e1fb2c4 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751880463, - "narHash": "sha256-aSQllMKqsTYAUp4yhpspZn0Hj5yIj7Mh4UD5iyk5iMM=", + "lastModified": 1752227483, + "narHash": "sha256-eetITGJfURryoHY5gfuE9/4sEV9aSgzhPxgsQgofNa8=", "owner": "catppuccin", "repo": "nix", - "rev": "9474347c69e93e392f194dda7a57c641ba4b998e", + "rev": "5f431aac1a4038c385e6de2d2384d943e4802d61", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1751854533, - "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", + "lastModified": 1752113600, + "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", "owner": "nix-community", "repo": "disko", - "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", + "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", "type": "github" }, "original": { @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1751824240, - "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", + "lastModified": 1752202894, + "narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=", "owner": "nix-community", "repo": "home-manager", - "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", + "rev": "fab659b346c0d4252208434c3c4b3983a4b38fec", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1751529406, - "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", + "lastModified": 1752218319, + "narHash": "sha256-fEvLVaVduwVotOib8NqO0e4N3dMsdA04Jlfm2sZQH5Q=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", + "rev": "d5da490d8c2553fc8d589b49f9c036973b9656a1", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1751981146, - "narHash": "sha256-hAm10OSZtWS4b8hUKB8F6PG0vH+Eom5657g8Gv+X0uA=", + "lastModified": 1752239622, + "narHash": "sha256-PML3UiImYUOOYOGV2NejIIrxlDegHkGnP5TV8Z+zohA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95e89b7eb2fa4a552484fa9b6fd67ffb8bb49db2", + "rev": "a6888b11caae868594341087846102234502b35d", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -741,15 +741,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1748730660, - "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", "owner": "nix-community", "repo": "NUR", - "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", "type": "github" }, "original": { @@ -880,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1751942376, - "narHash": "sha256-sSrGM/zFfVPuwZi3eFB02XDCnspDDpvCEEKlpcGR4Ac=", + "lastModified": 1752060039, + "narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "0aeb2849ad16024da3ae44310cdcc94432b88184", + "rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f", "type": "gitlab" }, "original": { @@ -931,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751914048, - "narHash": "sha256-xHO3xlw35tCC0f3pN3osPNjgwwwAgusTuZk5iC8oDiE=", + "lastModified": 1752231632, + "narHash": "sha256-ZuFQ62qagCV5GHSbwnpLk92HxKlNjG7w4wbkT1OrhUA=", "owner": "danth", "repo": "stylix", - "rev": "bf0ef81c8fcc30c32db9dab32d379f8d9db835e4", + "rev": "0150050d6eed373b04fd85e08bd2ae7b5cc8d3b2", "type": "github" }, "original": { @@ -1025,11 +1024,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1748180480, - "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -1041,11 +1040,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1748740859, - "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -1057,11 +1056,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -1070,28 +1069,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "zjstatus": { "inputs": { "crane": "crane_2", From 26fa7c8cb9aad0200104b2e1f6153b57ebfaeb93 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 19 Jul 2025 16:37:29 +0200 Subject: [PATCH 066/204] update flake lock --- flake.lock | 108 ++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index e1fb2c4..1ae0b96 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752227483, - "narHash": "sha256-eetITGJfURryoHY5gfuE9/4sEV9aSgzhPxgsQgofNa8=", + "lastModified": 1752828704, + "narHash": "sha256-I8cCVFZIFcIy+7KBnjCuS/ISTJYeR8mkah1oxA6qBVk=", "owner": "catppuccin", "repo": "nix", - "rev": "5f431aac1a4038c385e6de2d2384d943e4802d61", + "rev": "f5d22072074b0bc3c47a3a96a00e4fad263014ff", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "crane": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1752718651, + "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1752202894, - "narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=", + "lastModified": 1752814804, + "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fab659b346c0d4252208434c3c4b3983a4b38fec", + "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752218319, - "narHash": "sha256-fEvLVaVduwVotOib8NqO0e4N3dMsdA04Jlfm2sZQH5Q=", + "lastModified": 1752755091, + "narHash": "sha256-H/k35QJLyQxkFnXR5ckMv/Z+ElNa5f22qNKdyGBMAn4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d5da490d8c2553fc8d589b49f9c036973b9656a1", + "rev": "0d09755fe1df1886e5f07dbb16f7ed373080f86a", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "lastModified": 1752673703, + "narHash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "rev": "5a776450d904b7ccd377c2a759703152b2553e98", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1751774635, - "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", + "lastModified": 1752441837, + "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "85686025ba6d18df31cc651a91d5adef63378978", + "rev": "839e02dece5845be3a322e507a79712b73a96ba2", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1752239622, - "narHash": "sha256-PML3UiImYUOOYOGV2NejIIrxlDegHkGnP5TV8Z+zohA=", + "lastModified": 1752934743, + "narHash": "sha256-XezskmfL6VKLrlFlU9dzjg2hnQYXrZcqQ5vmsADCojQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6888b11caae868594341087846102234502b35d", + "rev": "c58d89124b950a8ce6480dc0d20d6ac1464f6a66", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751203939, - "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", + "lastModified": 1751791007, + "narHash": "sha256-JBrPWGksmjAw2X71W+kV6moKqPtnxmwsndMQSi+xcu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", + "rev": "e8612a671c4f120f93a5c8dbf0cc225e745a4521", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -836,11 +836,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1751769931, + "narHash": "sha256-QR2Rp/41NkA5YxcpvZEKD1S2QE1Pb9U415aK8M/4tJc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "3ac4f630e375177ea8317e22f5c804156de177e8", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1751606940, - "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752231632, - "narHash": "sha256-ZuFQ62qagCV5GHSbwnpLk92HxKlNjG7w4wbkT1OrhUA=", + "lastModified": 1752750082, + "narHash": "sha256-NoVAqy+Wj4tgkvrYB8zWncl8Z6Hb80aX3t/TYGdsfaM=", "owner": "danth", "repo": "stylix", - "rev": "0150050d6eed373b04fd85e08bd2ae7b5cc8d3b2", + "rev": "03699ed214f6e8195bc7199d6ae3aeccf9732b08", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1750957292, - "narHash": "sha256-2CYTG+jxP5e7GHAj1t5aMsgb0Rom4jdOb3rsdLKpVNA=", + "lastModified": 1752591471, + "narHash": "sha256-c1L3FZ044uSLuVYvnNeTbP4EbocM263TKAAAmSKHC18=", "owner": "dj95", "repo": "zjstatus", - "rev": "abd848f23eff00d21ec09278072111d97dfd7fe6", + "rev": "7ec562d8f3302f67093814552f5e2b83436c58f2", "type": "github" }, "original": { From d071b59473beaa538670dac83948b897c66334eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 20 Jul 2025 18:18:15 +0200 Subject: [PATCH 067/204] add all kde connect commands on next boot (or restart of the service set-kde-connect-commands.service) and force kill zellij and zsh before shutdown --- .../package-configs/kde-connect-commands | 2 ++ .../package-configs/plasma-desktop.nix | 21 ++++++++++++++- nixos/shared/default.nix | 27 +++++++++++++++---- 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 home-manager/desktop/package-configs/kde-connect-commands diff --git a/home-manager/desktop/package-configs/kde-connect-commands b/home-manager/desktop/package-configs/kde-connect-commands new file mode 100644 index 0000000..f494cfc --- /dev/null +++ b/home-manager/desktop/package-configs/kde-connect-commands @@ -0,0 +1,2 @@ +[General] +commands="@ByteArray({\"2574d457_7a99_40a3_8239_24407c7a074d\":{\"command\":\"loginctl unlock-session\",\"name\":\"unlock\"},\"2bbbb9cc_892a_44a1_b097_27b149387511\":{\"command\":\"bluetoothctl disconnect 38:18:4C:11:56:99\",\"name\":\"disconnect headset\"},\"35ad74aa_c1f0_4dd7_a392_2b2676105b62\":{\"command\":\"systemctl hibernate\",\"name\":\"hibernate\"},\"5dd755de_e098_4907_982d_bedba5c3511d\":{\"command\":\"loginctl lock-session\",\"name\":\"lock\"},\"6423946a_b13e_4127_a0d0_0ca38e79fa0f\":{\"command\":\"bluetoothctl connect 38:18:4C:11:56:99\",\"name\":\"connect headset\"},\"690a4134_162b_4851_83a4_bf75722c699a\":{\"command\":\"systemctl suspend\",\"name\":\"suspend\"},\"99ae3913_1757_4ed0_ad7e_91c6f5d740ef\":{\"command\":\"qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \\\"mute\\\"\",\"name\":\"mute\"},\"b11480dd_19f7_49c0_9dcc_3065ddc5150b\":{\"command\":\"qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \\\"mic_mute\\\"\",\"name\":\"mute mic\"},\"bd36530a_9ed5_4345_989d_189c27b3ce00\":{\"command\":\"systemctl reboot\",\"name\":\"reboot\"},\"cf6180f7_e4bd_4f15_a9d1_19ed14e99913\":{\"command\":\"file=\\\"$HOME/Images/WebcamImage_$(date \\\"+%Y%m%d_%H%M%S\\\").jpg\\\"; ffmpeg -f video4linux2 -s 1280x720 -i /dev/video0 -ss 0:0:2 -frames 1 \\\"${file}\\\" && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \\\"${file}\\\"\",\"name\":\"webcam to phone\"},\"d31a3cab_bb6a_459d_89fb_533d0d8fec61\":{\"command\":\"systemctl poweroff\",\"name\":\"shutdown\"},\"f08e1a64_53be_41da_b942_e05e45f1d69c\":{\"command\":\"qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \\\"decrease_volume\\\"\",\"name\":\"volume down\"},\"fbd67152_2a58_4d5d_a210_982fa0eeb171\":{\"command\":\"qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \\\"increase_volume\\\"\",\"name\":\"volume up\"},\"fc3adde9_7049_4166_bcda_a74d13ec91eb\":{\"command\":\"file=/tmp/$(hostname)_$(date \\\"+%Y%m%d_%H%M%S\\\").png; spectacle -bo \\\"${file}\\\" && while ! [ -f \\\"${file}\\\" ]; do sleep 0.5; done && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \\\"${file}\\\"\",\"name\":\"screenshot to phone\"}})" diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index bb42cec..7cae27a 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -1,4 +1,23 @@ -{osConfig, ...}: { +{ + osConfig, + pkgs, + config, + ... +}: { + #TODO: make the creation of the command file easier, for now this is a nice solution though + systemd.user.services."set-kde-connect-commands" = { + Install = { + WantedBy = ["default.target"]; + }; + Service = { + Type = "OneShot"; + ExecStart = "${pkgs.writeShellScript "set-kde-connect-commands" '' + #!/run/current-system/sw/bin/bash + find ${config.home.homeDirectory}/.config/kdeconnect/ -type d -name \'kdeconnect_runcommand\' -execdir cp ${builtins.toPath ./kde-connect-commands} {}+"/config" \; + ''}"; + RemainAfterExit = true; + }; + }; home.file.".config/kdeconnect/config" = { text = '' [General] diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index d63d9ba..660af51 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -154,16 +154,33 @@ fonts.packages = [ pkgs.atkinson-hyperlegible pkgs.atkinson-monolegible + pkgs.noto-fonts-emoji-blob-bin pkgs.noto-fonts pkgs.nerd-fonts.fira-mono pkgs.font-awesome ]; - # fonts.fontconfig.defaultFonts = { - # emoji = ["Blobmoji"]; - # monospace = ["Atkinson Monolegible"]; - # sansSerif = ["Atkinson Hyperlegible"]; - # }; + fonts.fontconfig = { + useEmbeddedBitmaps = true; + # defaultFonts = { + # emoji = ["Blobmoji"]; + # monospace = ["Atkinson Monolegible"]; + # sansSerif = ["Atkinson Hyperlegible"]; + # }; + }; + + systemd.services."shutdown-zellij-zsh" = { + path = with pkgs; [killall]; + enable = true; + unitConfig = { + Before = "shutdown.target"; + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.killall}/bin/killall -SIGKILL zellij zsh"; + RemainAfterExit = "yes"; + }; + }; networking = if config.services.vpn-ip.enable From aaf18ebc82f75342e0f2d00c33cf3f9d568f9251 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 22 Jul 2025 13:06:32 +0200 Subject: [PATCH 068/204] update flake lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 1ae0b96..a73add1 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752828704, - "narHash": "sha256-I8cCVFZIFcIy+7KBnjCuS/ISTJYeR8mkah1oxA6qBVk=", + "lastModified": 1753176825, + "narHash": "sha256-a2SRRDqZJRBM1PsqyCS9mUjTVvf7DoOZHE9CCQpHV0Y=", "owner": "catppuccin", "repo": "nix", - "rev": "f5d22072074b0bc3c47a3a96a00e4fad263014ff", + "rev": "77508ef18131ba2c3c304dbdeacb945299a09d8d", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1752718651, - "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1752814804, - "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", + "lastModified": 1753180535, + "narHash": "sha256-KEtlzMs2O7FDvciFtjk9W4hyau013Pj9qZNK9a0PxEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", + "rev": "847711c7ffa9944b0c5c39a8342ac8eb6a9f9abc", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1752441837, - "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", + "lastModified": 1752985182, + "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "839e02dece5845be3a322e507a79712b73a96ba2", + "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1752934743, - "narHash": "sha256-XezskmfL6VKLrlFlU9dzjg2hnQYXrZcqQ5vmsADCojQ=", + "lastModified": 1753180692, + "narHash": "sha256-BNSnfiDtwYZlXeq0UKBaXvTpssymUG3cITrA00f2BuU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58d89124b950a8ce6480dc0d20d6ac1464f6a66", + "rev": "040f48ff4467f00d6958291f63e3231b422b17e4", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752750082, - "narHash": "sha256-NoVAqy+Wj4tgkvrYB8zWncl8Z6Hb80aX3t/TYGdsfaM=", + "lastModified": 1753117651, + "narHash": "sha256-7gWBlUOe2c0nYGyoVDa9hw15pI3DXDR0KK+nYh9KOpU=", "owner": "danth", "repo": "stylix", - "rev": "03699ed214f6e8195bc7199d6ae3aeccf9732b08", + "rev": "ea60526c8c2a1c5df2743a9495814dc0b319ef3b", "type": "github" }, "original": { From 33f0eec3665208b8573ec5cc876965529833ffe0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 22 Jul 2025 13:52:52 +0200 Subject: [PATCH 069/204] disable rabbitmq (we don't need it and it doesn't compile rn) --- nixos/hosts/queen/configuration.nix | 2 +- nixos/server/package-configs/nextcloud/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2a3bd54..2a5c20a 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -74,7 +74,7 @@ python310 # python310Packages.nbconvert jupyter - rabbitmq-server + # rabbitmq-server roundcube roundcubePlugins.contextmenu roundcubePlugins.carddav diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 3367dbd..6303425 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -101,9 +101,9 @@ # #jwtSecretFile = config.sops.secrets."local.json".path; # }; - services.rabbitmq = { - enable = true; - }; + # services.rabbitmq = { + # enable = true; + # }; systemd.services."sops-nix.service" = { before = [ From 1114f237f6659b8e1c04383c0a7425fafb544d63 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 24 Jul 2025 12:18:24 +0200 Subject: [PATCH 070/204] add check for shodan to not switch but instead just boot rebuild (and added just boot command), and added a check to see if pre-commit file is empty before adding the test hook for this repo --- justfile | 17 ++++++++++++++++- pkgs/rebuild-no-inhibit/default.nix | 6 +++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index 60f43e4..0406689 100644 --- a/justfile +++ b/justfile @@ -1,6 +1,9 @@ build: sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json +boot: + sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v boot --flake .# --show-trace |& nom --json + run: nix-repl -f flake:nixpkgs @@ -15,7 +18,19 @@ clean: sudo nix-store --optimise setup: - echo "just test" >> ./.git/hooks/pre-commit && chmod +x ./.git/hooks/pre-commit + #!/run/current-system/sw/bin/bash -e + if [ -s ./.git/hooks/pre-commit ]; then + read -p $"This file already contains the following text: + $(<./.git/hooks/pre-commit) + Do you want to add the test hook (y/N)? (This will NOT delete data)" choice + case "$choice" in + y|Y ) echo "just test" >> ./.git/hooks/pre-commit && chmod +x ./.git/hooks/pre-commit && echo "Added test hook to pre-commit.";; + * ) echo "No test added to pre-commit.";; + esac + else + echo "just test" >> ./.git/hooks/pre-commit && chmod +x ./.git/hooks/pre-commit + fi + push: git pull diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index ab38581..f421342 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -18,7 +18,11 @@ writeShellApplication git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - just build + if ["''$HOSTNAME" = shodan]; then + just boot + else + just build + fi popd > /dev/null echo "Cleaning up repository in '/tmp/rebuild'..." rm -rf ./rebuild From a2d2d7602a42ef4cc7d7131e17a6f24eca7e6474 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 24 Jul 2025 12:28:02 +0200 Subject: [PATCH 071/204] little fix for the rebuild script maybe? --- pkgs/rebuild-no-inhibit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index f421342..207a086 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -18,7 +18,7 @@ writeShellApplication git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - if ["''$HOSTNAME" = shodan]; then + if [ "''$HOSTNAME" = shodan ]; then just boot else just build From e39ef8d28f0bac2ac96f5305fdab4f897d9995fd Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 24 Jul 2025 12:45:41 +0200 Subject: [PATCH 072/204] move firefox desktop files into folders with default.nix files instead of being loose files in the desktop folder --- home-manager/desktop/default.nix | 4 ++-- .../package-configs/{firefox.nix => firefox/default.nix} | 0 .../{plasma-desktop.nix => plasma-desktop/default.nix} | 0 .../package-configs/{ => plasma-desktop}/kde-connect-commands | 0 home-manager/hosts/shodan/lillian.nix | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename home-manager/desktop/package-configs/{firefox.nix => firefox/default.nix} (100%) rename home-manager/desktop/package-configs/{plasma-desktop.nix => plasma-desktop/default.nix} (100%) rename home-manager/desktop/package-configs/{ => plasma-desktop}/kde-connect-commands (100%) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 9ae465b..56dd2e2 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -13,8 +13,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./package-configs/plasma-desktop.nix - ./package-configs/firefox.nix + ./package-configs/plasma-desktop + ./package-configs/firefox ./package-configs/konsole ./package-configs/foot ./package-configs/freetube diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox/default.nix similarity index 100% rename from home-manager/desktop/package-configs/firefox.nix rename to home-manager/desktop/package-configs/firefox/default.nix diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix similarity index 100% rename from home-manager/desktop/package-configs/plasma-desktop.nix rename to home-manager/desktop/package-configs/plasma-desktop/default.nix diff --git a/home-manager/desktop/package-configs/kde-connect-commands b/home-manager/desktop/package-configs/plasma-desktop/kde-connect-commands similarity index 100% rename from home-manager/desktop/package-configs/kde-connect-commands rename to home-manager/desktop/package-configs/plasma-desktop/kde-connect-commands diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index e3e8ffb..d763022 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -12,8 +12,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../desktop/package-configs/plasma-desktop.nix - ../../desktop/package-configs/firefox.nix + ../../desktop/package-configs/plasma-desktop + ../../desktop/package-configs/firefox ../../desktop/package-configs/konsole ../../desktop/package-configs/foot ../../desktop/package-configs/freetube From 5bcf45b1e63802e1ac07193267bcf339b34573b6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 24 Jul 2025 17:41:34 +0200 Subject: [PATCH 073/204] remove the mesapatches option since it's gone it would seem --- flake.lock | 72 ++++++++++++++-------------- nixos/hosts/GLaDOS/configuration.nix | 7 --- nixos/hosts/shodan/configuration.nix | 1 - 3 files changed, 36 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index a73add1..af8f741 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753176825, - "narHash": "sha256-a2SRRDqZJRBM1PsqyCS9mUjTVvf7DoOZHE9CCQpHV0Y=", + "lastModified": 1753284130, + "narHash": "sha256-qadXtVNH5qFiD3zIAk7mk6E8kV+TuK86a7TUhs0kouc=", "owner": "catppuccin", "repo": "nix", - "rev": "77508ef18131ba2c3c304dbdeacb945299a09d8d", + "rev": "6365c59e7506fd3e6e5050c8184b41aa7410d6e7", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "crane": { "locked": { - "lastModified": 1751562746, - "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", + "lastModified": 1752946753, + "narHash": "sha256-g5uP3jIj+STUcfTJDKYopxnSijs2agRg13H0SGL5iE4=", "owner": "ipetkov", "repo": "crane", - "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", + "rev": "544d09fecc8c2338542c57f3f742f1a0c8c71e13", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1753180535, - "narHash": "sha256-KEtlzMs2O7FDvciFtjk9W4hyau013Pj9qZNK9a0PxEc=", + "lastModified": 1753294394, + "narHash": "sha256-1Dfgq09lHZ8AdYB2Deu/mYP1pMNpob8CgqT5Mzo44eI=", "owner": "nix-community", "repo": "home-manager", - "rev": "847711c7ffa9944b0c5c39a8342ac8eb6a9f9abc", + "rev": "1fde6fb1be6cd5dc513dc1c287d69e4eb2de973e", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1752755091, - "narHash": "sha256-H/k35QJLyQxkFnXR5ckMv/Z+ElNa5f22qNKdyGBMAn4=", + "lastModified": 1753333833, + "narHash": "sha256-S5RHVk+6PMwThIJY2mSbeoWTY1JrBSy1v1E1LDOFQW8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0d09755fe1df1886e5f07dbb16f7ed373080f86a", + "rev": "e462677116c12bf23bd681a6a87dc7f98e689adf", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1752673703, - "narHash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=", + "lastModified": 1753349211, + "narHash": "sha256-wGfVht5kOLc9t3GZxEr4IIq5QgHV6nB3w9qqhcVKloo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "5a776450d904b7ccd377c2a759703152b2553e98", + "rev": "4775927ef576f6493b79b1d205e42493d6878d47", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1753180692, - "narHash": "sha256-BNSnfiDtwYZlXeq0UKBaXvTpssymUG3cITrA00f2BuU=", + "lastModified": 1753364558, + "narHash": "sha256-Ehy4ehbrDMT4VDDE+udoomabFRVITm8793kyjuVPtIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "040f48ff4467f00d6958291f63e3231b422b17e4", + "rev": "7e940a342afccd1ef3d7abfa6e32b0b24027821f", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751791007, - "narHash": "sha256-JBrPWGksmjAw2X71W+kV6moKqPtnxmwsndMQSi+xcu4=", + "lastModified": 1753004467, + "narHash": "sha256-QznRD2YNqBVT+LjrV36rIuOZO1XKbjm1BgtMTIrTDVg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8612a671c4f120f93a5c8dbf0cc225e745a4521", + "rev": "147633ad35aba48f75af49be7ddc956c71c35acc", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -836,11 +836,11 @@ ] }, "locked": { - "lastModified": 1751769931, - "narHash": "sha256-QR2Rp/41NkA5YxcpvZEKD1S2QE1Pb9U415aK8M/4tJc=", + "lastModified": 1752979888, + "narHash": "sha256-qRRP3QavbwW0o+LOh31QNEfCgPlzK5SKlWALUJL6T7E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3ac4f630e375177ea8317e22f5c804156de177e8", + "rev": "95719de18aefa63a624bf75a1ff98744b089ec12", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1752060039, - "narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=", + "lastModified": 1753285640, + "narHash": "sha256-ofa021NeHDXAxg5J8mSnn8rHa393PAlD85ZCetP4Qa0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f", + "rev": "ce87c8a9771d1a20c3fa3b60113b9b0821627dcb", "type": "gitlab" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1753117651, - "narHash": "sha256-7gWBlUOe2c0nYGyoVDa9hw15pI3DXDR0KK+nYh9KOpU=", + "lastModified": 1753296482, + "narHash": "sha256-VPLaHVhU6/CwnMHTjhf6945qyrXEcpjxKfpWqQXtnxI=", "owner": "danth", "repo": "stylix", - "rev": "ea60526c8c2a1c5df2743a9495814dc0b319ef3b", + "rev": "fbe1dab7783a3d579dc57be8ceee148104e0930b", "type": "github" }, "original": { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index f225830..b129298 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -72,18 +72,11 @@ }; jovian = { - steam = { - enable = true; - autoStart = false; - user = "lillian"; - desktopSession = "plasma"; - }; decky-loader = { enable = true; package = pkgs.decky-loader-prerelease; extraPackages = [pkgs.python3]; }; - hardware.has.amd.gpu = true; }; boot = { loader.systemd-boot.enable = false; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 851c69a..1f5594c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -222,7 +222,6 @@ }; steamos = { enableAutoMountUdevRules = true; - enableMesaPatches = true; }; }; programs = { From c323d0f507dc8685525b4f2b46aa4d0bb2f5ee3b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Aug 2025 21:36:11 +0200 Subject: [PATCH 074/204] replace the coturn secret from being public to a sops file --- nixos/hosts/GLaDOS/configuration.nix | 3 +++ nixos/server/package-configs/coturn/default.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index b129298..ee0bf07 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -72,6 +72,9 @@ }; jovian = { + steamos = { + enableAutoMountUdevRules = true; + }; decky-loader = { enable = true; package = pkgs.decky-loader-prerelease; diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 5bae63e..db36913 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -5,7 +5,7 @@ services.coturn = { enable = true; use-auth-secret = true; - static-auth-secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT"; + static-auth-secret-file = config.sops.secrets."coturn-auth-secret".path; realm = "turn.gladtherescake.eu"; relay-ips = [ "62.171.160.195" From 6d59530edf7083c1f271880efd190fd89410826b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Aug 2025 21:47:27 +0200 Subject: [PATCH 075/204] forgot to edit the sops file it seems, actually a new key now --- nixos/hosts/queen/secrets/sops.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index dcd0abb..0ea3b63 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -8,7 +8,7 @@ mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8 rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] wg-private-key: ENC[AES256_GCM,data:mq8QWoQ4tE4eYaFbwCzQnRREUFI2qrnmDnwurKMu6qdKkDylqc65E7jgGDI=,iv:r5RdcmfW4OaKlbbzUCPahONvpLcfZ7X7KcEEYFIYFDk=,tag:e93C4lByJV75JMHLJ02PfA==,type:str] lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str] -coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str] +coturn-auth-secret: ENC[AES256_GCM,data:Ntw7IAGkDSI7QNNcnik23ofBmEcUC9kwJ6UAb0shSxW3FkP3pLhaXYa2iK6ItFFc+qHVvog2Vh76Qmm+5+Y5bQ==,iv:Kn0lwR11lRLTpmfMCAqhu6HyDKnu0bSLdA07UNBoDk0=,tag:mDuUPBj4pFnb2D2Vys6sxA==,type:str] grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str] @@ -16,10 +16,6 @@ writefreelymysql: ENC[AES256_GCM,data:1JZwIX04O3DBAo7JvEkeNrFcSdcmk/u4WUf/kkbr2J ssh-private-key: ENC[AES256_GCM,data:DK/ggskAyhvotRkf36oZBoPw3hGvVlXneqaJZRPwX2a3YVMy4zgDE3iN65UeR6mfkp9J3OmLejOHeWFB/bRCHY3oTW6GUuZljTe2rI1/x/d2s4zX5UPPEWcy3cXH25d72DzElQBEMDKuZyDe0OZ0/NkR//vEeXgoA2Nr/NKHlTWrq/t26DMD2Vt+kQ+S9b0hh4tgh3OP1lwRu9/mTJOmInd/86gKB9+aD9V0oFvNbMEmgbwIah+ZjQBHB7GEIwjUc/lLmc+3RSn9J0rICIhnhL7NTzHUDHkYd93Tm0L9UHIyi9Oco2sK8tuV5mTDM1OK8CbDg/5FICTQ0H4sstCrDNZd2wE4E1kaZuwYOyxpzQpWJY8jOxxw5oIE0IccvvptM/9vp+0f1F2RIDrkIdHSLpFbGZGvXNVAWlXyv+0qOYS7BGzD0KAh9f74GcAvULq36vdzBahb5e+CqT3JXESne8qhkpsP0G9Z1I1Fy0xpADx/9cTnAm5RmXTw/KBPmBA5IZYZBRbR/C+N7Xyxr7u9RcwFJdIbSpAeT/ew,iv:pHT7DtX1ab7boPboXRaSg9w/4sMgNraEswtEf2tBPkw=,tag:Fbw2/Evf4ZsLFMBPflf9CA==,type:str] mollysocket-vapid-key: ENC[AES256_GCM,data:8N2hxY6WN6mCcjMIFsw/Vt1RoGvUbYxkVPOOn4WRjXZtEEkkVCIaNevozF4xCnBUEWIukNg8lZk8ake/pHAq,iv:+NHm3hSotcRPRjrwEe9xKnEeYbnUZqJEB1sd5B+tWIE=,tag:Pd2pnJqj771XqdqBREGzJQ==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -30,8 +26,7 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-14T13:43:37Z" - mac: ENC[AES256_GCM,data:GK+WcmMgDbZ5xeqMK06CuquR6/ptd2oXzVJ9V74+n6lBx4XsyPu17puKGKgsGsIHeRYdbwtQh8tm42/XJ0tK8qJz1yGvfQxPasd+ibRBHatWWHzQ/czR3NIRWYqGF9/mxi2uHrftaKtku1/huxjzjb69blopMzn2LEH0vCzXCkc=,iv:K6Fbhmz9FAzLd8KcjDSriVre8MhCYrGTVXh+u6oGLaQ=,tag:4Ylrs+Mm54vAKFQyyo8Njg==,type:str] - pgp: [] + lastmodified: "2025-08-03T19:47:05Z" + mac: ENC[AES256_GCM,data:6bJEc9GhgvUEnA0MbdZ/if0rB8KpzzHdHtTD0O57eRz5zAy2zI7tr6ucsoHK7qprqIQrcTqJ9V14xomzdou5QXOIVljy+Kjxt2Mb4Xg2ZWHGAMDUSZ2EPwIeuh+lXC6g63HVA/optyTNW/28j3laNx+u8psc91uWX7RhrmkNbeY=,iv:ow2otSqfV1As3PN+jfaF+oeehOa9kJFGMcmfcRVwlTw=,tag:c7O7arie7amrsXzyXmutDA==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.10.2 From 2862d5c39b7f876f464f1ec802a50e54fcc5e9f3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 3 Aug 2025 22:21:29 +0200 Subject: [PATCH 076/204] add janus-gateway to queen --- nixos/hosts/queen/configuration.nix | 1 + nixos/server/package-configs/nextcloud/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 2a5c20a..cd4d78e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -73,6 +73,7 @@ postgresql_16 python310 # python310Packages.nbconvert + janus-gateway jupyter # rabbitmq-server roundcube diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 6303425..c1960ff 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -69,6 +69,7 @@ overwriteprotocol = "https"; default_phone_region = "NL"; maintenance_window_start = 3; + log_type = "file"; }; appstoreEnable = true; extraAppsEnable = true; From fb91bd85aa129cca4a1d689ea76c5ea7a57a4308 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 4 Aug 2025 19:31:10 +0200 Subject: [PATCH 077/204] secret secret I add a secret (and remove cinny desktop for vulnerability and update the flake lock) --- flake.lock | 138 ++++++++++++++-------------- home-manager/desktop/default.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 + nixos/hosts/queen/secrets/sops.yaml | 7 +- 4 files changed, 76 insertions(+), 73 deletions(-) diff --git a/flake.lock b/flake.lock index af8f741..9271c56 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753284130, - "narHash": "sha256-qadXtVNH5qFiD3zIAk7mk6E8kV+TuK86a7TUhs0kouc=", + "lastModified": 1754320691, + "narHash": "sha256-f2GlehE0aKdU370jgceIrslBy2VEuJx8YzHazK9Yi6M=", "owner": "catppuccin", "repo": "nix", - "rev": "6365c59e7506fd3e6e5050c8184b41aa7410d6e7", + "rev": "82505942715570be4b68d4593201cfb8d48221ca", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "crane": { "locked": { - "lastModified": 1752946753, - "narHash": "sha256-g5uP3jIj+STUcfTJDKYopxnSijs2agRg13H0SGL5iE4=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "544d09fecc8c2338542c57f3f742f1a0c8c71e13", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1753294394, - "narHash": "sha256-1Dfgq09lHZ8AdYB2Deu/mYP1pMNpob8CgqT5Mzo44eI=", + "lastModified": 1754263839, + "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=", "owner": "nix-community", "repo": "home-manager", - "rev": "1fde6fb1be6cd5dc513dc1c287d69e4eb2de973e", + "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1753333833, - "narHash": "sha256-S5RHVk+6PMwThIJY2mSbeoWTY1JrBSy1v1E1LDOFQW8=", + "lastModified": 1754110197, + "narHash": "sha256-N7GWK2084EsNdwzwg6FCIgMrSau1WwzxGSNdPHx5Tak=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e462677116c12bf23bd681a6a87dc7f98e689adf", + "rev": "04ce5c103eb621220d69102bc0ee27c3abd89204", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1753349211, - "narHash": "sha256-wGfVht5kOLc9t3GZxEr4IIq5QgHV6nB3w9qqhcVKloo=", + "lastModified": 1754297745, + "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4775927ef576f6493b79b1d205e42493d6878d47", + "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1752985182, - "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", + "lastModified": 1754195341, + "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", + "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754316476, + "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1753364558, - "narHash": "sha256-Ehy4ehbrDMT4VDDE+udoomabFRVITm8793kyjuVPtIE=", + "lastModified": 1754321311, + "narHash": "sha256-9RK6cCUayP3eo0MUVEWYuaBBtuReS8vd/B+VtGQbKEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e940a342afccd1ef3d7abfa6e32b0b24027821f", + "rev": "2792147be556b1d1b1f8ebfe3e2ce231fcbbdd46", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -638,11 +638,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753004467, - "narHash": "sha256-QznRD2YNqBVT+LjrV36rIuOZO1XKbjm1BgtMTIrTDVg=", + "lastModified": 1754243818, + "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "147633ad35aba48f75af49be7ddc956c71c35acc", + "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "94def634a20494ee057c76998843c015909d6311", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1748196248, - "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=", + "lastModified": 1754241118, + "narHash": "sha256-nsBBqbAFB7lUYIh6S6l7fQ/ALDhCckp7+rqbY2767uE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b7697abe89967839b273a863a3805345ea54ab56", + "rev": "968109159b4bbe4386ac281272ddcebeef09ebfc", "type": "github" }, "original": { @@ -836,11 +836,11 @@ ] }, "locked": { - "lastModified": 1752979888, - "narHash": "sha256-qRRP3QavbwW0o+LOh31QNEfCgPlzK5SKlWALUJL6T7E=", + "lastModified": 1754189623, + "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "95719de18aefa63a624bf75a1ff98744b089ec12", + "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1753285640, - "narHash": "sha256-ofa021NeHDXAxg5J8mSnn8rHa393PAlD85ZCetP4Qa0=", + "lastModified": 1754094422, + "narHash": "sha256-OZKijk5dw5Ih54qXMMAlaGFk5j6RAvS1sB8PLS0QCdQ=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "ce87c8a9771d1a20c3fa3b60113b9b0821627dcb", + "rev": "eb656cd36128dd2173b1798b66a7645657e45609", "type": "gitlab" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1753296482, - "narHash": "sha256-VPLaHVhU6/CwnMHTjhf6945qyrXEcpjxKfpWqQXtnxI=", + "lastModified": 1754264048, + "narHash": "sha256-Yg1W0sFhBpnglfhWGlFmxzSmte1F157luHAADp5Hguk=", "owner": "danth", "repo": "stylix", - "rev": "fbe1dab7783a3d579dc57be8ceee148104e0930b", + "rev": "1b5e1c5642cf96e07daf14ae4c5ddd23d7ed5623", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1752591471, - "narHash": "sha256-c1L3FZ044uSLuVYvnNeTbP4EbocM263TKAAAmSKHC18=", + "lastModified": 1753722377, + "narHash": "sha256-L9CujCLS4PmpEhGKqezD4DognRNcYDz/oAL7T8jqCxk=", "owner": "dj95", "repo": "zjstatus", - "rev": "7ec562d8f3302f67093814552f5e2b83436c58f2", + "rev": "f6c28d9b780891afa693d1b9be4384b16ae7a578", "type": "github" }, "original": { diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 56dd2e2..2ee2b59 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -157,7 +157,7 @@ # Chat applications: signal-desktop vesktop - cinny-desktop + # cinny-desktop # Gaming: prismlauncher diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index cd4d78e..40d1028 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -67,6 +67,8 @@ #jellyfin #jellyfin-web #jellyfin-ffmpeg + nextcloud-spreed-signaling + nats-server nginx onlyoffice-documentserver openssl diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index 0ea3b63..c0edc61 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -8,7 +8,8 @@ mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8 rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] wg-private-key: ENC[AES256_GCM,data:mq8QWoQ4tE4eYaFbwCzQnRREUFI2qrnmDnwurKMu6qdKkDylqc65E7jgGDI=,iv:r5RdcmfW4OaKlbbzUCPahONvpLcfZ7X7KcEEYFIYFDk=,tag:e93C4lByJV75JMHLJ02PfA==,type:str] lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str] -coturn-auth-secret: ENC[AES256_GCM,data:Ntw7IAGkDSI7QNNcnik23ofBmEcUC9kwJ6UAb0shSxW3FkP3pLhaXYa2iK6ItFFc+qHVvog2Vh76Qmm+5+Y5bQ==,iv:Kn0lwR11lRLTpmfMCAqhu6HyDKnu0bSLdA07UNBoDk0=,tag:mDuUPBj4pFnb2D2Vys6sxA==,type:str] +coturn-auth-secret: ENC[AES256_GCM,data:1K7WX5FGhF7+CRZs4SEVKogsGv/93IJVvLeMe6/d1dg3g5/6fQkRCVl1KicMUOsqUxMweUn5hUXSO1h/ruWvPA==,iv:0U/JoeVin2zTkyk60x2boUQRzGW+9swlbxP1ENCbAFQ=,tag:ll8WCgMNtun5Va0VpC81Tw==,type:str] +hpb-secret: ENC[AES256_GCM,data:I/64j3nA0BWW5YY4STMFzxnSKQ+TmiHvweIIGOMJvV4=,iv:zezsPPnKlVBVlrJeG4pGbtuiz1GEWLmQaZl1isNa+pk=,tag:YbTWLAjIIMDn5Jo43U0QtA==,type:str] grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str] @@ -26,7 +27,7 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-03T19:47:05Z" - mac: ENC[AES256_GCM,data:6bJEc9GhgvUEnA0MbdZ/if0rB8KpzzHdHtTD0O57eRz5zAy2zI7tr6ucsoHK7qprqIQrcTqJ9V14xomzdou5QXOIVljy+Kjxt2Mb4Xg2ZWHGAMDUSZ2EPwIeuh+lXC6g63HVA/optyTNW/28j3laNx+u8psc91uWX7RhrmkNbeY=,iv:ow2otSqfV1As3PN+jfaF+oeehOa9kJFGMcmfcRVwlTw=,tag:c7O7arie7amrsXzyXmutDA==,type:str] + lastmodified: "2025-08-04T13:04:56Z" + mac: ENC[AES256_GCM,data:ppQgyWY/4Kr8/Ag5x7wBv1RZAxky6Itf4sBBRIzJj8njzSDOPm0blcDHjIGesu9PwmjnnJihZivmWXj43pAjxf6p4FmtlBAIqLUjRIV7fR16VINo7dPx4Pv6+sw1uwFvLliD/FfKwYo2S+Lx0eQnOzW1p7RROpbQJQ8k7AUngKE=,iv:Pk8sPdAMzITgeeaoZHJc77ywp47DuB5A1Lx5pjtHXM0=,tag:JkMDnjYMPTFkyOiikA7ejA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From 543efcc4a7e1ff5967302bf892f972110deebed2 Mon Sep 17 00:00:00 2001 From: Lillian Violet Date: Wed, 6 Aug 2025 12:22:14 +0200 Subject: [PATCH 078/204] Enable scx scheduling on all systems --- nixos/shared/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 660af51..18c3fcc 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -151,6 +151,8 @@ }; }; +services.scx.enable = true; + fonts.packages = [ pkgs.atkinson-hyperlegible pkgs.atkinson-monolegible From 35c4f668a0f64aef756027e88114686b3d292d27 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 6 Aug 2025 22:02:40 +0200 Subject: [PATCH 079/204] enable the sdx thingy only when it's not an aarch64 system --- nixos/shared/default.nix | 6 +++++- pkgs/simple-completion-language-server/default.nix | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 18c3fcc..3730051 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -4,6 +4,7 @@ lib, config, pkgs, + mkIf, ... }: { imports = [ @@ -151,7 +152,10 @@ }; }; -services.scx.enable = true; + services.scx.enable = + if (pkgs.system == "aarch64-linux") + then false + else true; fonts.packages = [ pkgs.atkinson-hyperlegible diff --git a/pkgs/simple-completion-language-server/default.nix b/pkgs/simple-completion-language-server/default.nix index 474f9f3..4ab8766 100644 --- a/pkgs/simple-completion-language-server/default.nix +++ b/pkgs/simple-completion-language-server/default.nix @@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM="; }; - useFetchCargoVendor = true; cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM="; meta = with lib; { description = "Language server to enable word completion and snippets for Helix editor"; From 5e5c67fb5d49ba095900dcc28c763873dc3cf542 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 6 Aug 2025 22:05:46 +0200 Subject: [PATCH 080/204] update flake lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 9271c56..805114b 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754320691, - "narHash": "sha256-f2GlehE0aKdU370jgceIrslBy2VEuJx8YzHazK9Yi6M=", + "lastModified": 1754418797, + "narHash": "sha256-8UP/nu75GyNcdKW3FD/mRxhs5zWlRIpAQo8wgm9rVQE=", "owner": "catppuccin", "repo": "nix", - "rev": "82505942715570be4b68d4593201cfb8d48221ca", + "rev": "9bdf7f5fb308409495523ea21bec5484b75b2492", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1754263839, - "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=", + "lastModified": 1754503522, + "narHash": "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773", + "rev": "13461dec40bf03d9196ff79d1abe48408268cc35", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1754321311, - "narHash": "sha256-9RK6cCUayP3eo0MUVEWYuaBBtuReS8vd/B+VtGQbKEs=", + "lastModified": 1754510548, + "narHash": "sha256-XqYBUc8PQuTXRViWMSd1wq1IyPUt3R+12e1VgC6Lr28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2792147be556b1d1b1f8ebfe3e2ce231fcbbdd46", + "rev": "2e63b1b5e323f6f0265914a10c1b6975eeb1b678", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1754241118, - "narHash": "sha256-nsBBqbAFB7lUYIh6S6l7fQ/ALDhCckp7+rqbY2767uE=", + "lastModified": 1754501628, + "narHash": "sha256-FExJ54tVB5iu7Dh2tLcyCSWpaV+lmUzzWKZUkemwXvo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "968109159b4bbe4386ac281272ddcebeef09ebfc", + "rev": "cca090f8115c4172b9aef6c5299ae784bdd5e133", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1754328224, + "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754264048, - "narHash": "sha256-Yg1W0sFhBpnglfhWGlFmxzSmte1F157luHAADp5Hguk=", + "lastModified": 1754438321, + "narHash": "sha256-sRRV9FAZyCbq91IXc6gokBGNe0mF3DPbX/ceY8vUvw0=", "owner": "danth", "repo": "stylix", - "rev": "1b5e1c5642cf96e07daf14ae4c5ddd23d7ed5623", + "rev": "8410296a30e62e06305020cb74d3247cfa45d9cc", "type": "github" }, "original": { From 175a554a851d67127f8e64affc81fc20c5b0ae36 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 8 Aug 2025 00:50:31 +0200 Subject: [PATCH 081/204] update flake and replace ryujinx with ryubing --- flake.lock | 42 +++++++++++++-------------- home-manager/hosts/GLaDOS/lillian.nix | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 805114b..634e69c 100644 --- a/flake.lock +++ b/flake.lock @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1754503522, - "narHash": "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=", + "lastModified": 1754593726, + "narHash": "sha256-bo6aSfDS/GGfM/6LXCKLH/246fDSKjFnBsaRMNE+Wmc=", "owner": "nix-community", "repo": "home-manager", - "rev": "13461dec40bf03d9196ff79d1abe48408268cc35", + "rev": "5de16c704b0fc8f519b2c19ed3f683a9e68f3884", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754316476, - "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1754510548, - "narHash": "sha256-XqYBUc8PQuTXRViWMSd1wq1IyPUt3R+12e1VgC6Lr28=", + "lastModified": 1754606633, + "narHash": "sha256-QxKGaM/s2+N+fJokDsebbgZIsNG5aW5SMH+Nxt71r0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2e63b1b5e323f6f0265914a10c1b6975eeb1b678", + "rev": "a936d80cc054954cd83a28fb1244584b1a042de3", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1754094422, - "narHash": "sha256-OZKijk5dw5Ih54qXMMAlaGFk5j6RAvS1sB8PLS0QCdQ=", + "lastModified": 1754605910, + "narHash": "sha256-kVWxzm44ywJTb4REfwWCYXnROISykG0yE+X5A3Gov24=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "eb656cd36128dd2173b1798b66a7645657e45609", + "rev": "57d9624c71ca65bee69b30d72b11f6c5257e9500", "type": "gitlab" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754438321, - "narHash": "sha256-sRRV9FAZyCbq91IXc6gokBGNe0mF3DPbX/ceY8vUvw0=", + "lastModified": 1754597531, + "narHash": "sha256-OpC9/PBIuL2WEJUkcuD/wVxI8r+3o6f5RylSIefjHo4=", "owner": "danth", "repo": "stylix", - "rev": "8410296a30e62e06305020cb74d3247cfa45d9cc", + "rev": "63bb34a66ad7d1af2e95ee20dd675896b2074c32", "type": "github" }, "original": { diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index ce63b26..4255251 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -17,7 +17,7 @@ home.packages = with pkgs; [ r2modman - ryujinx + ryubing lutris vscodium intiface-central From 36434fbb4bbca85f35fa6ab076046f2531e41dae Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 9 Aug 2025 15:30:25 +0200 Subject: [PATCH 082/204] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 634e69c..ab510d1 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754418797, - "narHash": "sha256-8UP/nu75GyNcdKW3FD/mRxhs5zWlRIpAQo8wgm9rVQE=", + "lastModified": 1754727511, + "narHash": "sha256-iRqRCeeXEQ5HSB6zI6Wja7ZfY0PPRx5yelgjtoX2iMo=", "owner": "catppuccin", "repo": "nix", - "rev": "9bdf7f5fb308409495523ea21bec5484b75b2492", + "rev": "7b55c4947c02f79dfd249432ccb0ada2726c29e2", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1754593726, - "narHash": "sha256-bo6aSfDS/GGfM/6LXCKLH/246fDSKjFnBsaRMNE+Wmc=", + "lastModified": 1754613544, + "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5de16c704b0fc8f519b2c19ed3f683a9e68f3884", + "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1754110197, - "narHash": "sha256-N7GWK2084EsNdwzwg6FCIgMrSau1WwzxGSNdPHx5Tak=", + "lastModified": 1754639028, + "narHash": "sha256-w1+XzPBAZPbeGLMAgAlOjIquswo6Q42PMep9KSrRzOA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "04ce5c103eb621220d69102bc0ee27c3abd89204", + "rev": "d49809278138d17be77ab0ef5506b26dc477fa62", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1754606633, - "narHash": "sha256-QxKGaM/s2+N+fJokDsebbgZIsNG5aW5SMH+Nxt71r0s=", + "lastModified": 1754746130, + "narHash": "sha256-HV0PzHvAhy6Nq667yrMl/VtsUpUL1R4GSieYr440YCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a936d80cc054954cd83a28fb1244584b1a042de3", + "rev": "abc81cb62ac76ba2105e55ce969f6e7bd1a860d3", "type": "github" }, "original": { From a7c2609666ce12011cb479a0cd6f367645ecf87c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 12 Aug 2025 13:23:20 +0200 Subject: [PATCH 083/204] manually set up new freetube --- home-manager/hosts/GLaDOS/lillian.nix | 1 + nixos/desktop/default.nix | 3 +- pkgs/default.nix | 1 + pkgs/freetube-0.23.6/default.nix | 121 ++++++++++++++++++ pkgs/freetube-0.23.6/patch-build-script.patch | 13 ++ 5 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 pkgs/freetube-0.23.6/default.nix create mode 100644 pkgs/freetube-0.23.6/patch-build-script.patch diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 4255251..cc55531 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -21,6 +21,7 @@ lutris vscodium intiface-central + unrar ]; programs.mangohud = { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index ac4febd..a750ab7 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -36,6 +36,7 @@ dvt servo restart + freetube-0236 # System tools aha @@ -91,7 +92,7 @@ #rustdesk ]) ++ (with pkgs-edge; [ - freetube + # freetube # list of latest packages from nixpkgs master # Can be used to install latest version of some packages ]); diff --git a/pkgs/default.nix b/pkgs/default.nix index 464322b..4a754ee 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14,4 +14,5 @@ pkgs: { phanpy = pkgs.callPackage ./phanpy {}; auto-mount = pkgs.callPackage ./auto-mount {}; simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; + freetube-0236 = pkgs.callPackage ./freetube-0.23.6 {}; } diff --git a/pkgs/freetube-0.23.6/default.nix b/pkgs/freetube-0.23.6/default.nix new file mode 100644 index 0000000..8391130 --- /dev/null +++ b/pkgs/freetube-0.23.6/default.nix @@ -0,0 +1,121 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + replaceVars, + makeDesktopItem, + + nodejs, + yarnConfigHook, + yarnBuildHook, + makeShellWrapper, + copyDesktopItems, + electron, + + nixosTests, +}: +let + description = "Open Source YouTube app for privacy"; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "freetube"; + version = "0.23.6"; + + src = fetchFromGitHub { + owner = "FreeTubeApp"; + repo = "FreeTube"; + tag = "v${finalAttrs.version}-beta"; + hash = "sha256-Z1L45RHlmylfqKBY37PC5TQ3ubOgH0AHFGM7VkmtkZ0="; + }; + + # Darwin requires writable Electron dist + postUnpack = + if stdenvNoCC.hostPlatform.isDarwin then + '' + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + '' + else + '' + ln -s ${electron.dist} electron-dist + ''; + + patches = [ + (replaceVars ./patch-build-script.patch { + electron-version = electron.version; + }) + ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-ia5wLRt3Hmo4/dsB1/rhGWGJ7LMnVR9ju9lSlQZDTTg="; + }; + + nativeBuildInputs = [ + nodejs + yarnConfigHook + yarnBuildHook + makeShellWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + '' + + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + mkdir -p $out/share/freetube + cp -r build/*-unpacked/{locales,resources{,.pak}} -t $out/share/freetube + + makeWrapper ${lib.getExe electron} $out/bin/freetube \ + --add-flags "$out/share/freetube/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + + install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg + '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r build/mac*/FreeTube.app $out/Applications + ln -s "$out/Applications/FreeTube.app/Contents/MacOS/FreeTube" $out/bin/freetube + '' + + '' + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "freetube"; + desktopName = "FreeTube"; + comment = description; + exec = "freetube %U"; + terminal = false; + type = "Application"; + icon = "freetube"; + startupWMClass = "FreeTube"; + mimeTypes = [ "x-scheme-handler/freetube" ]; + categories = [ "Network" ]; + }) + ]; + + passthru.tests = nixosTests.freetube; + + meta = { + inherit description; + homepage = "https://freetubeapp.io/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + ryneeverett + pentane + ryand56 + sigmasquadron + ddogfoodd + ]; + badPlatforms = [ + # output app is called "Electron.app" while derivation expects "FreeTube.app" + #see: https://github.com/NixOS/nixpkgs/pull/384596#issuecomment-2677141349 + lib.systems.inspect.patterns.isDarwin + ]; + inherit (electron.meta) platforms; + mainProgram = "freetube"; + }; +}) diff --git a/pkgs/freetube-0.23.6/patch-build-script.patch b/pkgs/freetube-0.23.6/patch-build-script.patch new file mode 100644 index 0000000..c543391 --- /dev/null +++ b/pkgs/freetube-0.23.6/patch-build-script.patch @@ -0,0 +1,13 @@ +diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js +index 5b79d961..9f5945d2 100644 +--- a/_scripts/ebuilder.config.js ++++ b/_scripts/ebuilder.config.js +@@ -1,6 +1,8 @@ + const { name, productName } = require('../package.json') + + const config = { ++ electronVersion: "@electron-version@", ++ electronDist: "electron-dist", + appId: `io.freetubeapp.${name}`, + copyright: 'Copyleft © 2020-2024 freetubeapp@protonmail.com', + // asar: false, From 69581a50187f549c4ca150b765bed29db819a00d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 13 Aug 2025 21:09:27 +0200 Subject: [PATCH 084/204] sort some stuff in the notification bar thingy --- .../desktop/package-configs/plasma-desktop/default.nix | 3 +++ home-manager/hosts/EDI/lillian.nix | 1 + nixos/desktop/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index 7cae27a..ee3c721 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -93,6 +93,8 @@ hidden = [ "Xwayland Video Bridge_pipewireToXProxy" "org.kde.plasma.devicenotifier" + "org.kde.plasma.keyboardindicator" + "org.kde.plasma.keyboardlayout" "org.kde.kscreen" "org.kde.plasma.printmanager" "chrome_status_icon_1" @@ -100,6 +102,7 @@ "Nitrokey App" "qBittorrent" "vlc" + "obs" "steam" "nitrokey-app" ]; diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 1922c62..5aa1c76 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -16,6 +16,7 @@ ]; home.packages = with pkgs; [ + lutris ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a750ab7..fbb0ea7 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -107,8 +107,8 @@ programs = { # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently command-not-found.enable = lib.mkForce false; - # nix-index.enable = true; - # nix-index-database.comma.enable = true; + nix-index.enable = true; + nix-index-database.comma.enable = true; direnv = { enable = true; From 5db19b9f237267008133fe8a0281aa0cc2a87445 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 14 Aug 2025 20:31:48 +0200 Subject: [PATCH 085/204] Do all the iso setup --- flake.nix | 12 +++++ home-manager/hosts/iso/id_ed25519.pub | 1 + home-manager/hosts/iso/lillian.nix | 4 +- nixos/hosts/iso/configuration.nix | 66 ++++++++++++++------------- nixos/hosts/iso/secrets/sops.yaml | 14 +++--- nixos/shared/default.nix | 1 - 6 files changed, 54 insertions(+), 44 deletions(-) create mode 100644 home-manager/hosts/iso/id_ed25519.pub diff --git a/flake.nix b/flake.nix index 9382a34..2822f98 100644 --- a/flake.nix +++ b/flake.nix @@ -180,6 +180,18 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { + nixIso = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; + modules = + sharedModules + ++ desktopModules + ++ [ + ./nixos/hosts/iso/configuration.nix + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-base.nix" + ]; + }; + EDI = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; diff --git a/home-manager/hosts/iso/id_ed25519.pub b/home-manager/hosts/iso/id_ed25519.pub new file mode 100644 index 0000000..c1ae600 --- /dev/null +++ b/home-manager/hosts/iso/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKeZHHAEoUh/Ly9F1xUSPZLPNE0Yh/wM2qWgKvlEBa8A lillian@GLaDOS diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 1922c62..b76bd91 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -11,13 +11,11 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../desktop - ../../shared ]; home.packages = with pkgs; [ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; } diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index 1c45890..fd73d37 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -10,20 +10,20 @@ # outputs.homeManagerModules.example # outputs.nixosModules.contabo.wan inputs.home-manager.nixosModules.home-manager + outputs.nixosModules.vpn-ip # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.defaults # Import shared settings - ../../shared ]; - programs.command-not-found.enable = lib.mkForce false; - programs.nix-index.enable = true; - programs.nix-index-database.comma.enable = true; + # programs.command-not-found.enable = lib.mkForce false; + # programs.nix-index.enable = true; + # programs.nix-index-database.comma.enable = true; - boot.tmp.cleanOnBoot = true; - zramSwap.enable = false; - networking.domain = ""; + # boot.tmp.cleanOnBoot = true; + # zramSwap.enable = false; + # networking.domain = ""; services.openssh = { enable = true; # require public key authentication for better security @@ -45,7 +45,9 @@ #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys sops.defaultSopsFile = ./secrets/sops.yaml; - services.desktopManager.plasma6.enable = true; + services.vpn-ip.enable = false; + + # services.desktopManager.plasma6.enable = true; environment.systemPackages = with pkgs; [ # Custom tools @@ -65,7 +67,6 @@ sbctl tpm2-tools tpm2-tss - waydroid zsh # KDE/QT @@ -81,13 +82,14 @@ kdePackages.plasma-pa kdePackages.sddm-kcm kdePackages.dolphin-plugins - libportal-qt5 libportal ]; # Enable networking networking.networkmanager.enable = true; + networking.hostName = "iso"; + # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53" networking.firewall.enable = true; @@ -106,24 +108,24 @@ # Enable bluetooth hardware hardware.bluetooth.enable = true; - security.tpm2.enable = true; - security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so - security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables - users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices + # security.tpm2.enable = true; + # security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + # security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + # users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices # Set your time zone. time.timeZone = "Europe/Amsterdam"; - programs.git = { - enable = true; - }; + # programs.git = { + # enable = true; + # }; - programs.direnv = { - enable = true; - }; + # programs.direnv = { + # enable = true; + # }; - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; + # # Enable completion of system packages by zsh + # environment.pathsToLink = ["/share/zsh"]; # kde power settings do not turn off screen systemd = { @@ -136,17 +138,17 @@ }; }; - home-manager = { - extraSpecialArgs = {inherit inputs outputs;}; - users = { - # Import your home-manager configuration - lillian = import ../../../home-manager/hosts/iso; - }; - }; + # home-manager = { + # extraSpecialArgs = {inherit inputs outputs;}; + # users = { + # # Import your home-manager configuration + # lillian = import ../../../home-manager/hosts/iso; + # }; + # }; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - boot.supportedFilesystems = lib.mkForce ["bcachefs" "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; + # boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + # boot.supportedFilesystems = lib.mkForce ["bcachefs" "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.11"; + system.stateVersion = "25.11"; } diff --git a/nixos/hosts/iso/secrets/sops.yaml b/nixos/hosts/iso/secrets/sops.yaml index 92548c8..27763b5 100644 --- a/nixos/hosts/iso/secrets/sops.yaml +++ b/nixos/hosts/iso/secrets/sops.yaml @@ -1,9 +1,8 @@ lillian-password: ENC[AES256_GCM,data:eQzZwGxK9Lw2gc8HDNw57odxPzTH4sa/2O97h3VAghRwLClmCYKT91kxj2F3kQ4iEctBl0GxdS4WoL3H9eE4/CAPffXdTmkdYg==,iv:2ezB4DNHFv5ceJ2gtATV12Azm3vFFDLX1qSSy+cKuMY=,tag:zxb5agUCDpi92bYV7+DmoA==,type:str] +ssh-private-key: ENC[AES256_GCM,data:YQ+9aKpBL9XYl0IBxpPttUli6/E25alUhO36dZwPPSIBLI1ehyczocQMxNRYNtB2xKYx4wPaYIndLBhj9VdTUgaOWUd2C6aU6YgXgFAsjgEwqVDZWRp7TrTHojtrS5HnJgfopx6EqPf/uljD9yQsOkubDDUbpYkpWX/3vixm9LJ1eRXxTxXW8D3O5OM2Z1NsqA7meVa1xhvWJokqS4sD5ntp1HT78Xmu62EweHQVGaznUvWZupYh0uCQd0tr6GVTZLHdyCdaFUGHRbRddBcljpBIRWaWkhIrkjejvptUZ4Ht/UN5XM5z+zfU3DxsDOxeJ7m83om9I3WdZSdq1aDXe+VFEfMrx/0QTk2LtAmOvujcN6wO7a77SD4Rpuvq8KH2CeKrwMLlFf2BeGIcGhvAhRYUVxtypM38DEdbf/7xIcw0vQP2zNZN4QWdukUInDndnAxMfbIXKpYI5OPRaZMTVui41hkS86LBfbd5RhTjyzrtIpVSq9XkKRX7d5i8Gcjb4ORpQvrNNYMo+TXCiLNTg3/q0My/jEhfjfTF,iv:EpKC9judTZ1+0Y2LC1OK2YzGH/orRpZNtE7O+ZZyU1E=,tag:S6ju/FkwIBbBA8YU3dRo1A==,type:str] +nextcloud-password: ENC[AES256_GCM,data:5u8j1wau5FewTe+t3YZ365Acfcrt09XDgCUNpDbuVKaNZIEW3gdR60XACQeAvsyQeznynILJnz7/txV2,iv:l1xYhUkQGdWYNNy1lG9xB5SgL9cn2FdzAs19iVCohlA=,tag:rT0flG+v9wd8jSUm8DrCjg==,type:str] +wg-private-key: ENC[AES256_GCM,data:3JpyscuzK4LG1lfM3oyQNBHy7BQ2WeTaSyaZoaNfS4U7KkpEaCp5EVLBYiY=,iv:odDG8xp+d+O4FuECfeCJn/z2ka4KSzSBvgBCmcMZ0S0=,tag:iPwnqgtap+i44Mru/S7TyA==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -14,8 +13,7 @@ sops: dXlaN3dWOUl4Mys2V0x3Z3F6UVU4MVUKEJYpX8XhSNcM+7aUuxnIwrokY0/29Cnh yz0HAZkaj8FwvnPnafo5jmwVyi6WXECvX5E0NZfjKH4AF5vTu6Wukg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-03-20T18:17:48Z" - mac: ENC[AES256_GCM,data:3UHIoYPHC6n56CHguOVuoFd9VwCjGiD9VCYy2d5W+4XQEZpjnONX8fhwwWRm42COymz89tmqDmpDp88BnSU8uE14IaCIUoxfCaRiZtjAiHjouua2jr50aUV56pwyan8ZiiOjP8oP1VY/tsv1w0jWI9TjSTHvCdNLR8XEcf6bCrk=,iv:/lBJdkQgwZyiztQ9vSoHgY+WxXJKHFI93dxtOSunHNo=,tag:lLwrSdzoN9CzmyIdLOe5ig==,type:str] - pgp: [] + lastmodified: "2025-08-14T18:00:16Z" + mac: ENC[AES256_GCM,data:NnX0hMrfeKJucgqgVUIUS0WOHerkDtKe3P+4vvWRCMX3eXg4Tsju8pZySZP7RSZX7+2W3OUHMOUuAum0YrVasTXuhm6jPvlbqvRnVXaVzCNheIUvTCF7LFeJEOQYKS5m8AiVKFRrxz+dGn90DSeijjajSePBjo8AnKyAOQEt1S8=,iv:1iJiqJU0vdDiWnJAYDlbOBBa9lBOODjjdlsRH54aTGI=,tag:JZtgVeLvFN6vcCZkRnuNcQ==,type:str] unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.10.2 diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 3730051..0fa24d4 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -4,7 +4,6 @@ lib, config, pkgs, - mkIf, ... }: { imports = [ From aaef6b71361fbc829c66d1eb0c891049af8d81eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 18 Aug 2025 13:31:36 +0200 Subject: [PATCH 086/204] update flake lock --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index ab510d1..59d7042 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754727511, - "narHash": "sha256-iRqRCeeXEQ5HSB6zI6Wja7ZfY0PPRx5yelgjtoX2iMo=", + "lastModified": 1755511413, + "narHash": "sha256-cBBF+nwGrSroN6ZewHPFaSThyCvwBxSZMdYEH8DxDx8=", "owner": "catppuccin", "repo": "nix", - "rev": "7b55c4947c02f79dfd249432ccb0ada2726c29e2", + "rev": "ca11a19d4e1d2ba5e6162f40cb71288551fd51dd", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "crane_2": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1755499523, + "narHash": "sha256-Bh+S72huB2jFEPsOGlFXKFn7/VaV864IqxOcqaZZue0=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "f64ab1525b34d5d9202f5801db36f364075abde1", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1754613544, - "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", + "lastModified": 1755491080, + "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", + "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1754639028, - "narHash": "sha256-w1+XzPBAZPbeGLMAgAlOjIquswo6Q42PMep9KSrRzOA=", + "lastModified": 1755151620, + "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d49809278138d17be77ab0ef5506b26dc477fa62", + "rev": "16e12d22754d97064867006acae6e16da7a142a6", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1754195341, - "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", + "lastModified": 1755404379, + "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562", + "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1754746130, - "narHash": "sha256-HV0PzHvAhy6Nq667yrMl/VtsUpUL1R4GSieYr440YCE=", + "lastModified": 1755516526, + "narHash": "sha256-2SY3CaBf4e9HMbXBKfo8AQCa+lhNV5WbdnQ3lU5NNmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "abc81cb62ac76ba2105e55ce969f6e7bd1a860d3", + "rev": "2d8c1331ab590433b8ac42174e84fe68db4af601", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -718,11 +718,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1750865895, - "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", + "lastModified": 1754800730, + "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", + "rev": "641d909c4a7538f1539da9240dedb1755c907e40", "type": "github" }, "original": { @@ -857,11 +857,11 @@ ] }, "locked": { - "lastModified": 1750905536, - "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", + "lastModified": 1754880555, + "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", + "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754597531, - "narHash": "sha256-OpC9/PBIuL2WEJUkcuD/wVxI8r+3o6f5RylSIefjHo4=", + "lastModified": 1755378131, + "narHash": "sha256-0GKZEzTUcaoama56xaagKnMk5hqMbTUfGF4KfzLwje4=", "owner": "danth", "repo": "stylix", - "rev": "63bb34a66ad7d1af2e95ee20dd675896b2074c32", + "rev": "82242e0f9b1d91b6f170807a6ec622cfdb816eac", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1753722377, - "narHash": "sha256-L9CujCLS4PmpEhGKqezD4DognRNcYDz/oAL7T8jqCxk=", + "lastModified": 1754932774, + "narHash": "sha256-gJQZS6M2x5oPs089/9kAy0EIriEauUKEm0UNF7HEl6o=", "owner": "dj95", "repo": "zjstatus", - "rev": "f6c28d9b780891afa693d1b9be4384b16ae7a578", + "rev": "0a963622fa5cd3d62d6ee9b82f78eacd52ae5647", "type": "github" }, "original": { From d04143fd72f245474bca9ead7fcbe0bcba444ec6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Aug 2025 16:46:49 +0200 Subject: [PATCH 087/204] Disable nix-index, put some folder icons in place for plasma --- .../package-configs/plasma-desktop/default.nix | 16 ++++++++++++++++ nixos/desktop/default.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index ee3c721..721e0ba 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -28,6 +28,22 @@ target = ".config/kdeconnect/config"; force = true; }; + home.file."Games/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-games + ''; + target = "Games/.directory"; + force = true; + }; + home.file."Code/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-script + ''; + target = "Code/.directory"; + force = true; + }; programs.plasma = { enable = true; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index fbb0ea7..d04e588 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -107,7 +107,7 @@ programs = { # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently command-not-found.enable = lib.mkForce false; - nix-index.enable = true; + # nix-index.enable = true; nix-index-database.comma.enable = true; direnv = { diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index b39a571..8b53eaf 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -29,7 +29,7 @@ programs = { # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently command-not-found.enable = lib.mkForce false; - nix-index.enable = true; + # nix-index.enable = true; nix-index-database.comma.enable = true; }; services = { From d7ae543cc29dee5a423990f409048f8b6e844668 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 19 Aug 2025 16:56:10 +0200 Subject: [PATCH 088/204] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 59d7042..566889e 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1755499523, - "narHash": "sha256-Bh+S72huB2jFEPsOGlFXKFn7/VaV864IqxOcqaZZue0=", + "lastModified": 1755519972, + "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", "owner": "nix-community", "repo": "disko", - "rev": "f64ab1525b34d5d9202f5801db36f364075abde1", + "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1755491080, - "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", + "lastModified": 1755601933, + "narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", + "rev": "8af2e064f93234ee79df8b9858eeefbf84394488", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1755516526, - "narHash": "sha256-2SY3CaBf4e9HMbXBKfo8AQCa+lhNV5WbdnQ3lU5NNmU=", + "lastModified": 1755614705, + "narHash": "sha256-7HdM+nKdMw/F8sawPyDDhWaIhiEZpoq1UeH/L/SXFIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d8c1331ab590433b8ac42174e84fe68db4af601", + "rev": "8d36b325c265d26634e5d8936c40503be844018b", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755378131, - "narHash": "sha256-0GKZEzTUcaoama56xaagKnMk5hqMbTUfGF4KfzLwje4=", + "lastModified": 1755546184, + "narHash": "sha256-KxRj/8SydDk3gzamS0VEewo5pu8JAYhSZ5GPcImPGNQ=", "owner": "danth", "repo": "stylix", - "rev": "82242e0f9b1d91b6f170807a6ec622cfdb816eac", + "rev": "9810b32b9b7520e3b37358ff8e793fb5034c3299", "type": "github" }, "original": { From e6c6bd012ffa4502dc399a8be462bdaf6996f791 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 20 Aug 2025 14:30:52 +0200 Subject: [PATCH 089/204] make a little service to start the VPN only after network is connected to hopefully fix the VPN blocking wifi on shodan issue --- nixos/shared/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 3730051..0cef737 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -188,6 +188,23 @@ }; }; + systemd.services."start-vpn-wg" = + if config.services.vpn-ip.enable + then { + path = with pkgs; [systemd]; + enable = true; + unitConfig = { + Wants = "network-online.target"; + After = "network-online.target"; + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.systemd}/bin/systemctl start wg-quick-wg0.service"; + RemainAfterExit = "yes"; + }; + } + else {}; + networking = if config.services.vpn-ip.enable then { @@ -195,7 +212,7 @@ wg-quick.interfaces = { wg0 = { - autostart = true; + autostart = false; address = ["10.0.0.${config.services.vpn-ip.ip}/24" "fdc9:281f:04d7:9ee9::${config.services.vpn-ip.ip}/64"]; dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"]; listenPort = 51821; From 374bf4d63a87012c1ae9d69fd0174d7709036557 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Aug 2025 12:23:12 +0200 Subject: [PATCH 090/204] set up the mullvad VPN for wheatley (untested) --- nixos/hosts/wheatley/configuration.nix | 49 +++++++++++++++++++++----- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 8b53eaf..c0fc5de 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -220,6 +220,35 @@ # wg public key for host: A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg= # TODO: generate this dynamically based on other hosts + mullvad = { + address = ["10.70.93.226/32" "fc00:bbbb:bbbb:bb01::7:5de1/128"]; + listenPort = 51820; + privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; + dns = ["100.64.0.7"]; + extraOptions = { + FwMark = 51820; + }; + + postUp = '' + ${pkgs.iproute2}/bin/ip rule add from 192.168.2.43 table main + ${pkgs.iptables}/bin/iptables -t mangle -A PREROUTING -i end0 -j CONNMARK --set-mark 51820 + ${pkgs.iptables}/bin/iptables -t mangle -A PREROUTING -m connmark --mark 51820 -j MARK --set-mark 51820 + ''; + + preDown = '' + ${pkgs.iproute2}/bin/ip rule del from 192.168.2.43 table main + ${pkgs.iptables}/bin/iptables -t mangle -D PREROUTING -i end0 -j CONNMARK --set-mark 51820 + ${pkgs.iptables}/bin/iptables -t mangle -D PREROUTING -m connmark --mark 51820 -j MARK --set-mark 51820 + ''; + + peers = [ + { + publicKey = "UrQiI9ISdPPzd4ARw1NHOPKKvKvxUhjwRjaI0JpJFgM="; + allowedIPs = ["0.0.0.0/0" "::0/0"]; + endpoint = "193.32.249.66:51820"; + } + ]; + }; wg1 = { # Determines the IP address and subnet of the server's end of the tunnel interface. address = ["10.0.0.1/24" "fdc9:281f:04d7:9ee9::1/64"]; @@ -229,22 +258,26 @@ # This allows the wireguard server to route your traffic to the internet and hence be like a VPN postUp = '' - ${pkgs.iptables}/bin/iptables -A FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.0.0.1/24 -o eth0 -j MASQUERADE - ${pkgs.iptables}/bin/ip6tables -A FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s fdc9:281f:04d7:9ee9::1/64 -o eth0 -j MASQUERADE + ${pkgs.iptables}/bin/iptables -A FORWARD -i wg1 -j ACCEPT + ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s mullvad -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/ip6tables -A FORWARD -i wg1 -j ACCEPT + ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s mullvad -o end0 -j MASQUERADE ''; # Undo the above preDown = '' - ${pkgs.iptables}/bin/iptables -D FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.0.0.1/24 -o eth0 -j MASQUERADE - ${pkgs.iptables}/bin/ip6tables -D FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s fdc9:281f:04d7:9ee9::1/64 -o eth0 -j MASQUERADE + ${pkgs.iptables}/bin/iptables -D FORWARD -i wg1 -j ACCEPT + ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s mullvad -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/ip6tables -D FORWARD -i wg1 -j ACCEPT + ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s mullvad -o end0 -j MASQUERADE ''; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; + extraOptions = { + FwMark = 51820; + }; + peers = [ { #GLaDOS public key From 015061c001892ad034be527efbbd54f7389e1fe0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 23 Aug 2025 15:26:59 +0200 Subject: [PATCH 091/204] remove endpoint from the mullvad because it doesn't need it --- nixos/hosts/wheatley/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index c0fc5de..a283a13 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -222,7 +222,6 @@ # TODO: generate this dynamically based on other hosts mullvad = { address = ["10.70.93.226/32" "fc00:bbbb:bbbb:bb01::7:5de1/128"]; - listenPort = 51820; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; dns = ["100.64.0.7"]; extraOptions = { From 9749e5bd5520059da41edb8e97ffc205cf164f1a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Aug 2025 12:15:58 +0200 Subject: [PATCH 092/204] do a small amount of refactoring, change versions to 25.11, and make a systemd unit to upgrade nextcloud daily on queen --- home-manager/hosts/EDI/lillian.nix | 2 +- home-manager/hosts/GLaDOS/lillian.nix | 2 +- home-manager/hosts/shodan/lillian.nix | 2 +- home-manager/hosts/wheatley/lillian.nix | 2 +- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 27 +++++++- nixos/hosts/shodan/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- nixos/shared/default.nix | 90 +++++++++++++------------ 10 files changed, 81 insertions(+), 52 deletions(-) diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 5aa1c76..6d2719a 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -20,5 +20,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; } diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index cc55531..7097090 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -30,5 +30,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; } diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index d763022..7a115b0 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -110,5 +110,5 @@ programs.plasma.kscreenlocker.passwordRequired = false; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; } diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix index 9bd29f7..d190612 100644 --- a/home-manager/hosts/wheatley/lillian.nix +++ b/home-manager/hosts/wheatley/lillian.nix @@ -35,5 +35,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; } diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index d52551f..373915f 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -57,5 +57,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; } diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index ee0bf07..238dd13 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -95,5 +95,5 @@ users.users.lillian.extraGroups = ["gamemode"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 40d1028..e0041fa 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -3,6 +3,7 @@ outputs, lib, pkgs, + config, ... }: { imports = [ @@ -90,6 +91,30 @@ enable = false; }; + systemd = { + services."upgrade-nextcloud" = { + path = with pkgs; [nextcloud31]; + enable = true; + unitConfig = { + after = "nextcloud-setup.service"; + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${config.services.nextcloud.occ}/bin/nextcloud-occ upgrade"; + RemainAfterExit = "yes"; + }; + }; + + timers."upgrade-nextcloud" = { + wantedBy = ["timers.target"]; + partOf = ["upgrade-nextcloud.service"]; + timerConfig = { + OnCalendar = "daily"; + Unit = "nextcloud-setup.service"; + }; + }; + }; + networking = { domain = ""; @@ -192,5 +217,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 1f5594c..accf28c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -275,5 +275,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; } diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index a283a13..9402ef1 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -383,6 +383,6 @@ services.cage.enable = true; nixpkgs.config.kodi.enableAdvancedLauncher = true; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; nixpkgs.hostPlatform = lib.mkForce "aarch64-linux"; } diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 0cef737..cd85ee7 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -4,7 +4,6 @@ lib, config, pkgs, - mkIf, ... }: { imports = [ @@ -91,13 +90,15 @@ # grub.enable = false; }; - programs.zsh = { - enable = true; - }; + programs = { + zsh = { + enable = true; + }; - programs.gnupg.agent = { - enable = true; - enableBrowserSocket = true; + gnupg.agent = { + enable = true; + enableBrowserSocket = true; + }; }; stylix = { @@ -174,36 +175,37 @@ # sansSerif = ["Atkinson Hyperlegible"]; # }; }; - - systemd.services."shutdown-zellij-zsh" = { - path = with pkgs; [killall]; - enable = true; - unitConfig = { - Before = "shutdown.target"; - }; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.killall}/bin/killall -SIGKILL zellij zsh"; - RemainAfterExit = "yes"; - }; - }; - - systemd.services."start-vpn-wg" = - if config.services.vpn-ip.enable - then { - path = with pkgs; [systemd]; + systemd = { + services."shutdown-zellij-zsh" = { + path = with pkgs; [killall]; enable = true; unitConfig = { - Wants = "network-online.target"; - After = "network-online.target"; + Before = "shutdown.target"; }; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.systemd}/bin/systemctl start wg-quick-wg0.service"; + ExecStart = "${pkgs.killall}/bin/killall -SIGKILL zellij zsh"; RemainAfterExit = "yes"; }; - } - else {}; + }; + + services."start-vpn-wg" = + if config.services.vpn-ip.enable + then { + path = with pkgs; [systemd]; + enable = true; + unitConfig = { + Wants = "network-online.target"; + After = "network-online.target"; + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.systemd}/bin/systemctl start wg-quick-wg0.service"; + RemainAfterExit = "yes"; + }; + } + else {}; + }; networking = if config.services.vpn-ip.enable @@ -252,20 +254,22 @@ }; users = { - users.lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; - shell = pkgs.zsh; - hashedPasswordFile = config.sops.secrets."lillian-password".path; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS" - ]; + users = { + lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; + shell = pkgs.zsh; + hashedPasswordFile = config.sops.secrets."lillian-password".path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS" + ]; + }; + + root = { + hashedPassword = "*"; + }; }; mutableUsers = false; - - users.root = { - hashedPassword = "*"; - }; }; } From ef966abfd4dd614b61099a46bdce307a1f358cfa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Aug 2025 14:58:36 +0200 Subject: [PATCH 093/204] update flake lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 566889e..7ef6959 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755511413, - "narHash": "sha256-cBBF+nwGrSroN6ZewHPFaSThyCvwBxSZMdYEH8DxDx8=", + "lastModified": 1756028045, + "narHash": "sha256-j6ehEdta7YnXtk42cdYQEElCKfnbe24yfeHJwszgyes=", "owner": "catppuccin", "repo": "nix", - "rev": "ca11a19d4e1d2ba5e6162f40cb71288551fd51dd", + "rev": "ad015344f592b6ebb82de853b747dd577926ec77", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1755519972, - "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", + "lastModified": 1756115622, + "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", "owner": "nix-community", "repo": "disko", - "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", + "rev": "bafad29f89e83b2d861b493aa23034ea16595560", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1755601933, - "narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=", + "lastModified": 1756022458, + "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8af2e064f93234ee79df8b9858eeefbf84394488", + "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1755931229, + "narHash": "sha256-j8ghatY34DbEnHe42r8VtAe05WyMUK+d66uGKsfLbbk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "bcad5af8eb475df936f6cf2d04b076dc6784af95", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1756008611, + "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "52dec1cb33a614accb9e01307e17816be974d24d", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1755614705, - "narHash": "sha256-7HdM+nKdMw/F8sawPyDDhWaIhiEZpoq1UeH/L/SXFIs=", + "lastModified": 1756125962, + "narHash": "sha256-lPH73WcPmqs1o3tzczrqEAGKCIZmTrJG++uzrKb2rMk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d36b325c265d26634e5d8936c40503be844018b", + "rev": "215c901e6caa3a87579dbab4edc6adcea4fb4359", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1754605910, - "narHash": "sha256-kVWxzm44ywJTb4REfwWCYXnROISykG0yE+X5A3Gov24=", + "lastModified": 1755996068, + "narHash": "sha256-+KP2Lu813lX0sfKTP6Nc4ulaE/EDIDmWUQVX9S850Yg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "57d9624c71ca65bee69b30d72b11f6c5257e9500", + "rev": "cc5f1804270d138f268a6f2d64c383fb4cf59ad0", "type": "gitlab" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755546184, - "narHash": "sha256-KxRj/8SydDk3gzamS0VEewo5pu8JAYhSZ5GPcImPGNQ=", + "lastModified": 1755997543, + "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", "owner": "danth", "repo": "stylix", - "rev": "9810b32b9b7520e3b37358ff8e793fb5034c3299", + "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", "type": "github" }, "original": { From 789d6a76679e960d902ae2e378735d70a48cac0c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 25 Aug 2025 15:03:23 +0200 Subject: [PATCH 094/204] freetube is updated, replace it again --- nixos/desktop/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index d04e588..41689cc 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -36,7 +36,6 @@ dvt servo restart - freetube-0236 # System tools aha @@ -92,7 +91,7 @@ #rustdesk ]) ++ (with pkgs-edge; [ - # freetube + freetube # list of latest packages from nixpkgs master # Can be used to install latest version of some packages ]); From 33c0ba323807527c6533a330c1d1738024e90c32 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 26 Aug 2025 14:05:24 +0200 Subject: [PATCH 095/204] hopefully fix the wheatley issue by adding mullvad to the internal network --- nixos/desktop/default.nix | 15 ++++++++------- nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 41689cc..e64e83e 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -30,7 +30,7 @@ }; environment.systemPackages = - (with pkgs; [ + with pkgs; [ # Custom tools dvd dvt @@ -85,16 +85,17 @@ libportal # User tools + freetube noisetorch qjackctl wireplumber #rustdesk - ]) - ++ (with pkgs-edge; [ - freetube - # list of latest packages from nixpkgs master - # Can be used to install latest version of some packages - ]); + ] + # ++ (with pkgs-edge; [ + # list of latest packages from nixpkgs master + # Can be used to install latest version of some packages + # ]) + ; sops = { secrets."nextcloud-password" = { mode = "0600"; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 9402ef1..3b4b4dd 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -306,7 +306,7 @@ # enable NAT enable = true; externalInterface = "end0"; - internalInterfaces = ["wg1"]; + internalInterfaces = ["wg1" "mullvad"]; }; firewall = { enable = true; From bdf5b1c62ebe04973f59371847918d3201e8808e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Aug 2025 19:19:10 +0200 Subject: [PATCH 096/204] let's try this fix for the vpn then --- nixos/hosts/wheatley/configuration.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 3b4b4dd..3139423 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -176,14 +176,14 @@ # Configure DNS servers manually (this example uses Cloudflare and Google DNS) # IPv6 DNS servers can be used here as well. - nameservers = [ + #nameservers = [ # "127.0.0.1" # "::1" - "94.140.14.49" - "94.140.14.59" - "2a10:50c0:0:0:0:0:ded:ff" - "2a10:50c0:0:0:0:0:ded:ff" - ]; + #"94.140.14.49" + #"94.140.14.59" + #"2a10:50c0:0:0:0:0:ded:ff" + #"2a10:50c0:0:0:0:0:ded:ff" + #]; wireguard.enable = true; @@ -220,7 +220,7 @@ # wg public key for host: A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg= # TODO: generate this dynamically based on other hosts - mullvad = { + wg0 = { address = ["10.70.93.226/32" "fc00:bbbb:bbbb:bb01::7:5de1/128"]; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; dns = ["100.64.0.7"]; @@ -258,17 +258,17 @@ # This allows the wireguard server to route your traffic to the internet and hence be like a VPN postUp = '' ${pkgs.iptables}/bin/iptables -A FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s mullvad -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s wg0 -o end0 -j MASQUERADE ${pkgs.iptables}/bin/ip6tables -A FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s mullvad -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s wg0 -o end0 -j MASQUERADE ''; # Undo the above preDown = '' ${pkgs.iptables}/bin/iptables -D FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s mullvad -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s wg0 -o end0 -j MASQUERADE ${pkgs.iptables}/bin/ip6tables -D FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s mullvad -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s wg0 -o end0 -j MASQUERADE ''; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; @@ -306,7 +306,7 @@ # enable NAT enable = true; externalInterface = "end0"; - internalInterfaces = ["wg1" "mullvad"]; + internalInterfaces = ["wg1" "wg0"]; }; firewall = { enable = true; @@ -318,6 +318,7 @@ 80 # http 443 # https 51821 # wg + 51820 # wg-mullvad 7878 53 # dnsmasq ]; From 18f37728770e56b9ec3ecf3e3a161045f2222f9e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Aug 2025 19:40:39 +0200 Subject: [PATCH 097/204] seemed to have fucked up the copying from the example, let's try this and the iptable commands should work (tested them locally) --- nixos/hosts/wheatley/configuration.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 3139423..f204786 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -228,6 +228,8 @@ FwMark = 51820; }; + listenPort = 51820; + postUp = '' ${pkgs.iproute2}/bin/ip rule add from 192.168.2.43 table main ${pkgs.iptables}/bin/iptables -t mangle -A PREROUTING -i end0 -j CONNMARK --set-mark 51820 @@ -258,17 +260,17 @@ # This allows the wireguard server to route your traffic to the internet and hence be like a VPN postUp = '' ${pkgs.iptables}/bin/iptables -A FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s wg0 -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -o wg0 -j MASQUERADE ${pkgs.iptables}/bin/ip6tables -A FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s wg0 -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -o wg0 -j MASQUERADE ''; # Undo the above preDown = '' ${pkgs.iptables}/bin/iptables -D FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s wg0 -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -o wg0 -j MASQUERADE ${pkgs.iptables}/bin/ip6tables -D FORWARD -i wg1 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s wg0 -o end0 -j MASQUERADE + ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -o wg0 -j MASQUERADE ''; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; From eb338806a8309b183be685c541e4d7216230f4c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Aug 2025 19:50:13 +0200 Subject: [PATCH 098/204] do DNS via mullvad too --- nixos/hosts/wheatley/configuration.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index f204786..9e41ad8 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -176,14 +176,10 @@ # Configure DNS servers manually (this example uses Cloudflare and Google DNS) # IPv6 DNS servers can be used here as well. - #nameservers = [ - # "127.0.0.1" - # "::1" - #"94.140.14.49" - #"94.140.14.59" - #"2a10:50c0:0:0:0:0:ded:ff" - #"2a10:50c0:0:0:0:0:ded:ff" - #]; + nameservers = [ + "194.242.2.4" + "2a07:e340::4" + ]; wireguard.enable = true; From 46a1c12d62ba6fbfab76dfe4657eb27d00d0a351 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Aug 2025 21:36:00 +0200 Subject: [PATCH 099/204] change mullvad server --- nixos/hosts/wheatley/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 9e41ad8..28a1181 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -217,7 +217,7 @@ # wg public key for host: A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg= # TODO: generate this dynamically based on other hosts wg0 = { - address = ["10.70.93.226/32" "fc00:bbbb:bbbb:bb01::7:5de1/128"]; + address = ["10.74.231.122/32" "fc00:bbbb:bbbb:bb01::b:e779/128"]; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; dns = ["100.64.0.7"]; extraOptions = { @@ -242,7 +242,7 @@ { publicKey = "UrQiI9ISdPPzd4ARw1NHOPKKvKvxUhjwRjaI0JpJFgM="; allowedIPs = ["0.0.0.0/0" "::0/0"]; - endpoint = "193.32.249.66:51820"; + endpoint = "195.47.194.161:51820"; } ]; }; From 982eb8623b6be6a9339dbb72c450627cdef1d8b7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Aug 2025 21:46:17 +0200 Subject: [PATCH 100/204] actually fix vpn now --- nixos/hosts/wheatley/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 28a1181..8929122 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -217,7 +217,7 @@ # wg public key for host: A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg= # TODO: generate this dynamically based on other hosts wg0 = { - address = ["10.74.231.122/32" "fc00:bbbb:bbbb:bb01::b:e779/128"]; + address = ["10.70.93.226/32" "fc00:bbbb:bbbb:bb01::7:5de1/128"]; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; dns = ["100.64.0.7"]; extraOptions = { @@ -240,7 +240,7 @@ peers = [ { - publicKey = "UrQiI9ISdPPzd4ARw1NHOPKKvKvxUhjwRjaI0JpJFgM="; + publicKey = "LOd1SY9YCHGiJUVT+XdYRdORu6ZMw4CqOKQBW2ElLg8="; allowedIPs = ["0.0.0.0/0" "::0/0"]; endpoint = "195.47.194.161:51820"; } From 2381bab4879091643595d20aab2cabe6117c26e9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Aug 2025 21:58:49 +0200 Subject: [PATCH 101/204] let's try another server I guess --- nixos/hosts/wheatley/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 8929122..5c1e50b 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -240,9 +240,9 @@ peers = [ { - publicKey = "LOd1SY9YCHGiJUVT+XdYRdORu6ZMw4CqOKQBW2ElLg8="; + publicKey = "+8dUgpD7YA4wMPnRQkO7EI7AeYd30QPMKh/hOaaGIXY="; allowedIPs = ["0.0.0.0/0" "::0/0"]; - endpoint = "195.47.194.161:51820"; + endpoint = "194.127.167.107:51820"; } ]; }; From 13a8d925bbe476b98a0994c139c87cbae43e21e1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 27 Aug 2025 22:23:13 +0200 Subject: [PATCH 102/204] youtube worked with this one let's test it --- nixos/hosts/wheatley/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 5c1e50b..277a2a6 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -240,9 +240,9 @@ peers = [ { - publicKey = "+8dUgpD7YA4wMPnRQkO7EI7AeYd30QPMKh/hOaaGIXY="; + publicKey = "/wPQafVa/60OIp8KqhC1xTTG+nQXZF17uo8XfdUnz2E="; allowedIPs = ["0.0.0.0/0" "::0/0"]; - endpoint = "194.127.167.107:51820"; + endpoint = "31.171.154.50:51820"; } ]; }; From a7cdc4d20d4cd07d2fe555c8a82feac55c0fc04a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Aug 2025 13:35:52 +0200 Subject: [PATCH 103/204] Add some documentation to the readme and justfile --- README.md | 5 ++++- justfile | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31f5291..802719f 100644 --- a/README.md +++ b/README.md @@ -56,4 +56,7 @@ The secrets are managed in sops files within the hosts folders, there is only on ``nix-shell -p sops --run "sops ./nixos/hosts//secrets/sops.yaml"`` -This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **\$SOPS_AGE_KEY_FILE** environment variable, or setting the **\$SOPS_AGE_KEY** environment variable to the key itself. \ No newline at end of file +This requires your system to have the keyfile available for sops to use, by default sops looks in the sops/age folder in your user folder for a keys.txt file with the private key. You can change this behaviour by setting the **\$SOPS_AGE_KEY_FILE** environment variable, or setting the **\$SOPS_AGE_KEY** environment variable to the key itself. + +### [Just](https://github.com/casey/just) +This repo uses just as a command runner for setting up and building the nixos files more easily. The programs needed to run all the commands are nix, just, and nom (nix output monitor). The commands you can use can be found in the justfile (named justfile in the root of this repo). This is purely for convenience, it doesn't add anything you could not manually do, it just automates a lot of steps. diff --git a/justfile b/justfile index 0406689..dba9460 100644 --- a/justfile +++ b/justfile @@ -1,22 +1,29 @@ +# Build the nixos configuration and switch to it build: sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json +# Build the nixos configuration bot don't switch to it until a reboot boot: sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v boot --flake .# --show-trace |& nom --json +# Run the nix flake in the nix repl run: nix-repl -f flake:nixpkgs +# Check the nix configuration for errors test: sudo echo "sudo check..." && sudo nix flake check --show-trace --log-format internal-json -v |& nom --json +# Update the flake lock update: nix flake update --log-format internal-json -v |& nom --json && zsh +# Clean your nix store and optimize it clean: sudo nix-collect-garbage sudo nix-store --optimise +# Set up the commit hook for testing before doing a commit setup: #!/run/current-system/sw/bin/bash -e if [ -s ./.git/hooks/pre-commit ]; then @@ -30,8 +37,8 @@ setup: else echo "just test" >> ./.git/hooks/pre-commit && chmod +x ./.git/hooks/pre-commit fi - +# Make sure all the git actions of pulling, adding all files, committing, and pushing are done in one command push: git pull git add * From 6ebfe53cb518bc1bdced2abaed3f7da006d5430c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Aug 2025 13:47:16 +0200 Subject: [PATCH 104/204] add documentation for the bash scripts in $PATH --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 802719f..28f2521 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,16 @@ To test if your build succeeds the basic checks and can start building the artif Note: this does not build the full configuration, and errors might still happen in deployment, especially for dependencies that rely on external services like webservers to be called. For obvious reasons the test building does not actually pull in all the artifacts, and does not make external calls aside from to the package files (You will need a built nix store, or a connection to the git repository that hosts your packages, like an internet connection to github, to make the test run) +## Post installation + +I have made a few commands for post installation (and for an iso installer to use) that make life a bit easier, they are automatically added to the [$PATH](https://en.wikipedia.org/wiki/PATH_(variable)). The commands will automatically inhibit sleep and standby so you don't have to worry about them getting interrupted. +| Command | Effect | +| ------------- | ------------- | +| rebuild | Use the latest version of the repo and do a nixos-rebuild switch on it to upgrade your system. | +| update | Update the flake lock in the repo, run a test to see if nothing breaks, and then push the flake lock update done to the repo. | +| upgrade | Run update and rebuild one after the other, useful for a quick upgrade. | +| install | Run a script that automatically lets you select a host to format the disks with disko, install nixos on that disk, and deploy the entire configuration. (useful for instal USBs) | + ## Technical details ### [Home manager](https://github.com/nix-community/home-manager) From 6892e7f3691dd435572328a444dabb4aa10bbd37 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 28 Aug 2025 17:01:48 +0200 Subject: [PATCH 105/204] disable iso for now since it's throwing an error and I don't need it --- flake.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 2822f98..8efc263 100644 --- a/flake.nix +++ b/flake.nix @@ -180,17 +180,17 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { - nixIso = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = - sharedModules - ++ desktopModules - ++ [ - ./nixos/hosts/iso/configuration.nix - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-base.nix" - ]; - }; + # nixIso = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = + # sharedModules + # ++ desktopModules + # ++ [ + # ./nixos/hosts/iso/configuration.nix + # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-base.nix" + # ]; + # }; EDI = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; From 1ddaa24297e57cab1924480d677e527f8146b884 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 30 Aug 2025 12:21:44 +0200 Subject: [PATCH 106/204] delete temp.nix --- temp.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 temp.nix diff --git a/temp.nix b/temp.nix deleted file mode 100644 index e69de29..0000000 From d6e365af6ca2b6a07560b8fa28a2b8a18c038e72 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Sep 2025 12:48:40 +0200 Subject: [PATCH 107/204] update stylix to use kde instead of depracated kde6 --- flake.lock | 70 ++++++++++++++-------------- flake.nix | 6 +-- nixos/hosts/shodan/configuration.nix | 2 +- nixos/shared/default.nix | 1 + 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 7ef6959..fc0cdf3 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756028045, - "narHash": "sha256-j6ehEdta7YnXtk42cdYQEElCKfnbe24yfeHJwszgyes=", + "lastModified": 1756365413, + "narHash": "sha256-rWJqnFNh+xAoXLPMOUWvb2jMUUgGs4PKI/p2lgUczBA=", "owner": "catppuccin", "repo": "nix", - "rev": "ad015344f592b6ebb82de853b747dd577926ec77", + "rev": "842da43be0d00d7cf4c26faf279bc71a614c259b", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "lastModified": 1756683562, + "narHash": "sha256-3fcIqwm1u+rF3kkgUYYEIcLrs93+Pi+a6AwiEAxdP5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "rev": "fccb44df77266a3891939f35197f538dace3442f", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755931229, - "narHash": "sha256-j8ghatY34DbEnHe42r8VtAe05WyMUK+d66uGKsfLbbk=", + "lastModified": 1756638688, + "narHash": "sha256-ddxbPTnIchM6tgxb6fRrCvytlPE2KLifckTnde/irVQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bcad5af8eb475df936f6cf2d04b076dc6784af95", + "rev": "e7b8679cba79f4167199f018b05c82169249f654", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1756008611, - "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", + "lastModified": 1756612744, + "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "52dec1cb33a614accb9e01307e17816be974d24d", + "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1756125962, - "narHash": "sha256-lPH73WcPmqs1o3tzczrqEAGKCIZmTrJG++uzrKb2rMk=", + "lastModified": 1756721953, + "narHash": "sha256-IEMpoYJPwD3nCtcRhpiB69TVhXjEHwFW7FA/PJs1S8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215c901e6caa3a87579dbab4edc6adcea4fb4359", + "rev": "a2939a55be7684222dc652249ea33505f6927ca4", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1756125398, + "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1754501628, - "narHash": "sha256-FExJ54tVB5iu7Dh2tLcyCSWpaV+lmUzzWKZUkemwXvo=", + "lastModified": 1756632588, + "narHash": "sha256-ydam6eggXf3ZwRutyCABwSbMAlX+5lW6w1SVZQ+kfSo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "cca090f8115c4172b9aef6c5299ae784bdd5e133", + "rev": "d47428e5390d6a5a8f764808a4db15929347cd77", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1755996068, - "narHash": "sha256-+KP2Lu813lX0sfKTP6Nc4ulaE/EDIDmWUQVX9S850Yg=", + "lastModified": 1756130152, + "narHash": "sha256-3qcN28djoBqqhEqOv8ve3/+wD0lLR2YCVV1EZ4SYfjo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "cc5f1804270d138f268a6f2d64c383fb4cf59ad0", + "rev": "b49ae46f226430854102c207fdcb55e2de8e884e", "type": "gitlab" }, "original": { @@ -932,13 +932,13 @@ "locked": { "lastModified": 1755997543, "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", "type": "github" }, "original": { - "owner": "danth", + "owner": "nix-community", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 8efc263..102f217 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,7 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; # Stylix theming engine - stylix.url = "github:danth/stylix"; + stylix.url = "github:nix-community/stylix"; }; outputs = { @@ -144,7 +144,7 @@ ./nixos/desktop { home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.plasma-manager.homeModules.plasma-manager ./home-manager/desktop ]; } @@ -248,7 +248,7 @@ jovian.nixosModules.jovian { home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.plasma-manager.homeModules.plasma-manager ]; } ]; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index accf28c..187141d 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -148,7 +148,7 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji qjackctl - jellyfin-media-player + # jellyfin-media-player #rustdesk sbctl diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index cd85ee7..9e5f954 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -102,6 +102,7 @@ }; stylix = { + targets.qt.platform = lib.mkForce "kde"; enable = true; # targets.qt.platform = "kde6"; autoEnable = true; From 6de092dae0874cbf20fb49252fcdd548cb911785 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Sep 2025 16:22:26 +0200 Subject: [PATCH 108/204] update flake lock and fix stylix --- nixos/shared/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 9e5f954..2f18fc2 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -13,7 +13,7 @@ #../hosts/${config.networking.hostName}/hardware-configuration.nix ]; sops = { - age.keyFile = ../../../../../../var/secrets/keys.txt; + age.keyFile = "var/secrets/keys.txt"; secrets."lillian-password".neededForUsers = true; defaultSopsFile = ../hosts/${config.networking.hostName}/secrets/sops.yaml; From 4530b83d76601ca7db5769f1405559a3e6011492 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Sep 2025 16:28:18 +0200 Subject: [PATCH 109/204] fix hyfetch settings --- home-manager/shared/shell/hyfetch.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 774a3d7..00f2035 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -10,6 +10,7 @@ mode = "horizontal"; }; backend = "neofetch"; + pride_month_disable = false; }; }; } From 906c9c7fafdb154aac18ba08d8bae26932d8b92d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Sep 2025 13:18:02 +0200 Subject: [PATCH 110/204] fix lanzaboote locations for shodan and edi --- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 373915f..b88a5e5 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -48,7 +48,7 @@ lanzaboote = { enable = true; - pkiBundle = "/etc/secureboot"; + pkiBundle = "/var/lib/sbctl"; }; kernelModules = [ "iwlmvm" diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 187141d..e25db66 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -46,7 +46,7 @@ lanzaboote = { enable = true; - pkiBundle = "/etc/secureboot"; + pkiBundle = "/var/lib/sbctl"; }; consoleLogLevel = 0; kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; From bd3378ad47f78911a4e66ae20e7c30fffd27c44e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 3 Sep 2025 20:37:43 +0200 Subject: [PATCH 111/204] update flake lock --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index fc0cdf3..3fdb835 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756365413, - "narHash": "sha256-rWJqnFNh+xAoXLPMOUWvb2jMUUgGs4PKI/p2lgUczBA=", + "lastModified": 1756741629, + "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=", "owner": "catppuccin", "repo": "nix", - "rev": "842da43be0d00d7cf4c26faf279bc71a614c259b", + "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1756115622, - "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", + "lastModified": 1756733629, + "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", "owner": "nix-community", "repo": "disko", - "rev": "bafad29f89e83b2d861b493aa23034ea16595560", + "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1756683562, - "narHash": "sha256-3fcIqwm1u+rF3kkgUYYEIcLrs93+Pi+a6AwiEAxdP5g=", + "lastModified": 1756903364, + "narHash": "sha256-vZh/YH2D7oDFek10r0TbGn3qJrqGv69sSP+oF8PFDqQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fccb44df77266a3891939f35197f538dace3442f", + "rev": "6159629d05a0e92bb7fb7211e74106ae1d552401", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1754297745, - "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", + "lastModified": 1756744479, + "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", + "rev": "747b7912f49e2885090c83364d88cf853a020ac1", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1756750488, + "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1756721953, - "narHash": "sha256-IEMpoYJPwD3nCtcRhpiB69TVhXjEHwFW7FA/PJs1S8o=", + "lastModified": 1756924628, + "narHash": "sha256-MSNJa3zKQ3N/HKib55pRR6wrE8DjUdErH0LzQsvRbMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2939a55be7684222dc652249ea33505f6927ca4", + "rev": "4b254ddcf114a733e373685631ae5abca0e1891b", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755997543, - "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", + "lastModified": 1756811338, + "narHash": "sha256-fwgklhY9kJSTDMGuwHJUVBCuJDVvxxljjGOLhxC84ko=", "owner": "nix-community", "repo": "stylix", - "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", + "rev": "989312ab49e6eb1d076f9d194d43f9f9c513087e", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1754932774, - "narHash": "sha256-gJQZS6M2x5oPs089/9kAy0EIriEauUKEm0UNF7HEl6o=", + "lastModified": 1756827929, + "narHash": "sha256-HQiCt9TTEZ33lOnmXdmGr3A/hLOwk35CPa5idW95/ko=", "owner": "dj95", "repo": "zjstatus", - "rev": "0a963622fa5cd3d62d6ee9b82f78eacd52ae5647", + "rev": "16db007a56958a44dc940876b4f23824daa81809", "type": "github" }, "original": { From 5e1a87b420712619e9f506f4e057d3d8875ee62e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Sep 2025 12:40:30 +0200 Subject: [PATCH 112/204] open some ports for shodan --- nixos/hosts/shodan/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index e25db66..01e2012 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -62,8 +62,8 @@ firewall.enable = true; firewall.interfaces."wg0".allowedTCPPorts = [8080]; firewall.interfaces."wg0".allowedUDPPorts = [8080]; - firewall.allowedTCPPorts = [22 8080 9090 9777]; - firewall.allowedUDPPorts = [22 8080 9090 9777]; + firewall.allowedTCPPorts = [22 8080 9090 9777 46899 46898]; + firewall.allowedUDPPorts = [22 8080 9090 9777 46899 46898]; hostName = "shodan"; }; From 0cc635afa0cb23a9364e34bd3930a1c07ce3b923 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 7 Sep 2025 16:03:36 +0200 Subject: [PATCH 113/204] open port 8091 for kodi --- nixos/hosts/shodan/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 01e2012..a9ed6e9 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -62,8 +62,8 @@ firewall.enable = true; firewall.interfaces."wg0".allowedTCPPorts = [8080]; firewall.interfaces."wg0".allowedUDPPorts = [8080]; - firewall.allowedTCPPorts = [22 8080 9090 9777 46899 46898]; - firewall.allowedUDPPorts = [22 8080 9090 9777 46899 46898]; + firewall.allowedTCPPorts = [22 8080 8091 9090 9777 46899 46898]; + firewall.allowedUDPPorts = [22 8080 8091 9090 9777 46899 46898]; hostName = "shodan"; }; From a77e7bcda340aa3e87ee0a709597651107767b0a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 10 Sep 2025 19:10:36 +0200 Subject: [PATCH 114/204] update controller settings and vm thingies on edi --- nixos/desktop/default.nix | 11 +++++++++++ nixos/hosts/EDI/configuration.nix | 8 ++++++++ nixos/hosts/shodan/configuration.nix | 8 ++++++++ nixos/shared/default.nix | 1 + pkgs/default.nix | 1 + pkgs/ttf-ms-win10/default.nix | 29 ++++++++++++++++++++++++++++ 6 files changed, 58 insertions(+) create mode 100644 pkgs/ttf-ms-win10/default.nix diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index e64e83e..a4b14cb 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -28,6 +28,12 @@ allowUnfree = true; }; }; + services.udev.extraRules = '' + KERNEL=="hidraw*", ATTRS{idVendor}=="057e", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*057e:*", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess" + ''; environment.systemPackages = with pkgs; [ @@ -39,6 +45,9 @@ # System tools aha + ttf-ms-win10 + wineWowPackages.stable + bottles #bcachefs-tools clinfo comma @@ -96,6 +105,8 @@ # Can be used to install latest version of some packages # ]) ; + + fonts.packages = [pkgs.ttf-ms-win10]; sops = { secrets."nextcloud-password" = { mode = "0600"; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index b88a5e5..d1ef6b8 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -26,6 +26,14 @@ environment.systemPackages = with pkgs; [ ]; + programs.virt-manager.enable = true; + + users.groups.libvirtd.members = ["lillian"]; + + virtualisation.libvirtd.enable = true; + + virtualisation.spiceUSBRedirection.enable = true; + services.vpn-ip = { ip = "3"; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index a9ed6e9..250ef4c 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -52,6 +52,11 @@ kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; plymouth.enable = true; }; + services.udev.extraRules = '' + KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess" + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2dc8", MODE="0666" + ''; zramSwap.enable = false; networking = { domain = ""; @@ -148,6 +153,8 @@ noto-fonts-emoji-blob-bin noto-fonts-emoji qjackctl + ttf-ms-win10 + bottles # jellyfin-media-player #rustdesk @@ -224,6 +231,7 @@ enableAutoMountUdevRules = true; }; }; + fonts.packages = [pkgs.ttf-ms-win10]; programs = { steam = lib.mkForce { enable = true; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 2f18fc2..faedbcc 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -236,6 +236,7 @@ environment = { systemPackages = with pkgs; [ nix-output-monitor + usbutils ]; # Enable completion of system packages by zsh diff --git a/pkgs/default.nix b/pkgs/default.nix index 4a754ee..c979e58 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -15,4 +15,5 @@ pkgs: { auto-mount = pkgs.callPackage ./auto-mount {}; simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; freetube-0236 = pkgs.callPackage ./freetube-0.23.6 {}; + ttf-ms-win10 = pkgs.callPackage ./ttf-ms-win10 {}; } diff --git a/pkgs/ttf-ms-win10/default.nix b/pkgs/ttf-ms-win10/default.nix new file mode 100644 index 0000000..17a5407 --- /dev/null +++ b/pkgs/ttf-ms-win10/default.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: +stdenvNoCC.mkDerivation rec { + pname = "ttf-ms-win10"; + version = "1.0"; + + src = fetchzip { + url = "https://github.com/streetsamurai00mi/ttf-ms-win10/archive/refs/heads/build.zip"; + hash = "sha256-UwkHlrSRaXhfoMlimyXFETV9yq1SbvUXykrhigf+wP8="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/streetsamurai00mi/ttf-ms-win10"; + description = "Windows 10 ttf Fonts"; + license = licenses.unfree; + maintainers = []; + }; +} From 913e481b04cc9714bcddff820050c4ec5c78f1e3 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 13 Sep 2025 13:51:10 +0200 Subject: [PATCH 115/204] update flake lock and remove package only available to kde5 --- flake.lock | 126 +++++++++++++-------------- nixos/desktop/default.nix | 2 +- nixos/hosts/EDI/configuration.nix | 22 +++++ nixos/hosts/iso/configuration.nix | 1 - nixos/hosts/shodan/configuration.nix | 1 - 5 files changed, 86 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 3fdb835..48cb673 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756741629, - "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=", + "lastModified": 1757320803, + "narHash": "sha256-7PUIQOMQSJLkNtV42SAYUDw0mRdbBNl6q8pLN8GViwM=", "owner": "catppuccin", "repo": "nix", - "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382", + "rev": "d75e3fe67f49728cb5035bc791f4b9065ff3a2c9", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1756733629, - "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1756903364, - "narHash": "sha256-vZh/YH2D7oDFek10r0TbGn3qJrqGv69sSP+oF8PFDqQ=", + "lastModified": 1757698511, + "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "6159629d05a0e92bb7fb7211e74106ae1d552401", + "rev": "a3fcc92180c7462082cd849498369591dfb20855", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756638688, - "narHash": "sha256-ddxbPTnIchM6tgxb6fRrCvytlPE2KLifckTnde/irVQ=", + "lastModified": 1757230583, + "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e7b8679cba79f4167199f018b05c82169249f654", + "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1756612744, - "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", + "lastModified": 1757218147, + "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", + "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756750488, - "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1756924628, - "narHash": "sha256-MSNJa3zKQ3N/HKib55pRR6wrE8DjUdErH0LzQsvRbMA=", + "lastModified": 1757763920, + "narHash": "sha256-TVlcSI2LiWPtCVoqdVNHxywanYo7+hBSL5PqwiyTSlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4b254ddcf114a733e373685631ae5abca0e1891b", + "rev": "f71577d0fabcd37d54c1d308a803f7166c4e664f", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1756819007, + "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "type": "github" }, "original": { @@ -744,11 +744,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1757503115, + "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1756811338, - "narHash": "sha256-fwgklhY9kJSTDMGuwHJUVBCuJDVvxxljjGOLhxC84ko=", + "lastModified": 1757360005, + "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", "owner": "nix-community", "repo": "stylix", - "rev": "989312ab49e6eb1d076f9d194d43f9f9c513087e", + "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -1040,11 +1040,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -1056,11 +1056,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1756827929, - "narHash": "sha256-HQiCt9TTEZ33lOnmXdmGr3A/hLOwk35CPa5idW95/ko=", + "lastModified": 1757256304, + "narHash": "sha256-qANK2Hwhi4Nbpcsy6lunncyt725gthaSX/0dLluBxtw=", "owner": "dj95", "repo": "zjstatus", - "rev": "16db007a56958a44dc940876b4f23824daa81809", + "rev": "e2ea91819408f0b0dd7ee15249341cace6eb09cc", "type": "github" }, "original": { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a4b14cb..01274ac 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -48,6 +48,7 @@ ttf-ms-win10 wineWowPackages.stable bottles + tpm2-abrmd #bcachefs-tools clinfo comma @@ -71,7 +72,6 @@ zsh # KDE/QT - krunner-translator kdePackages.discover kdePackages.filelight kdePackages.kcalc diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index d1ef6b8..30e8d06 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -34,6 +34,28 @@ virtualisation.spiceUSBRedirection.enable = true; + services.samba = { + enable = true; + openFirewall = true; + settings = { + global = { + "invalid users" = [ + "root" + ]; + "passwd program" = "/run/wrappers/bin/passwd %u"; + security = "user"; + }; + public = { + browseable = "yes"; + comment = "Public samba share."; + "guest ok" = "yes"; + path = "/home/lillian/samba"; + "read only" = "no"; + }; + }; + }; + users.groups.samba.members = ["lillian"]; + services.vpn-ip = { ip = "3"; }; diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index fd73d37..e2d7688 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -70,7 +70,6 @@ zsh # KDE/QT - krunner-translator kdePackages.discover kdePackages.kcalc kdePackages.kdepim-addons diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 250ef4c..59f5dab 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -166,7 +166,6 @@ protonup-qt #KDE: - krunner-translator # kdePackages.discover kdePackages.kcalc kdePackages.kdepim-addons From 75f843903cd36a97d849d08b8b07c5b3a1ad09ef Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Sep 2025 14:21:44 +0200 Subject: [PATCH 116/204] add jre8 to shodan and update flake lock --- flake.lock | 60 +++++++++---------- .../package-configs/firefox/default.nix | 2 +- nixos/hosts/shodan/configuration.nix | 1 + 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 48cb673..f5ee73d 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757320803, - "narHash": "sha256-7PUIQOMQSJLkNtV42SAYUDw0mRdbBNl6q8pLN8GViwM=", + "lastModified": 1757929733, + "narHash": "sha256-dzKGtCdGbW7v95MS6pxb97u025JP24QsqCLE5bHAumI=", "owner": "catppuccin", "repo": "nix", - "rev": "d75e3fe67f49728cb5035bc791f4b9065ff3a2c9", + "rev": "039cd59357bc6fdd8d9848717069fbc9ee609a73", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1757698511, - "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", + "lastModified": 1758085625, + "narHash": "sha256-D0KVKNgWSDVjYFgPLEtSQvSKchTBT0YqSbNlH7OQ+bo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a3fcc92180c7462082cd849498369591dfb20855", + "rev": "fb928abb67bd4df99040721ed48c3b42e24b1d08", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1757218147, - "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1757763920, - "narHash": "sha256-TVlcSI2LiWPtCVoqdVNHxywanYo7+hBSL5PqwiyTSlw=", + "lastModified": 1758111153, + "narHash": "sha256-uazH/IkpTFC1dLnH9EML8LbgrQfmjrxNJq+6pXFPNI8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f71577d0fabcd37d54c1d308a803f7166c4e664f", + "rev": "7a8665e3a624a01b10d10d10b819cb1a8f34ee6e", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1757503115, - "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757360005, - "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", + "lastModified": 1757956156, + "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", "owner": "nix-community", "repo": "stylix", - "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", + "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", "type": "github" }, "original": { diff --git a/home-manager/desktop/package-configs/firefox/default.nix b/home-manager/desktop/package-configs/firefox/default.nix index 8049699..63af8f9 100644 --- a/home-manager/desktop/package-configs/firefox/default.nix +++ b/home-manager/desktop/package-configs/firefox/default.nix @@ -3,7 +3,7 @@ programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; - package = pkgs.floorp; + package = pkgs.librewolf; profiles.default = {isDefault = false;}; profiles.lillian = { isDefault = true; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 59f5dab..14acbcc 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -155,6 +155,7 @@ qjackctl ttf-ms-win10 bottles + jre8 # jellyfin-media-player #rustdesk From 41bc46e2ad9a70d4644128d1b0d90be087ed4feb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 17 Sep 2025 15:11:32 +0200 Subject: [PATCH 117/204] add liberation ttf and set lix to edge packages since all others break rn --- flake.nix | 1 + nixos/shared/default.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 102f217..4421b8d 100644 --- a/flake.nix +++ b/flake.nix @@ -260,6 +260,7 @@ modules = sharedModules ++ [ + {_module.args = {inherit pkgs-edge;};} ./nixos/hosts/wheatley/configuration.nix ]; }; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index faedbcc..82dfd29 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -4,6 +4,7 @@ lib, config, pkgs, + pkgs-edge, ... }: { imports = [ @@ -32,7 +33,7 @@ ]; nix = { - package = pkgs.lix; + package = pkgs-edge.lix; gc = { automatic = true; dates = "weekly"; @@ -166,6 +167,7 @@ pkgs.noto-fonts pkgs.nerd-fonts.fira-mono pkgs.font-awesome + pkgs.liberation_ttf ]; fonts.fontconfig = { From ed977534e25a709b8d247215f69220a61df38aab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Sep 2025 16:05:02 +0200 Subject: [PATCH 118/204] update flake lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index f5ee73d..1b67124 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757929733, - "narHash": "sha256-dzKGtCdGbW7v95MS6pxb97u025JP24QsqCLE5bHAumI=", + "lastModified": 1758270360, + "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=", "owner": "catppuccin", "repo": "nix", - "rev": "039cd59357bc6fdd8d9848717069fbc9ee609a73", + "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1758085625, - "narHash": "sha256-D0KVKNgWSDVjYFgPLEtSQvSKchTBT0YqSbNlH7OQ+bo=", + "lastModified": 1758288820, + "narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb928abb67bd4df99040721ed48c3b42e24b1d08", + "rev": "e38751933802481b37fee1f9251cbb86e63df381", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1758111153, - "narHash": "sha256-uazH/IkpTFC1dLnH9EML8LbgrQfmjrxNJq+6pXFPNI8=", + "lastModified": 1758289961, + "narHash": "sha256-X1hz0/XuB1MaSo/r2YgEW5VRPXP7nl87VZzamNeg21M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a8665e3a624a01b10d10d10b819cb1a8f34ee6e", + "rev": "6333212a7354373a9643aa1f6066e72d8643248b", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1756632588, - "narHash": "sha256-ydam6eggXf3ZwRutyCABwSbMAlX+5lW6w1SVZQ+kfSo=", + "lastModified": 1758185783, + "narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "d47428e5390d6a5a8f764808a4db15929347cd77", + "rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4", "type": "github" }, "original": { From f9c37df27d2bf581435091ada12a437b521cc728 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Sep 2025 17:05:10 +0200 Subject: [PATCH 119/204] update wheatley with DNS over TLS and some added packages to shared for DNS and network debugging for the future --- nixos/hosts/wheatley/configuration.nix | 30 ++++++++++++++++++++++++++ nixos/shared/packages/default.nix | 4 ++++ 2 files changed, 34 insertions(+) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 277a2a6..d36c12c 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -162,6 +162,36 @@ enable = false; }; + services.stubby = { + enable = true; + settings = + pkgs.stubby.passthru.settingsExample + // { + upstream_recursive_servers = [ + { + address_data = "192.242.2.4"; + tls_auth_name = "base.dns.mullvad.net"; + tls_pubkey_pinset = [ + { + digest = "sha256"; + value = "g8bfYNSxU86c8odFPsdTvWnC2VZkxIiHLZ2a6pydEjI="; + } + ]; + } + { + address_data = "2a07:e340::4"; + tls_auth_name = "base.dns.mullvad.net"; + tls_pubkey_pinset = [ + { + digest = "sha256"; + value = "g8bfYNSxU86c8odFPsdTvWnC2VZkxIiHLZ2a6pydEjI="; + } + ]; + } + ]; + }; + }; + networking = { hostName = "wheatley"; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index d82be3b..81400f0 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -43,6 +43,10 @@ wget zsh tldr + nmap + knot-dns + libressl + nettools # System libraries ]) From e0c861f9bff533848453c6c88052704e409b28cc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 20 Sep 2025 13:33:28 +0200 Subject: [PATCH 120/204] update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1b67124..4714aa8 100644 --- a/flake.lock +++ b/flake.lock @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1758288820, - "narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=", + "lastModified": 1758296614, + "narHash": "sha256-l60D1i0aaSqemy9dL7wP0ePMfcv/oZbeKpvUMY+q0kQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e38751933802481b37fee1f9251cbb86e63df381", + "rev": "55b1f5b7b191572257545413b98e37abab2fdb00", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1758289961, - "narHash": "sha256-X1hz0/XuB1MaSo/r2YgEW5VRPXP7nl87VZzamNeg21M=", + "lastModified": 1758367702, + "narHash": "sha256-W2zr6NgZODMM7nljGpHEQ7C1jHfcGZaXcWqDzp8YwGY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6333212a7354373a9643aa1f6066e72d8643248b", + "rev": "07b40d9bc3f0b7fc9e0971c92bc8837c48eb5ca0", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { From 2f3fe79109e54e033467652a156b2e3f40eab910 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 20 Sep 2025 14:58:26 +0200 Subject: [PATCH 121/204] Remove envrc and set EDI up for aarch64 cross compile --- .envrc | 1 - nixos/hosts/EDI/configuration.nix | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 .envrc diff --git a/.envrc b/.envrc deleted file mode 100644 index 490e97b..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=nix" diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 30e8d06..474d296 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -76,6 +76,8 @@ loader.systemd-boot.enable = lib.mkForce false; initrd.systemd.enable = true; + binfmt.emulatedSystems = ["aarch64-linux"]; + lanzaboote = { enable = true; pkiBundle = "/var/lib/sbctl"; From 80c05481680c85b775aa11fd7f62209d14c8b055 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 20 Sep 2025 15:11:52 +0200 Subject: [PATCH 122/204] (hopefully) fix the zellij arrows on the theme --- home-manager/shared/shell/zellij/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index d8bebaf..3ea1d16 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -57,15 +57,15 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]🞂" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#1D1D2E,fg=#C9D2F5]🞂" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]🞂#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#1D1D2E,fg=#A6DA95]🞂" tab_sync_indicator " " tab_fullscreen_indicator "□ " @@ -140,15 +140,15 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]🞂" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#1D1D2E,fg=#C9D2F5]🞂" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]🞂#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#1D1D2E,fg=#A6DA95]🞂" tab_sync_indicator " " tab_fullscreen_indicator "□ " From c47b01d3a1290ecccabb59c857e207af4bbcb22a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 20 Sep 2025 15:19:28 +0200 Subject: [PATCH 123/204] =?UTF-8?q?That=20one=20(=F0=9F=9E=82)=20wasn't=20?= =?UTF-8?q?full=20width,=20I=20hope=20the=20new=20one=20(=E2=96=B6)=20is?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- home-manager/shared/shell/zellij/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 3ea1d16..ab4a9b1 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -57,15 +57,15 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]🞂" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]▶" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#1D1D2E,fg=#C9D2F5]🞂" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]🞂#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#1D1D2E,fg=#A6DA95]🞂" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#1D1D2E,fg=#C9D2F5]▶" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]▶#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#1D1D2E,fg=#A6DA95]▶" tab_sync_indicator " " tab_fullscreen_indicator "□ " @@ -140,15 +140,15 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]🞂" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]▶" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]🞂#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]🞂#[bg=#1D1D2E,fg=#C9D2F5]🞂" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]🞂#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]🞂#[bg=#1D1D2E,fg=#A6DA95]🞂" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#1D1D2E,fg=#C9D2F5]▶" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]▶#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#1D1D2E,fg=#A6DA95]▶" tab_sync_indicator " " tab_fullscreen_indicator "□ " From 46096a45794deabfdb51cf8a01776ca596d9b411 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 24 Sep 2025 16:10:17 +0200 Subject: [PATCH 124/204] update flake lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 4714aa8..1f78b94 100644 --- a/flake.lock +++ b/flake.lock @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1758296614, - "narHash": "sha256-l60D1i0aaSqemy9dL7wP0ePMfcv/oZbeKpvUMY+q0kQ=", + "lastModified": 1758719930, + "narHash": "sha256-DgHe1026Ob49CPegPMiWj1HNtlMTGQzfSZQQVlHC950=", "owner": "nix-community", "repo": "home-manager", - "rev": "55b1f5b7b191572257545413b98e37abab2fdb00", + "rev": "142acd7a7d9eb7f0bb647f053b4ddfd01fdfbf1d", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1757822619, - "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", + "lastModified": 1758427679, + "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", + "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1758367702, - "narHash": "sha256-W2zr6NgZODMM7nljGpHEQ7C1jHfcGZaXcWqDzp8YwGY=", + "lastModified": 1758722719, + "narHash": "sha256-kM2lhOOZjTZHcOxrpYGOA5rnmTkldAhkUmJsuFknGGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07b40d9bc3f0b7fc9e0971c92bc8837c48eb5ca0", + "rev": "e020a5544ebeded670da175e3571d2c223283379", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757746433, - "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1756130152, - "narHash": "sha256-3qcN28djoBqqhEqOv8ve3/+wD0lLR2YCVV1EZ4SYfjo=", + "lastModified": 1758547637, + "narHash": "sha256-D1vQGAjT2ZuW8xr2Tl7hj+yNwIdNctVTLHiE4gssU4k=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b49ae46f226430854102c207fdcb55e2de8e884e", + "rev": "d2534fa431ee4b0ca33cae3d6e583ff4f470db41", "type": "gitlab" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1758007585, - "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757956156, - "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", + "lastModified": 1758716250, + "narHash": "sha256-PvOo4vSk7WAOhSifgL+rzExihquU9DOIOQPrUVuFHpE=", "owner": "nix-community", "repo": "stylix", - "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", + "rev": "526c882800837cce7676f3e11bb3e13e975c6032", "type": "github" }, "original": { From a9d01022c293abdc10368c07ad7f3e58cfd3c3c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 28 Sep 2025 16:57:42 +0200 Subject: [PATCH 125/204] add some EDI stuff for managing things and update flake --- flake.lock | 96 +++++++++++++++--------------- home-manager/hosts/EDI/lillian.nix | 1 + nixos/hosts/EDI/configuration.nix | 1 + nixos/shared/default.nix | 7 +++ 4 files changed, 57 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 1f78b94..66fcc18 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758270360, - "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=", + "lastModified": 1758956381, + "narHash": "sha256-ROUw5E8CibG3jEy6oHjrkF6/P60eiaUJmc2s2ecC/LM=", "owner": "catppuccin", "repo": "nix", - "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645", + "rev": "02dee881c3e644e2b561f407742f1fd927c40b83", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1758719930, - "narHash": "sha256-DgHe1026Ob49CPegPMiWj1HNtlMTGQzfSZQQVlHC950=", + "lastModified": 1759043321, + "narHash": "sha256-Efi3THvsIS6Qd97s52/PSSHWybDlSbtUZXP8l3AR9Ps=", "owner": "nix-community", "repo": "home-manager", - "rev": "142acd7a7d9eb7f0bb647f053b4ddfd01fdfbf1d", + "rev": "c75fd8e300b79502b8eecdacd8a426b12fadb460", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1758427679, - "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", + "lastModified": 1759032422, + "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", + "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1758722719, - "narHash": "sha256-kM2lhOOZjTZHcOxrpYGOA5rnmTkldAhkUmJsuFknGGc=", + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e020a5544ebeded670da175e3571d2c223283379", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1758976413, + "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1756819007, - "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -744,11 +744,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1758185783, - "narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=", + "lastModified": 1759064045, + "narHash": "sha256-v74j88evVeCK7eqt/wfqe1x3YalwI/uss8TXtiqy5/I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4", + "rev": "7d7629ba12b2ba7849718f18c1fba6e14708d974", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", + "lastModified": 1759030640, + "narHash": "sha256-53VP3BqMXJqD1He1WADTFyUnpta3mie56H7nC59tSic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "rev": "9ac51832c70f2ff34fcc97b05fa74b4a78317f9e", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1758716250, - "narHash": "sha256-PvOo4vSk7WAOhSifgL+rzExihquU9DOIOQPrUVuFHpE=", + "lastModified": 1759069666, + "narHash": "sha256-/oVAVpL4xxR4KG4MlFspi8fiP9wEaSs+zqHkD2tw17g=", "owner": "nix-community", "repo": "stylix", - "rev": "526c882800837cce7676f3e11bb3e13e975c6032", + "rev": "f23b6c30cc002786a22998caf15312ea01c20654", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -1040,11 +1040,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -1056,11 +1056,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 6d2719a..1686c30 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -17,6 +17,7 @@ home.packages = with pkgs; [ lutris + android-tools ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 474d296..e691266 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -24,6 +24,7 @@ ]; environment.systemPackages = with pkgs; [ + gparted ]; programs.virt-manager.enable = true; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 82dfd29..dd8a4dd 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -100,6 +100,13 @@ enable = true; enableBrowserSocket = true; }; + chromium = { + enable = true; + #Bet these options get renamed and put under a SearchProvider subheader... + defaultSearchProviderSearchURL = "https://noai.duckduckgo.com/?t=ftab&q={searchTerms}"; + defaultSearchProviderEnabled = true; + extensions = ["cjpalhdlnbpafiamejdnhcphjbkeiagm" "gcbommkclmclpchllfjekcdonpmejbdp"]; + }; }; stylix = { From 9baed9e179384563b928feb4f25da54f3f4260ba Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 30 Sep 2025 17:03:12 +0200 Subject: [PATCH 126/204] update flake lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 66fcc18..2e142ec 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758956381, - "narHash": "sha256-ROUw5E8CibG3jEy6oHjrkF6/P60eiaUJmc2s2ecC/LM=", + "lastModified": 1759235685, + "narHash": "sha256-YeSyb+CeSqYpc2wP+Wx6zzbsjvdS8HwcyWQ7qZ336xU=", "owner": "catppuccin", "repo": "nix", - "rev": "02dee881c3e644e2b561f407742f1fd927c40b83", + "rev": "f4751824510bdce804ae4a0fc59779fc16c8fdca", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1759043321, - "narHash": "sha256-Efi3THvsIS6Qd97s52/PSSHWybDlSbtUZXP8l3AR9Ps=", + "lastModified": 1759236626, + "narHash": "sha256-1BjCUU2csqhR5umGYFnOOTU8r8Bi+bnB2SLsr0FLcws=", "owner": "nix-community", "repo": "home-manager", - "rev": "c75fd8e300b79502b8eecdacd8a426b12fadb460", + "rev": "9e0453a9b0c8ef22de0355b731d712707daa6308", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1757230583, - "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", + "lastModified": 1759217228, + "narHash": "sha256-P13ExJlhMVkrc5LxZLNkIJZhjNYo3LLXnxDsUNrdnMQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", + "rev": "e52c15ab25f7dc68dde527c8df5bfa9d80d8e64f", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "lastModified": 1759244355, + "narHash": "sha256-vMQ3g0oVx3q4dHC5tao3JVJccO92WhrVBsTDqxdbzfc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "rev": "22688e8f6476f056b0b70c5445d70a2f0f62378d", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1759064045, - "narHash": "sha256-v74j88evVeCK7eqt/wfqe1x3YalwI/uss8TXtiqy5/I=", + "lastModified": 1759157415, + "narHash": "sha256-Fg8cOnVoIe0uQ38UpR6XZzRCwDsjjozVwfevW9yCLI0=", "owner": "pjones", "repo": "plasma-manager", - "rev": "7d7629ba12b2ba7849718f18c1fba6e14708d974", + "rev": "df5b3e6da631f732c26c6044c7cccb8706b4f479", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1758547637, - "narHash": "sha256-D1vQGAjT2ZuW8xr2Tl7hj+yNwIdNctVTLHiE4gssU4k=", + "lastModified": 1759210380, + "narHash": "sha256-ItE9vk+khMZcla80JNY1Iv+U4UFsHG08axjxmoPFnrE=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "d2534fa431ee4b0ca33cae3d6e583ff4f470db41", + "rev": "0ab40d057577a43e88c3418a7dad491f2da34001", "type": "gitlab" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1759030640, - "narHash": "sha256-53VP3BqMXJqD1He1WADTFyUnpta3mie56H7nC59tSic=", + "lastModified": 1759188042, + "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ac51832c70f2ff34fcc97b05fa74b4a78317f9e", + "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759069666, - "narHash": "sha256-/oVAVpL4xxR4KG4MlFspi8fiP9wEaSs+zqHkD2tw17g=", + "lastModified": 1759131326, + "narHash": "sha256-fFhUx2C0Wtz0YkndtnlpSesrqj4lP3d5BUnMprpXtTk=", "owner": "nix-community", "repo": "stylix", - "rev": "f23b6c30cc002786a22998caf15312ea01c20654", + "rev": "fe74ba4ade9f3bb1496fbff27cc7a0ca873e40c4", "type": "github" }, "original": { From db1a5abd2fd76491f9cac819f22c28dcfcb5dba5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 2 Oct 2025 16:28:10 +0200 Subject: [PATCH 127/204] update flake lock --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 2e142ec..ff5c0af 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759235685, - "narHash": "sha256-YeSyb+CeSqYpc2wP+Wx6zzbsjvdS8HwcyWQ7qZ336xU=", + "lastModified": 1759273174, + "narHash": "sha256-aHN6dAD72IsNvNlzU3nbV4DJRb1qPvURgWIzHeYsBbc=", "owner": "catppuccin", "repo": "nix", - "rev": "f4751824510bdce804ae4a0fc59779fc16c8fdca", + "rev": "5f7dc8bab8af6ba612ef8dc7cd44e38ba6cfd51a", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1759236626, - "narHash": "sha256-1BjCUU2csqhR5umGYFnOOTU8r8Bi+bnB2SLsr0FLcws=", + "lastModified": 1759337100, + "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e0453a9b0c8ef22de0355b731d712707daa6308", + "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1759217228, - "narHash": "sha256-P13ExJlhMVkrc5LxZLNkIJZhjNYo3LLXnxDsUNrdnMQ=", + "lastModified": 1759387127, + "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e52c15ab25f7dc68dde527c8df5bfa9d80d8e64f", + "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759261527, + "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1759143472, + "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1759244355, - "narHash": "sha256-vMQ3g0oVx3q4dHC5tao3JVJccO92WhrVBsTDqxdbzfc=", + "lastModified": 1759414817, + "narHash": "sha256-b6Mn9oZgp8gmNjDaPC6B4bqSRp8eybnRYva0+ctGo8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22688e8f6476f056b0b70c5445d70a2f0f62378d", + "rev": "52cd263bb7e44ec8ad107fc3a3f8541e86ffa17d", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -767,11 +767,11 @@ ] }, "locked": { - "lastModified": 1759157415, - "narHash": "sha256-Fg8cOnVoIe0uQ38UpR6XZzRCwDsjjozVwfevW9yCLI0=", + "lastModified": 1759321049, + "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=", "owner": "pjones", "repo": "plasma-manager", - "rev": "df5b3e6da631f732c26c6044c7cccb8706b4f479", + "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1759210380, - "narHash": "sha256-ItE9vk+khMZcla80JNY1Iv+U4UFsHG08axjxmoPFnrE=", + "lastModified": 1759341349, + "narHash": "sha256-royHWFiwBdumcYGuLzhS5lzQfcOU+L2/tcX37q36fVs=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "0ab40d057577a43e88c3418a7dad491f2da34001", + "rev": "4a05bb1911715c199711d13bd1ed1bd694210112", "type": "gitlab" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759131326, - "narHash": "sha256-fFhUx2C0Wtz0YkndtnlpSesrqj4lP3d5BUnMprpXtTk=", + "lastModified": 1759404594, + "narHash": "sha256-k9hd15rLqG7x3OCUPrcQtpleDlOyQjy16ZEseruypNQ=", "owner": "nix-community", "repo": "stylix", - "rev": "fe74ba4ade9f3bb1496fbff27cc7a0ca873e40c4", + "rev": "3f70c5855572004f9c630ed4a92aa186755361be", "type": "github" }, "original": { From 59b02de155e0877bc9e7d856e3e9b70c4bfbdade Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 5 Oct 2025 17:56:24 +0200 Subject: [PATCH 128/204] update flake lock and remove amdvlk --- flake.lock | 72 ++++++++++++++-------------- nixos/hosts/GLaDOS/configuration.nix | 10 ---- 2 files changed, 36 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index ff5c0af..687aa94 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759273174, - "narHash": "sha256-aHN6dAD72IsNvNlzU3nbV4DJRb1qPvURgWIzHeYsBbc=", + "lastModified": 1759572023, + "narHash": "sha256-2fzYq/m2PXie5WZO5LhyiZrTIUdUFp1SCLZAwvPL5xo=", "owner": "catppuccin", "repo": "nix", - "rev": "5f7dc8bab8af6ba612ef8dc7cd44e38ba6cfd51a", + "rev": "eeada12912d80d04733383d231a9d66172858718", "type": "github" }, "original": { @@ -407,11 +407,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1759573136, + "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", "type": "github" }, "original": { @@ -492,11 +492,11 @@ ] }, "locked": { - "lastModified": 1759032422, - "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", + "lastModified": 1759637156, + "narHash": "sha256-8NI1SqntLfKl6Q0Luemc3aIboezSJElofUrqipF5g78=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", + "rev": "0ca69684091aa3a6b1fe994c4afeff305b15e915", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759261527, - "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1759414817, - "narHash": "sha256-b6Mn9oZgp8gmNjDaPC6B4bqSRp8eybnRYva0+ctGo8g=", + "lastModified": 1759679451, + "narHash": "sha256-kc5fAstJeVzCB9nieb9siXztimZX7q82IoCmagqooCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52cd263bb7e44ec8ad107fc3a3f8541e86ffa17d", + "rev": "f13518758350f4f273fcd11dd0b98c62e5d8fbdb", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -654,11 +654,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -686,11 +686,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1758976413, - "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", + "lastModified": 1759570798, + "narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", + "rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26", "type": "github" }, "original": { @@ -879,11 +879,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1759341349, - "narHash": "sha256-royHWFiwBdumcYGuLzhS5lzQfcOU+L2/tcX37q36fVs=", + "lastModified": 1759489698, + "narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4a05bb1911715c199711d13bd1ed1bd694210112", + "rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", "type": "gitlab" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1759188042, - "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", + "lastModified": 1759635238, + "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", + "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "type": "github" }, "original": { @@ -930,11 +930,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759404594, - "narHash": "sha256-k9hd15rLqG7x3OCUPrcQtpleDlOyQjy16ZEseruypNQ=", + "lastModified": 1759595578, + "narHash": "sha256-cYPdsYgZFyvpMbRg9Nbtt3JtcdjE80gXfe/65T1ELco=", "owner": "nix-community", "repo": "stylix", - "rev": "3f70c5855572004f9c630ed4a92aa186755361be", + "rev": "503d989626aa41174b3a51f18528547da1afe572", "type": "github" }, "original": { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 4d01abb..1582ebc 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -41,16 +41,6 @@ networking.hostName = "GLaDOS"; services.xserver.videoDrivers = ["amdgpu"]; - hardware = { - # Add vulkan support to GPU - graphics.extraPackages = with pkgs; [ - amdvlk - ]; - # For 32 bit applications - graphics.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; - }; programs = { # gamemode.enable = false; # gamemode.settings = { From 3c8687dfc65c25dda81bf374054298af46c0d2fa Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Oct 2025 22:42:47 +0200 Subject: [PATCH 129/204] small updates to queen, update flake lock --- flake.lock | 91 ++++++++++++------------ nixos/desktop/default.nix | 1 + nixos/server/package-configs/default.nix | 3 +- 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 687aa94..b01b1ed 100644 --- a/flake.lock +++ b/flake.lock @@ -21,16 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -88,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759572023, - "narHash": "sha256-2fzYq/m2PXie5WZO5LhyiZrTIUdUFp1SCLZAwvPL5xo=", + "lastModified": 1760953099, + "narHash": "sha256-sOKx2YcHa+lWEvaEOIGqLN2WWk1Wf5z6KM02tdfhMtw=", "owner": "catppuccin", "repo": "nix", - "rev": "eeada12912d80d04733383d231a9d66172858718", + "rev": "f5b21876888265d2fee7fb0640d1b66a1c1c6503", "type": "github" }, "original": { @@ -138,11 +139,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -206,11 +207,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -407,11 +408,11 @@ ] }, "locked": { - "lastModified": 1759573136, - "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", + "lastModified": 1760973044, + "narHash": "sha256-Ij3H0qkzZ66X9934kH0JYoI3b/F2vamrDD9abT5Pi70=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", + "rev": "c3a5e5f0df6f53aa4b51adc0107796cc407c641c", "type": "github" }, "original": { @@ -427,11 +428,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1759387127, - "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", + "lastModified": 1760534924, + "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", + "rev": "100b4e000032b865563a9754e5bca189bc544764", "type": "github" }, "original": { @@ -492,11 +493,11 @@ ] }, "locked": { - "lastModified": 1759637156, - "narHash": "sha256-8NI1SqntLfKl6Q0Luemc3aIboezSJElofUrqipF5g78=", + "lastModified": 1760846226, + "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0ca69684091aa3a6b1fe994c4afeff305b15e915", + "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", "type": "github" }, "original": { @@ -543,11 +544,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", + "lastModified": 1760958188, + "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", + "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "type": "github" }, "original": { @@ -559,11 +560,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -591,11 +592,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1759679451, - "narHash": "sha256-kc5fAstJeVzCB9nieb9siXztimZX7q82IoCmagqooCk=", + "lastModified": 1760992386, + "narHash": "sha256-jv38SVrSYJwYMqxhQO/BdZlkRCl8q5cNKGeRWI3EA3A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f13518758350f4f273fcd11dd0b98c62e5d8fbdb", + "rev": "7d19100fc0608a3a2e0109ebd36a75328eaef20e", "type": "github" }, "original": { @@ -606,11 +607,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -654,11 +655,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -686,11 +687,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1759570798, - "narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=", + "lastModified": 1760596604, + "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26", + "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", "type": "github" }, "original": { @@ -898,11 +899,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1759635238, - "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", + "lastModified": 1760845571, + "narHash": "sha256-PwGzU3EOU65Ef1VvuNnVLie+l+P0g/fzf/PGUG82KbM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", + "rev": "9c9a9798be331ed3f4b2902933d7677d0659ee61", "type": "github" }, "original": { @@ -930,11 +931,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759595578, - "narHash": "sha256-cYPdsYgZFyvpMbRg9Nbtt3JtcdjE80gXfe/65T1ELco=", + "lastModified": 1760472212, + "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", "owner": "nix-community", "repo": "stylix", - "rev": "503d989626aa41174b3a51f18528547da1afe572", + "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", "type": "github" }, "original": { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 01274ac..8c5c261 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -49,6 +49,7 @@ wineWowPackages.stable bottles tpm2-abrmd + jdk23 #bcachefs-tools clinfo comma diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 91ff838..f685ff2 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -5,7 +5,7 @@ ./gotosocial ./mail-server ./nextcloud - ./phanpy + # ./phanpy ./postgres ./roundcube ./coturn @@ -14,5 +14,6 @@ #./firefox-sync ./writefreely ./mollysocket + ./jellyfin ]; } From d04382e5cc09b19a39fc250ba059361bde1aec54 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Oct 2025 23:07:47 +0200 Subject: [PATCH 130/204] disable nitrokey from shodan (broken) --- home-manager/hosts/shodan/lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 7a115b0..98d6a9b 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -66,7 +66,7 @@ flameshot fzf nextcloud-client - nitrokey-app + # nitrokey-app # protonvpn-gui sops #watchmate From 40a3e51a898c8b9a027a6816bd58ce577e1c70b8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 20 Oct 2025 23:12:35 +0200 Subject: [PATCH 131/204] prism launcher also broken (nix is really doing well isn't it, big tent good or something) --- home-manager/hosts/shodan/lillian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 98d6a9b..36cb8f6 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -50,7 +50,7 @@ vesktop #Gaming: - prismlauncher + # prismlauncher r2modman ryubing From 41851ee975c1017aa693cff6f548cf68caa9bd20 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Oct 2025 15:29:04 +0200 Subject: [PATCH 132/204] update git setup and add fallback to rebuild and update nextcloud to 32 --- home-manager/desktop/default.nix | 8 +++++--- home-manager/hosts/shodan/lillian.nix | 18 ++++++++++++++++-- justfile | 4 ++-- .../package-configs/nextcloud/default.nix | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 2ee2b59..389c88f 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -239,9 +239,11 @@ home-manager.enable = true; git = { enable = true; - userEmail = "git@lillianviolet.dev"; - userName = "Lillian-Violet"; - extraConfig = { + settings = { + user = { + name = "Lillian-Violet"; + email = "git@lillianviolet.dev"; + }; init = { defaultBranch = "main"; }; diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 36cb8f6..f075b0f 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -100,8 +100,22 @@ home-manager.enable = true; git = { enable = true; - userEmail = "git@lillianviolet.dev"; - userName = "Lillian-Violet"; + settings = { + user = { + name = "Lillian-Violet"; + email = "git@lillianviolet.dev"; + }; + init = { + defaultBranch = "main"; + }; + }; + ignores = [ + "*.direnv" + "*.vscode" + ".envrc" + "venv" + "venv" + ]; signing.format = "ssh"; }; }; diff --git a/justfile b/justfile index dba9460..44b9a63 100644 --- a/justfile +++ b/justfile @@ -1,10 +1,10 @@ # Build the nixos configuration and switch to it build: - sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json + sudo echo "sudo check..." && sudo nixos-rebuild --fallback --log-format internal-json -v switch --flake .# --show-trace |& nom --json # Build the nixos configuration bot don't switch to it until a reboot boot: - sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v boot --flake .# --show-trace |& nom --json + sudo echo "sudo check..." && sudo nixos-rebuild --fallback --log-format internal-json -v boot --flake .# --show-trace |& nom --json # Run the nix flake in the nix repl run: diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index c1960ff..aff2c38 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -50,7 +50,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud31; + package = pkgs.nextcloud32; # Use HTTPS for links https = true; From 727e84293e033e5da2160235f82e1a49fe0671d4 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Oct 2025 15:44:20 +0200 Subject: [PATCH 133/204] remove nitrokey app for now --- home-manager/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 389c88f..954e5ae 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -179,7 +179,7 @@ flameshot fzf nextcloud-client - nitrokey-app + # nitrokey-app # protonvpn-gui virtualbox #watchmate From 176b2a1874370ceddbe2bba7ed974d15635e837d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Oct 2025 21:18:26 +0200 Subject: [PATCH 134/204] change some minor shodan settings to see if it allows desktop access that way --- nixos/hosts/shodan/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 14acbcc..6a20aea 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -84,6 +84,7 @@ # Enable the KDE Plasma Desktop Environment. desktopManager.plasma6.enable = true; + desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible; avahi = { nssmdns4 = true; @@ -97,7 +98,7 @@ }; }; displayManager = { - defaultSession = "plasma"; + # defaultSession = "plasma"; sddm.wayland.enable = lib.mkForce true; sddm.settings = { Autologin = { From d29d6ba68283c00633a619e023e40b6594a3a010 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Oct 2025 21:31:33 +0200 Subject: [PATCH 135/204] disable sddm display manager stuff, maybe that's breaking shodan? --- nixos/hosts/shodan/configuration.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 6a20aea..13ca960 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -97,16 +97,16 @@ workstation = true; }; }; - displayManager = { - # defaultSession = "plasma"; - sddm.wayland.enable = lib.mkForce true; - sddm.settings = { - Autologin = { - Session = "plasma.desktop"; - User = "lillian"; - }; - }; - }; + # displayManager = { + # # defaultSession = "plasma"; + # sddm.wayland.enable = lib.mkForce true; + # sddm.settings = { + # Autologin = { + # Session = "plasma.desktop"; + # User = "lillian"; + # }; + # }; + # }; # Enable flatpak support flatpak.enable = true; From d6dbb5830507821b85405b2b4249206aaed2a226 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 21 Oct 2025 21:42:52 +0200 Subject: [PATCH 136/204] try and change some kde packages and see if it fixes it (in line with EDI and GLaDOS) maybe try and find a way to unify shodan with desktop without breakage --- nixos/hosts/shodan/configuration.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 13ca960..b7b60de 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -163,22 +163,32 @@ sbctl udisks util-linux + wayland-utils waypipe python3 protonup-qt #KDE: - # kdePackages.discover + # # KDE/QT + kdePackages.discover + kdePackages.filelight kdePackages.kcalc kdePackages.kdepim-addons kdePackages.kirigami kdePackages.kdeconnect-kde + kdePackages.konsole # kdePackages.krunner-ssh # kdePackages.krunner-symbols - kdePackages.qtvirtualkeyboard kdePackages.packagekit-qt + kdePackages.plasma-pa + kdePackages.sddm-kcm + kdePackages.dolphin-plugins + kdePackages.qtstyleplugin-kvantum kdePackages.krdc kdePackages.krfb + kdePackages.kate + kdePackages.xwaylandvideobridge + libportal-qt5 libportal #Gaming: From c5073b924aa31aba4fd8abf04b4b314bbfc0b9c1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Oct 2025 14:18:23 +0200 Subject: [PATCH 137/204] unify desktop and shodan --- flake.nix | 1 + home-manager/desktop/default.nix | 2 - home-manager/hosts/shodan/lillian.nix | 88 +-------------- nixos/desktop/default.nix | 17 ++- nixos/hosts/EDI/configuration.nix | 8 ++ nixos/hosts/GLaDOS/configuration.nix | 8 ++ nixos/hosts/shodan/configuration.nix | 152 ++------------------------ 7 files changed, 42 insertions(+), 234 deletions(-) diff --git a/flake.nix b/flake.nix index 4421b8d..4478ef1 100644 --- a/flake.nix +++ b/flake.nix @@ -240,6 +240,7 @@ specialArgs = {inherit inputs outputs;}; modules = sharedModules + ++ desktopModules ++ [ {_module.args = {inherit pkgs-edge;};} # > Our main nixos configuration file < diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 954e5ae..da5024c 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -150,7 +150,6 @@ direnv git git-credential-manager - git-credential-manager ruff devtoolbox @@ -203,7 +202,6 @@ # Web browsing: firefoxpwa - firefoxpwa ungoogled-chromium ]; }; diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index f075b0f..7e7e9bf 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -12,13 +12,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../desktop/package-configs/plasma-desktop - ../../desktop/package-configs/firefox - ../../desktop/package-configs/konsole - ../../desktop/package-configs/foot - ../../desktop/package-configs/freetube - ../../desktop/package-configs/vesktop ../../shared + ../../desktop ]; nixpkgs = { # You can add overlays here @@ -33,93 +28,14 @@ # }); # }) ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - }; - - home = { - username = "lillian"; - homeDirectory = "/home/lillian"; }; home.packages = with pkgs; [ - #Chat: - vesktop - #Gaming: - # prismlauncher + prismlauncher r2modman ryubing - - # Multimedia: - freetube - obs-studio - vlc - fcast-receiver - fcast-client - - # System tools: - rage - flameshot - fzf - nextcloud-client - # nitrokey-app - # protonvpn-gui - sops - #watchmate - qbittorrent - zsh - - # Theming: - catppuccin-cursors - (catppuccin-kde.override { - flavour = ["macchiato"]; - accents = ["mauve"]; - }) - catppuccin-plymouth - catppuccin-sddm-corners - - # Web browsing: - firefox - ungoogled-chromium ]; - programs = { - # # Automount services for user - # programs.bashmount.enable = true; - # services.udiskie = { - # enable = true; - # automount = true; - # notify = false; - # tray = "never"; - # }; - - # Enable home-manager and git - home-manager.enable = true; - git = { - enable = true; - settings = { - user = { - name = "Lillian-Violet"; - email = "git@lillianviolet.dev"; - }; - init = { - defaultBranch = "main"; - }; - }; - ignores = [ - "*.direnv" - "*.vscode" - ".envrc" - "venv" - "venv" - ]; - signing.format = "ssh"; - }; - }; - # Make the kde screenlock not require a password :) programs.plasma.kscreenlocker.passwordRequired = false; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 8c5c261..5615558 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -73,6 +73,13 @@ zsh # KDE/QT + kdePackages.plasma-desktop + kdePackages.plasma-wayland-protocols + kdePackages.libplasma + kdePackages.plasma-integration + kdePackages.plasma-activities + kdePackages.plasma-workspace + kdePackages.plasma-vault kdePackages.discover kdePackages.filelight kdePackages.kcalc @@ -139,6 +146,8 @@ }; }; + xdg.portal.enable = true; + # Enable networking networking.networkmanager.enable = true; # Enables support for 32bit libs that steam uses @@ -149,10 +158,10 @@ xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; + # displayManager.sddm = { + # enable = true; + # wayland.enable = true; + # }; displayManager.defaultSession = "plasma"; desktopManager.plasma6.enable = true; desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index e691266..fc742ef 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -35,6 +35,14 @@ virtualisation.spiceUSBRedirection.enable = true; + services.displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + + services.displayManager.defaultSession = "plasma"; + services.desktopManager.plasma6.enable = true; + services.samba = { enable = true; openFirewall = true; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 1582ebc..81777e5 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -34,6 +34,14 @@ gparted ]; + services.displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + + services.displayManager.defaultSession = "plasma"; + services.desktopManager.plasma6.enable = true; + services.vpn-ip = { ip = "2"; }; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index b7b60de..162f6b5 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -17,7 +17,7 @@ outputs.nixosModules.vpn-ip # Import the shared settings - ../../desktop/package-configs/firefox + ../../desktop # You can also split up your configuration and import pieces of it here: # ./nvim.nix @@ -76,120 +76,32 @@ ip = "4"; }; + xdg.portal.extraPortals = [pkgs.kdePackages.xdg-desktop-portal-kde]; services = { - openssh.enable = true; # Enables support for 32bit libs that steam uses - - # Enable the X11 windowing system. - xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - desktopManager.plasma6.enable = true; - desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible; - - avahi = { - nssmdns4 = true; - enable = true; - ipv4 = true; - ipv6 = true; - publish = { - enable = true; - addresses = true; - workstation = true; + displayManager = { + # defaultSession = "plasma"; + sddm.wayland.enable = lib.mkForce true; + sddm.settings = { + Autologin = { + Session = "plasma.desktop"; + User = "lillian"; + }; }; }; - # displayManager = { - # # defaultSession = "plasma"; - # sddm.wayland.enable = lib.mkForce true; - # sddm.settings = { - # Autologin = { - # Session = "plasma.desktop"; - # User = "lillian"; - # }; - # }; - # }; - - # Enable flatpak support - flatpak.enable = true; - packagekit.enable = true; - - # Configure keymap in X11 - xserver = { - xkb.layout = "us"; - xkb.variant = ""; - }; - - # Enable CUPS to print documents. - printing.enable = true; - - # Enable fwupd daemon and user space client - fwupd.enable = true; - # pipewire = { - # enable = true; - # alsa.enable = true; - # alsa.support32Bit = true; - # pulse.enable = true; - # }; }; - nixpkgs = { - # You can add overlays here - overlays = [ - ]; - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - }; environment.systemPackages = with pkgs; [ # Custom tools - auto-mount #System: - btrfs-progs decky-loader - efitools - jq noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji - qjackctl - ttf-ms-win10 - bottles jre8 # jellyfin-media-player #rustdesk - sbctl - udisks - util-linux - wayland-utils - waypipe - python3 - protonup-qt - - #KDE: - # # KDE/QT - kdePackages.discover - kdePackages.filelight - kdePackages.kcalc - kdePackages.kdepim-addons - kdePackages.kirigami - kdePackages.kdeconnect-kde - kdePackages.konsole - # kdePackages.krunner-ssh - # kdePackages.krunner-symbols - kdePackages.packagekit-qt - kdePackages.plasma-pa - kdePackages.sddm-kcm - kdePackages.dolphin-plugins - kdePackages.qtstyleplugin-kvantum - kdePackages.krdc - kdePackages.krfb - kdePackages.kate - kdePackages.xwaylandvideobridge - libportal-qt5 - libportal #Gaming: heroic @@ -243,56 +155,12 @@ }; }; fonts.packages = [pkgs.ttf-ms-win10]; - programs = { - steam = lib.mkForce { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - extest.enable = true; - }; - kdeconnect.enable = true; - - noisetorch = { - enable = true; - }; - - git = { - enable = true; - }; - }; - # # Enable automounting of removable media # services.udisks2.enable = true; # services.devmon.enable = true; # services.gvfs.enable = true; # environment.variables.GIO_EXTRA_MODULES = lib.mkForce ["${pkgs.gvfs}/lib/gio/modules"]; - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - hardware = { - graphics.enable32Bit = true; - - # Enable bluetooth hardware - bluetooth.enable = true; - - # Enable sound with pipewire. - }; - - services.pulseaudio.enable = false; - users.users.lillian.extraGroups = ["decky" "tss" "input"]; - - # Enable completion of system packages by zsh - environment.pathsToLink = ["/share/zsh"]; - - security = { - rtkit.enable = true; - tpm2 = { - enable = true; - pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so - tctiEnvironment.enable = true; - }; - }; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "25.11"; } From e0c1b334938c184e7201693caf48764194c8c802 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Oct 2025 15:25:15 +0200 Subject: [PATCH 138/204] add nextcloud password to shodan --- nixos/hosts/shodan/secrets/sops.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml index 3c8e216..c6a2065 100644 --- a/nixos/hosts/shodan/secrets/sops.yaml +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -1,11 +1,8 @@ lillian-password: ENC[AES256_GCM,data:uPNBvMyhkiX3eedduFlsFUIcas/VBVSYrsmGTlgGUOzTQST59CYZRoq0ArphIJ3+Usy6KbR5tA5FCp4PoB3qVYBfjlAq6dhZIw==,iv:TiUIo2lvdL6SiDuW4gWn0TeJXkz5MldzqGxuK3MNPnE=,tag:d3p/h+q50JxygDtk2qxIeQ==,type:str] wg-private-key: ENC[AES256_GCM,data:PeuKeYRHfOzGlekLI95EH3qq+blntZrrboPKaKC0ghD5zIyaCYrFHYWLkug=,iv:BcugGYW7+i7d04H4EKn+BdJJPqwMVVvlHBETO0x0kQM=,tag:Z/ammSrFpWTIbVfi4VJZ9w==,type:str] ssh-private-key: ENC[AES256_GCM,data:7K3p6Lu4je2fNmvtKpLY2z7MG5E0gg3486PCLTlm/NzWpiH0FO8KO2yPkPPVurXfUWj7ig3eiP+bc6+kufRQ8+MCHaR+JA056cdMch0MMK92FyPvJjNKzwB4W3BpdvOKipaZvuvSfgdrEdpz6rWRwBb9KaUW5aHBjW5eQNm+q0yP2uZjW6Ncp/zrdevjlRJyXGnNJD8CBDQgLILvqlvziRO4xBnSZOmFpdCKM9jMkxwHIQUND4ic71G6cheN+kIsgsa67DlJjfrngGWxKrlC3Q2DC+30vHtW8f18oa+g7eu9eTz8+bSLxYJf9TADwE+UYe2Hakib1ju67yxBkcomIjBvqgo+zEr0jC2qYmOvlKfqn64gSbAE7zEVCbavz6gA2EMb0g47twtAdgGUyzppGQ4LXjZXv6lyYov2gdXP7bzAcXXfzDh92BuTUOp9HXOTsLh7XC7cPKziowwwT+oUeOaSujMT9tgqkazgcVR3ne+PjxduptV75gxOwxeu6F2Zm+4Y4xJBdJeyP1Baq0yj4HNY/gv3pxEEXgU5,iv:TJ3AsSvXeUmBsKd6xy+Kc1ws+Yc9ZQ5Q4A8UFHI7Wsg=,tag:egCYoe3Mkbvkup0itszm4w==,type:str] +nextcloud-password: ENC[AES256_GCM,data:vA+L/7rTne16AZbibUAaLAcQKLoKPvM1ATNL/hbzjVt+qmxHhmuQq0cqKdoPOFlOftMNLo5HSKiHdLxh,iv:kw0IorbyjT/ocanJDcR3kuPCqHsPwSD4axIp2dfn1Fc=,tag:5QLl3xKq4a0EiImO07ardQ==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -16,8 +13,7 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-22T22:35:15Z" - mac: ENC[AES256_GCM,data:olqDdjgOF7MsYXibawEn4bou6LPof25j231+Vwr+pSGCO19Sj44OkZpS0YmNBi+Uym+X6RGM5uV3fg4JYVgThnALI9JFyFuZ41gjPRyNBXJ16RnogKykHK5XNjQEogYho5bgLA8DTDeOvSfFHW2ENM052z6lJyAaPWJLa4ADlEY=,iv:YXGKcHQfqZCnK9Z3Nw/JxcTmZR++0iKUc7PDbLBqahY=,tag:UbHZvFZjaYjrC51Q1f/oyg==,type:str] - pgp: [] + lastmodified: "2025-10-22T13:25:05Z" + mac: ENC[AES256_GCM,data:qGLiJvoU+lyzMBr1jW3My5kNLCm59xVmdc3knyg64KMbAL65q7m5EJBC9uvRX0ZcxaNXWuRJWyUu1VV9tIKtSW+HLVJUZuTCi+0qswOL331LLuyDzhIkOKbPUPiDzKaMLif7EqENN9kN2aGSivpMVB5QkqRccmg6ya1Qkx5Ao7A=,iv:RiaIdq5Ve/PNVTD38Qh4YM+2x8fEU027r7hlmoNZI9A=,tag:jm9ZThwSVtpyed+kMIgaJw==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.11.0 From f0bc562719a2fcdb0eb1e01c4474be13cfa25641 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 24 Oct 2025 21:18:59 +0200 Subject: [PATCH 139/204] update flake lock & remove xwaylandvideo thingy since it no longer exists --- flake.lock | 54 +++++++++++++++++++-------------------- nixos/desktop/default.nix | 1 - 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index b01b1ed..4288445 100644 --- a/flake.lock +++ b/flake.lock @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1760973044, - "narHash": "sha256-Ij3H0qkzZ66X9934kH0JYoI3b/F2vamrDD9abT5Pi70=", + "lastModified": 1761316995, + "narHash": "sha256-BAAjCpjTnfaxtc9NCkbUl9MUv5JmAG5qU7/G8TTHmb4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c3a5e5f0df6f53aa4b51adc0107796cc407c641c", + "rev": "82b58f38202540bce4e5e00759d115c5a43cab85", "type": "github" }, "original": { @@ -428,11 +428,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1760534924, - "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", + "lastModified": 1761202163, + "narHash": "sha256-6RySf5VQElrm7RYGWxlIkNttemDp4FF0aH+LX435G2Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "100b4e000032b865563a9754e5bca189bc544764", + "rev": "47976126007d9658ca4ac4dd933bea8846170fd9", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1760992386, - "narHash": "sha256-jv38SVrSYJwYMqxhQO/BdZlkRCl8q5cNKGeRWI3EA3A=", + "lastModified": 1761333218, + "narHash": "sha256-BADjffoJhebWFqh6UrcP2Q+Eq7IfUidby1526JSQwuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7d19100fc0608a3a2e0109ebd36a75328eaef20e", + "rev": "afdea0988e272b56d9e0b417591772195c77d3b0", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -768,11 +768,11 @@ ] }, "locked": { - "lastModified": 1759321049, - "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=", + "lastModified": 1761078382, + "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd", + "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "type": "github" }, "original": { @@ -899,11 +899,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1760845571, - "narHash": "sha256-PwGzU3EOU65Ef1VvuNnVLie+l+P0g/fzf/PGUG82KbM=", + "lastModified": 1760998189, + "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9c9a9798be331ed3f4b2902933d7677d0659ee61", + "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "type": "github" }, "original": { @@ -931,11 +931,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "lastModified": 1761028816, + "narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=", "owner": "nix-community", "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "rev": "b81dc0a385443099e7d231fe6275189e32c3b760", "type": "github" }, "original": { @@ -1078,11 +1078,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1757256304, - "narHash": "sha256-qANK2Hwhi4Nbpcsy6lunncyt725gthaSX/0dLluBxtw=", + "lastModified": 1761162625, + "narHash": "sha256-cJD5RccT5aFwLFiId8PW91z39MpoQZIymj+qZEJ5jTE=", "owner": "dj95", "repo": "zjstatus", - "rev": "e2ea91819408f0b0dd7ee15249341cace6eb09cc", + "rev": "a4bb655af8f49fe53de7fefca54348de21ecbbb2", "type": "github" }, "original": { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 5615558..a1e32c6 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -97,7 +97,6 @@ kdePackages.krdc kdePackages.krfb kdePackages.kate - kdePackages.xwaylandvideobridge libportal-qt5 libportal From 49b70deb84e633b1a1db5dc4e08c8165f3e0739e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 3 Nov 2025 23:00:09 +0100 Subject: [PATCH 140/204] uupdate flake lock --- flake.lock | 90 ++++++++++++++-------------- home-manager/desktop/default.nix | 2 +- nixos/hosts/shodan/configuration.nix | 3 - 3 files changed, 46 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 4288445..f73f213 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1760953099, - "narHash": "sha256-sOKx2YcHa+lWEvaEOIGqLN2WWk1Wf5z6KM02tdfhMtw=", + "lastModified": 1762198582, + "narHash": "sha256-P9giW/1Crn7ekQt4YIbONJ/hKFaHkTwyhz82FCjh+OM=", "owner": "catppuccin", "repo": "nix", - "rev": "f5b21876888265d2fee7fb0640d1b66a1c1c6503", + "rev": "08716214674ca27914daa52e6fa809cc022b581e", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1760701190, - "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", + "lastModified": 1761899396, + "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", "owner": "nix-community", "repo": "disko", - "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", + "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762040540, + "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "0010412d62a25d959151790968765a70c436598b", "type": "github" }, "original": { @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1761316995, - "narHash": "sha256-BAAjCpjTnfaxtc9NCkbUl9MUv5JmAG5qU7/G8TTHmb4=", + "lastModified": 1762204486, + "narHash": "sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC+k=", "owner": "nix-community", "repo": "home-manager", - "rev": "82b58f38202540bce4e5e00759d115c5a43cab85", + "rev": "95d65dddae7ae6300b22cf1d61cb5e71dca8da5b", "type": "github" }, "original": { @@ -428,11 +428,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1761202163, - "narHash": "sha256-6RySf5VQElrm7RYGWxlIkNttemDp4FF0aH+LX435G2Y=", + "lastModified": 1761748321, + "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "47976126007d9658ca4ac4dd933bea8846170fd9", + "rev": "533db5857c9e00ca352558a928417116ee08a824", "type": "github" }, "original": { @@ -451,11 +451,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1756744479, - "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "747b7912f49e2885090c83364d88cf853a020ac1", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { @@ -493,11 +493,11 @@ ] }, "locked": { - "lastModified": 1760846226, - "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", + "lastModified": 1762055842, + "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", + "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", "type": "github" }, "original": { @@ -544,11 +544,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1762179181, + "narHash": "sha256-T4+TNfXlF/gHbcNCC2HY7sMGBKgqNzyYeMBWmcbH7/o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "256770618502d2eda892af3ae91da5e386ce9586", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1761333218, - "narHash": "sha256-BADjffoJhebWFqh6UrcP2Q+Eq7IfUidby1526JSQwuw=", + "lastModified": 1762206299, + "narHash": "sha256-Wn+CwHTIzSxdGJ35NZlS8rOXyXNxyqnX9j/5IuBbFrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "afdea0988e272b56d9e0b417591772195c77d3b0", + "rev": "72d71aa6d47d139d5d59d0fcfebe7c5734245bd5", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -768,11 +768,11 @@ ] }, "locked": { - "lastModified": 1761078382, - "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", + "lastModified": 1762115864, + "narHash": "sha256-KREKZiBAkAnqJC+jvY+vSbLlrg8j6DFEU7Lv+tgOlHI=", "owner": "pjones", "repo": "plasma-manager", - "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", + "rev": "8e9e76efa3cc811c230512b40d8cfde06e40da5b", "type": "github" }, "original": { @@ -837,11 +837,11 @@ ] }, "locked": { - "lastModified": 1754189623, - "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -931,11 +931,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1761028816, - "narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=", + "lastModified": 1762101397, + "narHash": "sha256-wGiL2K3kAyBBmIZpJEskaSIgyzzpg0zwfvri+Sy6/CI=", "owner": "nix-community", "repo": "stylix", - "rev": "b81dc0a385443099e7d231fe6275189e32c3b760", + "rev": "8c0640d5722a02178c8ee80a62c5f019cab4b3c1", "type": "github" }, "original": { diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index da5024c..8a59c1e 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -169,7 +169,7 @@ fcast-client # Office applications: - onlyoffice-bin + onlyoffice-desktopeditors gimp thunderbird diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 162f6b5..99c9655 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -95,9 +95,6 @@ #System: decky-loader - noto-fonts - noto-fonts-emoji-blob-bin - noto-fonts-emoji jre8 # jellyfin-media-player From 186b968bf7e538c94a12fa1f606f1db56708634b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 4 Nov 2025 11:11:19 +0100 Subject: [PATCH 141/204] update flake lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index f73f213..b7c3fae 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1762204486, - "narHash": "sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC+k=", + "lastModified": 1762228452, + "narHash": "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg=", "owner": "nix-community", "repo": "home-manager", - "rev": "95d65dddae7ae6300b22cf1d61cb5e71dca8da5b", + "rev": "aa6936bb637e46a49cf1292486200ba41dd4bcf7", "type": "github" }, "original": { @@ -576,11 +576,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1762206299, - "narHash": "sha256-Wn+CwHTIzSxdGJ35NZlS8rOXyXNxyqnX9j/5IuBbFrM=", + "lastModified": 1762250068, + "narHash": "sha256-bWfDQg/j6q68T6X0RtT4UrgaLue5u3JVBr6bDoi2ZXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72d71aa6d47d139d5d59d0fcfebe7c5734245bd5", + "rev": "780a54edb3810c2d7d97f4cbf6ae8aa32f93d2b8", "type": "github" }, "original": { @@ -671,11 +671,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -880,11 +880,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1759489698, - "narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", + "lastModified": 1762215676, + "narHash": "sha256-5dDnedKkUIo8qqHbCL+tAPSMcQNQMp0evS6+dH4AoUA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", + "rev": "82c22259140dcfa67e97f761eb9423382c9d449b", "type": "gitlab" }, "original": { From 8777bca952daf9c26ee5c4422b2b722e6951b172 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 4 Nov 2025 12:33:45 +0100 Subject: [PATCH 142/204] run jellyfin as nextcloud for file sharing --- nixos/server/package-configs/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/server/package-configs/jellyfin/default.nix b/nixos/server/package-configs/jellyfin/default.nix index cc492d4..d172e97 100644 --- a/nixos/server/package-configs/jellyfin/default.nix +++ b/nixos/server/package-configs/jellyfin/default.nix @@ -1,6 +1,4 @@ {...}: { - users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; - services.nginx = { virtualHosts = { "video.gladtherescake.eu" = { @@ -16,5 +14,7 @@ services.jellyfin = { enable = true; + user = "nextcloud"; + group = "nextcloud"; }; } From cd836b7810da4c493380004e0ac3db52095e5b8b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 7 Nov 2025 23:20:04 +0100 Subject: [PATCH 143/204] update flake lock --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index b7c3fae..b192012 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762198582, - "narHash": "sha256-P9giW/1Crn7ekQt4YIbONJ/hKFaHkTwyhz82FCjh+OM=", + "lastModified": 1762510976, + "narHash": "sha256-KGoSj8qMOOPaNE48RTtuNBbqOvKLTeklnRHWWvE/TXo=", "owner": "catppuccin", "repo": "nix", - "rev": "08716214674ca27914daa52e6fa809cc022b581e", + "rev": "728cb0a667ce37bb0c68557dba819c7fb54ff1c8", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1761899396, - "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1762040540, - "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "lastModified": 1762440070, + "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0010412d62a25d959151790968765a70c436598b", + "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "type": "github" }, "original": { @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1762228452, - "narHash": "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "aa6936bb637e46a49cf1292486200ba41dd4bcf7", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -428,11 +428,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1761748321, - "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", + "lastModified": 1762452596, + "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "533db5857c9e00ca352558a928417116ee08a824", + "rev": "99919fd35e70c1b18ce948d5329928d751031312", "type": "github" }, "original": { @@ -544,11 +544,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762179181, - "narHash": "sha256-T4+TNfXlF/gHbcNCC2HY7sMGBKgqNzyYeMBWmcbH7/o=", + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "256770618502d2eda892af3ae91da5e386ce9586", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1762250068, - "narHash": "sha256-bWfDQg/j6q68T6X0RtT4UrgaLue5u3JVBr6bDoi2ZXw=", + "lastModified": 1762553402, + "narHash": "sha256-cWmHtPcGbcxyL7yKq9MbnWzkUgL/2+ZmSpBCDxz1AA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "780a54edb3810c2d7d97f4cbf6ae8aa32f93d2b8", + "rev": "8cf467c7e89d8924855844612aa9f7211ce7432b", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -623,11 +623,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756125398, - "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -768,11 +768,11 @@ ] }, "locked": { - "lastModified": 1762115864, - "narHash": "sha256-KREKZiBAkAnqJC+jvY+vSbLlrg8j6DFEU7Lv+tgOlHI=", + "lastModified": 1762274591, + "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8e9e76efa3cc811c230512b40d8cfde06e40da5b", + "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", "type": "github" }, "original": { @@ -880,11 +880,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1762215676, - "narHash": "sha256-5dDnedKkUIo8qqHbCL+tAPSMcQNQMp0evS6+dH4AoUA=", + "lastModified": 1762302830, + "narHash": "sha256-f3xe6CRPT51vCQFZotJOXi/JpGOiukz0WIa86arJSE8=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "82c22259140dcfa67e97f761eb9423382c9d449b", + "rev": "58659fbdfd8aba9bd8f4517d3e5c388c4d8266c4", "type": "gitlab" }, "original": { @@ -931,11 +931,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762101397, - "narHash": "sha256-wGiL2K3kAyBBmIZpJEskaSIgyzzpg0zwfvri+Sy6/CI=", + "lastModified": 1762264356, + "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", "owner": "nix-community", "repo": "stylix", - "rev": "8c0640d5722a02178c8ee80a62c5f019cab4b3c1", + "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", "type": "github" }, "original": { From 6a43eb6acb903769dfff158f28eb8f5ddc213276 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 19 Nov 2025 14:10:45 +0100 Subject: [PATCH 144/204] update flake lock and replace jdk with 21 because 23 is EOL --- flake.lock | 179 ++++++++---------- .../package-configs/firefox/default.nix | 18 +- nixos/desktop/default.nix | 2 +- 3 files changed, 100 insertions(+), 99 deletions(-) diff --git a/flake.lock b/flake.lock index b192012..9e4aa12 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762510976, - "narHash": "sha256-KGoSj8qMOOPaNE48RTtuNBbqOvKLTeklnRHWWvE/TXo=", + "lastModified": 1763110997, + "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=", "owner": "catppuccin", "repo": "nix", - "rev": "728cb0a667ce37bb0c68557dba819c7fb54ff1c8", + "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1762538466, + "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "0cea393fffb39575c46b7a0318386467272182fe", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -387,18 +387,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -408,11 +410,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -428,11 +430,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1762452596, - "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", + "lastModified": 1763453666, + "narHash": "sha256-Hu8lDUlbMFvcYX30LBXX7Gq5FbU35bERH0pSX5qHf/Q=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "99919fd35e70c1b18ce948d5329928d751031312", + "rev": "b843b551415c7aecc97c8b3ab3fff26fd0cd8bbf", "type": "github" }, "original": { @@ -451,11 +453,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1763485704, + "narHash": "sha256-3er/jo34r75PesrkI939JC0g1MqsMZQZgVtNzSKYoaE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "1a6b487e3045b916240ca52c22ebb22263bf1cff", "type": "github" }, "original": { @@ -493,11 +495,11 @@ ] }, "locked": { - "lastModified": 1762055842, - "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", + "lastModified": 1763265660, + "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", + "rev": "469ef53571ea80890c9497952787920c79c1ee6e", "type": "github" }, "original": { @@ -544,11 +546,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -574,29 +576,13 @@ "type": "github" } }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-edge": { "locked": { - "lastModified": 1762553402, - "narHash": "sha256-cWmHtPcGbcxyL7yKq9MbnWzkUgL/2+ZmSpBCDxz1AA4=", + "lastModified": 1763556960, + "narHash": "sha256-OKhOAWK7VpxJeynqkRuLMQM2WaQN+0+IEmHQIRqdfu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cf467c7e89d8924855844612aa9f7211ce7432b", + "rev": "d6df00fc9e017a689990a4a9374009f2eb818404", "type": "github" }, "original": { @@ -607,11 +593,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -639,11 +625,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754243818, - "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", + "lastModified": 1763291491, + "narHash": "sha256-eEYvm+45PPmy+Qe+nZDpn1uhoMUjJwx3PwVVQoO9ksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", + "rev": "c543a59edf25ada193719764f3bc0c6ba835f94d", "type": "github" }, "original": { @@ -655,11 +641,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -671,27 +657,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762721782, + "narHash": "sha256-ftv0n3xkKawHQgxZ6FGr2F1GdaYT/79aESm4t1LQ6X4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "e5d07586ec39f74b390308f2e00040c23bdef530", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1760596604, - "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", + "lastModified": 1763191728, + "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", "type": "github" }, "original": { @@ -703,11 +689,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -768,11 +754,11 @@ ] }, "locked": { - "lastModified": 1762274591, - "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", + "lastModified": 1762784320, + "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=", "owner": "pjones", "repo": "plasma-manager", - "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", + "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321", "type": "github" }, "original": { @@ -794,11 +780,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -837,11 +823,11 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1763347184, + "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", "type": "github" }, "original": { @@ -876,15 +862,14 @@ "blobs": "blobs", "flake-compat": "flake-compat_2", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_5", - "nixpkgs-25_05": "nixpkgs-25_05" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1762302830, - "narHash": "sha256-f3xe6CRPT51vCQFZotJOXi/JpGOiukz0WIa86arJSE8=", + "lastModified": 1763317756, + "narHash": "sha256-7CD7BQR3RVKllDWfqIwAicgs2j4jzpaugxvkLU8cGgI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "58659fbdfd8aba9bd8f4517d3e5c388c4d8266c4", + "rev": "cbdf90f639660981a55bbf6af86e6cc5f13d2752", "type": "gitlab" }, "original": { @@ -899,11 +884,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1760998189, - "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "lastModified": 1763509310, + "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e", "type": "github" }, "original": { @@ -931,11 +916,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762264356, - "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", + "lastModified": 1763497248, + "narHash": "sha256-OGP6MYc+lVkLVQOTS6ORszDcCnZm7kDOGpFBdDoLd0k=", "owner": "nix-community", "repo": "stylix", - "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", + "rev": "f19ac46f6aa26188b2020ed40066a5b832be9c53", "type": "github" }, "original": { diff --git a/home-manager/desktop/package-configs/firefox/default.nix b/home-manager/desktop/package-configs/firefox/default.nix index 63af8f9..5791e3c 100644 --- a/home-manager/desktop/package-configs/firefox/default.nix +++ b/home-manager/desktop/package-configs/firefox/default.nix @@ -81,7 +81,7 @@ bookmarks = [ { name = "PoE2 build sorceres"; - tags = ["PoE" "PoE2" "path of exile" "path of exile 2" "games" "guides" "build" "sorcerer" "sorceres"]; + tags = ["PoE" "PoE2" "path of exile" "path of exile 2" "games" "guides" "build" "sorcerer" "sorceress"]; url = "https://maxroll.gg/poe2/planner/caeye0hz"; } { @@ -91,6 +91,22 @@ } ]; } + { + name = "Cooking"; + toolbar = false; + bookmarks = [ + { + name = "Maldivian chili paste"; + tags = ["cooking" "maldives" "maldivian]" "chili paste" "chili" "spicy" "food" "sauce" "recipes"]; + url = "https://maldivescook.com/recipe/lonumirus/"; + } + { + name = "Samosas"; + tags = ["cooking" "india" "fried" "baked" "snack" "pastry" "samosa"]; + url = "https://www.indianhealthyrecipes.com/samosa-recipe-make-samosa/"; + } + ]; + } ]; }; }; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a1e32c6..c0832c7 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -49,7 +49,7 @@ wineWowPackages.stable bottles tpm2-abrmd - jdk23 + jdk21_headless #bcachefs-tools clinfo comma From adf6f742000f6b619ae319bf7e9428f08cb499ee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 19 Nov 2025 20:27:32 +0100 Subject: [PATCH 145/204] enable ssh for shodan --- nixos/hosts/shodan/configuration.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 99c9655..09a242f 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -78,6 +78,15 @@ xdg.portal.extraPortals = [pkgs.kdePackages.xdg-desktop-portal-kde]; services = { + openssh = { + enable = true; + settings = { + # require public key authentication for better security + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + PermitRootLogin = "no"; + }; + }; displayManager = { # defaultSession = "plasma"; sddm.wayland.enable = lib.mkForce true; From a66d9cddeb1a7f394dbec10b3000914c8596ae3b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 24 Nov 2025 11:45:28 +0100 Subject: [PATCH 146/204] update flake lock --- flake.lock | 176 +++++++++++++++++++++++------------------------------ 1 file changed, 75 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index 9e4aa12..1c9e310 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763110997, - "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=", + "lastModified": 1763974424, + "narHash": "sha256-jPpxBhrBOAKrXPxdrdXnq4w7x3UIkUZjarNLNYkb7Zo=", "owner": "catppuccin", "repo": "nix", - "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768", + "rev": "931c6465c3eac4709684dbc320bca243252927df", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1762538466, - "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", + "lastModified": 1763938834, + "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=", "owner": "ipetkov", "repo": "crane", - "rev": "0cea393fffb39575c46b7a0318386467272182fe", + "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1763651264, + "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -221,27 +221,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -327,11 +306,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -344,7 +323,7 @@ "inputs": { "nixpkgs": [ "lanzaboote", - "pre-commit-hooks-nix", + "pre-commit", "nixpkgs" ] }, @@ -410,11 +389,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1763963090, + "narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85", "type": "github" }, "original": { @@ -430,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763453666, - "narHash": "sha256-Hu8lDUlbMFvcYX30LBXX7Gq5FbU35bERH0pSX5qHf/Q=", + "lastModified": 1763714684, + "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b843b551415c7aecc97c8b3ab3fff26fd0cd8bbf", + "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", "type": "github" }, "original": { @@ -446,18 +425,16 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_3", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "pre-commit": "pre-commit", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763485704, - "narHash": "sha256-3er/jo34r75PesrkI939JC0g1MqsMZQZgVtNzSKYoaE=", + "lastModified": 1763975256, + "narHash": "sha256-IhdDL+0YwlLz5Ty0EnAxWN/btemN9FxcQbYs/V/8jvs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1a6b487e3045b916240ca52c22ebb22263bf1cff", + "rev": "6803b15c4ab9df2dcc478254b4adb55524746ac7", "type": "github" }, "original": { @@ -495,11 +472,11 @@ ] }, "locked": { - "lastModified": 1763265660, - "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", + "lastModified": 1763870992, + "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "469ef53571ea80890c9497952787920c79c1ee6e", + "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", "type": "github" }, "original": { @@ -562,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -578,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1763556960, - "narHash": "sha256-OKhOAWK7VpxJeynqkRuLMQM2WaQN+0+IEmHQIRqdfu8=", + "lastModified": 1763979516, + "narHash": "sha256-cjRpjn12/5jEIzUXbyRxiKCH8fGeeUsFFnzlYOpwd1g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6df00fc9e017a689990a4a9374009f2eb818404", + "rev": "ce125d72e97188a21723a2c5ea370e08ef2a3ca0", "type": "github" }, "original": { @@ -593,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -625,27 +602,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763291491, - "narHash": "sha256-eEYvm+45PPmy+Qe+nZDpn1uhoMUjJwx3PwVVQoO9ksA=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c543a59edf25ada193719764f3bc0c6ba835f94d", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -657,11 +634,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762721782, - "narHash": "sha256-ftv0n3xkKawHQgxZ6FGr2F1GdaYT/79aESm4t1LQ6X4=", + "lastModified": 1763553727, + "narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5d07586ec39f74b390308f2e00040c23bdef530", + "rev": "094318ea16502a7a81ce90dd3638697020f030a2", "type": "github" }, "original": { @@ -673,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { @@ -754,11 +731,11 @@ ] }, "locked": { - "lastModified": 1762784320, - "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { @@ -767,12 +744,9 @@ "type": "github" } }, - "pre-commit-hooks-nix": { + "pre-commit": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -780,11 +754,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763741496, + "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", "type": "github" }, "original": { @@ -823,11 +797,11 @@ ] }, "locked": { - "lastModified": 1763347184, - "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", + "lastModified": 1763865987, + "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", + "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", "type": "github" }, "original": { @@ -865,11 +839,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1763317756, - "narHash": "sha256-7CD7BQR3RVKllDWfqIwAicgs2j4jzpaugxvkLU8cGgI=", + "lastModified": 1763564778, + "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "cbdf90f639660981a55bbf6af86e6cc5f13d2752", + "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", "type": "gitlab" }, "original": { @@ -884,11 +858,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1763509310, - "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=", + "lastModified": 1763870012, + "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e", + "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", "type": "github" }, "original": { @@ -904,7 +878,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_7", "nur": "nur", @@ -916,11 +890,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763497248, - "narHash": "sha256-OGP6MYc+lVkLVQOTS6ORszDcCnZm7kDOGpFBdDoLd0k=", + "lastModified": 1763845141, + "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", "owner": "nix-community", "repo": "stylix", - "rev": "f19ac46f6aa26188b2020ed40066a5b832be9c53", + "rev": "adc650610085adbe130b9860d5bdb869f96050af", "type": "github" }, "original": { From aaeea3487b9825d97a54b90b7fc350f5697237cc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 24 Nov 2025 20:44:59 +0100 Subject: [PATCH 147/204] add and enable anubis --- nixos/hosts/queen/configuration.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index e0041fa..fa25cbc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -29,6 +29,22 @@ # Import disko # ../../../disko/queen ]; + + services.anubis.instances.default.settings.TARGET = "http://localhost:8123"; + + # required due to unix socket permissions + users.users.nginx.extraGroups = [config.users.groups.anubis.name]; + services.nginx.virtualHosts."gladtherescake.eu" = { + locations = { + "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; + }; + }; + services.nginx.virtualHosts."lillianviolet.dev" = { + locations = { + "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; + }; + }; + zramSwap.enable = false; services = { openssh = { From b810354daafcaecbb6903e2001f9674d1982c104 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 24 Nov 2025 21:27:59 +0100 Subject: [PATCH 148/204] try a wildcard in nginx? --- nixos/hosts/queen/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index fa25cbc..7f7d628 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -34,12 +34,12 @@ # required due to unix socket permissions users.users.nginx.extraGroups = [config.users.groups.anubis.name]; - services.nginx.virtualHosts."gladtherescake.eu" = { + services.nginx.virtualHosts."*.gladtherescake.eu" = { locations = { "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; }; }; - services.nginx.virtualHosts."lillianviolet.dev" = { + services.nginx.virtualHosts."*.lillianviolet.dev" = { locations = { "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; }; From c924edf99ddb356a396518cd87c92f4f7220cc03 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 26 Nov 2025 13:37:14 +0100 Subject: [PATCH 149/204] change mono font to noto again to fix zellij --- nixos/shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index dd8a4dd..60616dc 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -146,8 +146,8 @@ }; monospace = { - package = pkgs.atkinson-monolegible; - name = "Atkinson Monolegible"; + package = pkgs.noto-fonts; + name = "Noto Sans Mono"; }; sansSerif = { From 087055039316cc5838954b2f8a9a3b9edba4a5b5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 26 Nov 2025 14:12:41 +0100 Subject: [PATCH 150/204] revert zellij symbols --- home-manager/shared/shell/zellij/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index ab4a9b1..d8bebaf 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -57,15 +57,15 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]▶" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#1D1D2E,fg=#C9D2F5]▶" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]▶#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#1D1D2E,fg=#A6DA95]▶" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " @@ -140,15 +140,15 @@ pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]▶" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]▶#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]▶#[bg=#1D1D2E,fg=#C9D2F5]▶" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]▶#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]▶#[bg=#1D1D2E,fg=#A6DA95]▶" + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " From 7d2b20de5582ed4eddcc39bd250a3e1ae39e50d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 26 Nov 2025 16:01:11 +0100 Subject: [PATCH 151/204] dejavu is the only font that works I guess, but that's fine --- nixos/shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 60616dc..1ca3989 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -146,8 +146,8 @@ }; monospace = { - package = pkgs.noto-fonts; - name = "Noto Sans Mono"; + package = pkgs.dejavu_fonts; + name = "DejaVu Sans Mono"; }; sansSerif = { From 75b5eb90e7e9e6c5a64ea50b29194c7e0b3604c7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 26 Nov 2025 16:12:49 +0100 Subject: [PATCH 152/204] change zellij colours to match the theme --- home-manager/shared/shell/zellij/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index d8bebaf..11240a3 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -56,22 +56,22 @@ default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + format_left "#[bg=#5b6078,fg=#cad3f5,bold] {session} {mode} {tabs}" + format_right "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#5b6078,fg=#cad3f5]" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + tab_normal "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#cad3f5,fg=#cad3f5]#[bg=#5b6078,fg=#cad3f5]" + tab_active "#[bg=#a6da95,fg=#1e2030]#[bg=#a6da95,fg=#a6da95]#[bg=#a6da95,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#a6da95,fg=#a6da95]#[bg=#5b6078,fg=#a6da95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " tab_floating_indicator "󰉈 " - datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " + datetime "#[bg=#cad3f5,fg=#1e2030,bold]{format} " datetime_format "%Y-%m-%d %H:%M" datetime_timezone "Europe/Amsterdam" } @@ -139,22 +139,22 @@ default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + format_left "#[bg=#5b6078,fg=#cad3f5,bold] {session} {mode} {tabs}" + format_right "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#5b6078,fg=#cad3f5]" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + tab_normal "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#cad3f5,fg=#cad3f5]#[bg=#5b6078,fg=#cad3f5]" + tab_active "#[bg=#a6da95,fg=#1e2030]#[bg=#a6da95,fg=#a6da95]#[bg=#a6da95,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#a6da95,fg=#a6da95]#[bg=#5b6078,fg=#a6da95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " tab_floating_indicator "󰉈 " - datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " + datetime "#[bg=#cad3f5,fg=#1e2030,bold]{format} " datetime_format "%Y-%m-%d %H:%M" datetime_timezone "Europe/Amsterdam" } From 2568d990c6fcbf3f35e073ffd6671aafcd907f25 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 26 Nov 2025 16:39:44 +0100 Subject: [PATCH 153/204] fix the theming for zellij (finally) --- home-manager/shared/shell/zellij/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 11240a3..4804e5a 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -56,16 +56,16 @@ default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "#[bg=#5b6078,fg=#cad3f5,bold] {session} {mode} {tabs}" - format_right "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#5b6078,fg=#cad3f5]" + format_left "#[bg=#24273A,fg=#cad3f5,bold] {session} {mode} {tabs}" + format_right "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#24273A,fg=#cad3f5]" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#cad3f5,fg=#cad3f5]#[bg=#5b6078,fg=#cad3f5]" - tab_active "#[bg=#a6da95,fg=#1e2030]#[bg=#a6da95,fg=#a6da95]#[bg=#a6da95,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#a6da95,fg=#a6da95]#[bg=#5b6078,fg=#a6da95]" + tab_normal "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#24273A,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#cad3f5,fg=#cad3f5]#[bg=#24273A,fg=#cad3f5]" + tab_active "#[bg=#a6da95,fg=#24273A]#[bg=#a6da95,fg=#a6da95]#[bg=#a6da95,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#a6da95,fg=#a6da95]#[bg=#24273A,fg=#a6da95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " @@ -139,16 +139,16 @@ default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "#[bg=#5b6078,fg=#cad3f5,bold] {session} {mode} {tabs}" - format_right "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#5b6078,fg=#cad3f5]" + format_left "#[bg=#24273A,fg=#cad3f5,bold] {session} {mode} {tabs}" + format_right "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#24273A,fg=#cad3f5]" mode_locked "#[fg=magenta,bold] {name} " mode_normal "#[fg=green,bold] {name} " mode_resize "#[fg=orange,bold] {name} " mode_default_to_mode "resize" - tab_normal "#[bg=#cad3f5,fg=#1e2030]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#cad3f5,fg=#cad3f5]#[bg=#5b6078,fg=#cad3f5]" - tab_active "#[bg=#a6da95,fg=#1e2030]#[bg=#a6da95,fg=#a6da95]#[bg=#a6da95,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#a6da95,fg=#a6da95]#[bg=#5b6078,fg=#a6da95]" + tab_normal "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#cad3f5,fg=#cad3f5]#[bg=#24273A,fg=#cad3f5]" + tab_active "#[bg=#a6da95,fg=#24273A]#[bg=#a6da95,fg=#a6da95]#[bg=#a6da95,fg=#1e2030,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#a6da95,fg=#a6da95]#[bg=#24273A,fg=#a6da95]" tab_sync_indicator " " tab_fullscreen_indicator "□ " From a37dc3a5e5fbd009159be41c3672638c143d32c2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Dec 2025 14:59:41 +0100 Subject: [PATCH 154/204] update flake lock --- flake.lock | 138 ++++++++++++++++++------------------- nixos/desktop/default.nix | 1 + pkgs/altsendme/default.nix | 0 3 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 pkgs/altsendme/default.nix diff --git a/flake.lock b/flake.lock index 1c9e310..b781bfe 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763974424, - "narHash": "sha256-jPpxBhrBOAKrXPxdrdXnq4w7x3UIkUZjarNLNYkb7Zo=", + "lastModified": 1764325801, + "narHash": "sha256-LQ7tsrXs1wuB6KBwUctL3JlUsG/FWI2pCI6NkoO52dk=", "owner": "catppuccin", "repo": "nix", - "rev": "931c6465c3eac4709684dbc320bca243252927df", + "rev": "a696fed6b9b6aa89ef495842cdca3fc2a7cef0de", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1763963090, - "narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=", + "lastModified": 1764544324, + "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=", "owner": "nix-community", "repo": "home-manager", - "rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85", + "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763714684, - "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", + "lastModified": 1764275117, + "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", + "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763975256, - "narHash": "sha256-IhdDL+0YwlLz5Ty0EnAxWN/btemN9FxcQbYs/V/8jvs=", + "lastModified": 1764578750, + "narHash": "sha256-4twV5EanZLNUuWcd/XzLVcn/gd/QRxQ093xlMum9OFQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6803b15c4ab9df2dcc478254b4adb55524746ac7", + "rev": "012a6070936168440e6208703c5500b26a9bc5a2", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1763870992, - "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", + "lastModified": 1764475780, + "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", + "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", "type": "github" }, "original": { @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1763979516, - "narHash": "sha256-cjRpjn12/5jEIzUXbyRxiKCH8fGeeUsFFnzlYOpwd1g=", + "lastModified": 1764595899, + "narHash": "sha256-gRYxU8TFgcdd2G6sOWvkavsf6JMyx02gT5jFFhEazHs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce125d72e97188a21723a2c5ea370e08ef2a3ca0", + "rev": "fffe579825d8821ff74dc78b382e79a965bbe3b8", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1763553727, - "narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=", + "lastModified": 1764374374, + "narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "094318ea16502a7a81ce90dd3638697020f030a2", + "rev": "6a49303095abc094ee77dc243a9e351b642e8e75", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "lastModified": 1764445028, + "narHash": "sha256-ik6H/0Zl+qHYDKTXFPpzuVHSZE+uvVz2XQuQd1IVXzo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", + "rev": "a09378c0108815dbf3961a0e085936f4146ec415", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -797,11 +797,11 @@ ] }, "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", + "lastModified": 1764470739, + "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", + "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", "type": "github" }, "original": { @@ -839,11 +839,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1763564778, - "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", + "lastModified": 1764381008, + "narHash": "sha256-s+/BuhPPSJHpPRcylqfW+3UFyYsHjAhKdtPSxusYn0U=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", + "rev": "76bd7a85e78a9b8295782a9cf719ec3489d8eb55", "type": "gitlab" }, "original": { @@ -858,11 +858,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1763870012, - "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -890,11 +890,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763845141, - "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", + "lastModified": 1764550443, + "narHash": "sha256-ArO2V1YEHmEILilTj4KPtqF4gqc1q2HBrrrmygQ/UyU=", "owner": "nix-community", "repo": "stylix", - "rev": "adc650610085adbe130b9860d5bdb869f96050af", + "rev": "794b6e1fa75177ebfeb32967f135858a1ab1ba15", "type": "github" }, "original": { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index c0832c7..58cbf9b 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -105,6 +105,7 @@ noisetorch qjackctl wireplumber + intiface-central #rustdesk ] # ++ (with pkgs-edge; [ diff --git a/pkgs/altsendme/default.nix b/pkgs/altsendme/default.nix new file mode 100644 index 0000000..e69de29 From 36d05fe28ee4f7bfdfe29ba8b7fd97c597d40b84 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 1 Dec 2025 16:41:50 +0100 Subject: [PATCH 155/204] update state version to 26.05 and update system to stdenv.hostPlatform.system --- home-manager/hosts/EDI/lillian.nix | 2 +- home-manager/hosts/GLaDOS/lillian.nix | 2 +- home-manager/hosts/queen/lillian.nix | 2 +- home-manager/hosts/shodan/lillian.nix | 2 +- home-manager/hosts/wheatley/lillian.nix | 2 +- home-manager/shared/shell/zellij/default.nix | 4 ++-- nixos/hosts/EDI/configuration.nix | 2 +- nixos/hosts/GLaDOS/configuration.nix | 2 +- nixos/hosts/queen/configuration.nix | 2 +- nixos/hosts/shodan/configuration.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 2 +- nixos/shared/default.nix | 3 ++- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 1686c30..ed564ed 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -21,5 +21,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; } diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 7097090..a978fd4 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -30,5 +30,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; } diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 9bd29f7..9297b6a 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -35,5 +35,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "26.05"; } diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 7e7e9bf..e072776 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -40,5 +40,5 @@ programs.plasma.kscreenlocker.passwordRequired = false; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; } diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix index d190612..9297b6a 100644 --- a/home-manager/hosts/wheatley/lillian.nix +++ b/home-manager/hosts/wheatley/lillian.nix @@ -35,5 +35,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; } diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 4804e5a..b84dcb9 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -55,7 +55,7 @@ default_tab_template { pane size=1 borderless=true { - plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + plugin location="file:${inputs.zjstatus.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#24273A,fg=#cad3f5,bold] {session} {mode} {tabs}" format_right "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#24273A,fg=#cad3f5]" @@ -138,7 +138,7 @@ default_tab_template { pane size=1 borderless=true { - plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + plugin location="file:${inputs.zjstatus.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/zjstatus.wasm" { format_left "#[bg=#24273A,fg=#cad3f5,bold] {session} {mode} {tabs}" format_right "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#24273A,fg=#cad3f5]" diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index fc742ef..1154d2f 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -98,5 +98,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; } diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 81777e5..a42df29 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -94,5 +94,5 @@ users.users.lillian.extraGroups = ["gamemode"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; } diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 7f7d628..7823b4e 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -233,5 +233,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; } diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 09a242f..262332b 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -168,5 +168,5 @@ # environment.variables.GIO_EXTRA_MODULES = lib.mkForce ["${pkgs.gvfs}/lib/gio/modules"]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; } diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index d36c12c..ff89965 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -412,6 +412,6 @@ services.cage.enable = true; nixpkgs.config.kodi.enableAdvancedLauncher = true; - system.stateVersion = "25.11"; + system.stateVersion = "26.05"; nixpkgs.hostPlatform = lib.mkForce "aarch64-linux"; } diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1ca3989..63929e7 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -5,6 +5,7 @@ config, pkgs, pkgs-edge, + stdenv, ... }: { imports = [ @@ -163,7 +164,7 @@ }; services.scx.enable = - if (pkgs.system == "aarch64-linux") + if (pkgs.stdenv.hostPlatform.system == "aarch64-linux") then false else true; From a9141475c655eec104cdfb2183056695da3ab252 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Dec 2025 17:36:14 +0100 Subject: [PATCH 156/204] add writing folder and icon for it --- .../desktop/package-configs/plasma-desktop/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index 721e0ba..2d1cd2f 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -44,6 +44,14 @@ target = "Code/.directory"; force = true; }; + home.file."Writing/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-notes + ''; + target = "Writing/.directory"; + force = true; + }; programs.plasma = { enable = true; From 4c12188850ca1fdebe9f9273384d9d580ab05ae5 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 2 Dec 2025 23:41:41 +0100 Subject: [PATCH 157/204] add sticky toffee pudding to recipe bookmarks --- home-manager/desktop/package-configs/firefox/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/desktop/package-configs/firefox/default.nix b/home-manager/desktop/package-configs/firefox/default.nix index 5791e3c..bd5e362 100644 --- a/home-manager/desktop/package-configs/firefox/default.nix +++ b/home-manager/desktop/package-configs/firefox/default.nix @@ -105,6 +105,11 @@ tags = ["cooking" "india" "fried" "baked" "snack" "pastry" "samosa"]; url = "https://www.indianhealthyrecipes.com/samosa-recipe-make-samosa/"; } + { + name = "Sticky Toffee Pudding"; + tags = ["baking" "UK" "England" "dessert" "treat" "snack" "baked" "sweet" "treacle" "dates"]; + url = "https://www.latimes.com/recipe/sticky-toffee-pudding-moju"; + } ]; } ]; From 629132be98bab2806135f9769562907fe6ce94c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Dec 2025 13:27:48 +0100 Subject: [PATCH 158/204] add two vegan cheesecake recipes to bookmarks --- .../desktop/package-configs/firefox/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/home-manager/desktop/package-configs/firefox/default.nix b/home-manager/desktop/package-configs/firefox/default.nix index bd5e362..0abb48c 100644 --- a/home-manager/desktop/package-configs/firefox/default.nix +++ b/home-manager/desktop/package-configs/firefox/default.nix @@ -110,6 +110,16 @@ tags = ["baking" "UK" "England" "dessert" "treat" "snack" "baked" "sweet" "treacle" "dates"]; url = "https://www.latimes.com/recipe/sticky-toffee-pudding-moju"; } + { + name = "Vegan Pumpkin Cheesecake"; + tags = ["baking" "vegan" "US" "cheesecake" "cake" "dessert" "sweet" "baked" "pumpkin" "cream cheese"]; + url = "https://www.karissasvegankitchen.com/vegan-pumpkin-cheesecake/"; + } + { + name = "Vegan Cheesecake"; + tags = ["baking" "US" "vegan" "cheesecake" "cake" "dessert" "sweet" "baked" "nut free" "cream cheese"]; + url = "https://www.noracooks.com/vegan-cheesecake/"; + } ]; } ]; From f50ec2f1b0df5e738f83829eb398f633a5c463ee Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 4 Dec 2025 15:23:25 +0100 Subject: [PATCH 159/204] add ublock to chromium by default --- home-manager/desktop/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 8a59c1e..9066a87 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -226,6 +226,12 @@ # ]; # }; + chromium = { + extensions = [ + {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} + ]; + }; + obs-studio.enable = true; obs-studio.plugins = with pkgs.obs-studio-plugins; [ wlrobs From bfec745c6cb47314d74219c82c3ddc76fac1f34a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 5 Dec 2025 18:00:34 +0100 Subject: [PATCH 160/204] add symlink for minecraft instances from nextcloud for cloud saving :3 --- home-manager/desktop/default.nix | 5 +++++ .../desktop/package-configs/plasma-desktop/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 9066a87..03df262 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -139,6 +139,11 @@ source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.mozilla/firefox"; target = ".librewolf"; }; + instances = { + source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/instances"; + target = ".local/share/PrismLauncher/instances"; + force = true; + }; }; # Add stuff for your user as you see fit: diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index 2d1cd2f..3d44c61 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -96,7 +96,7 @@ "org.kde.milou" "org.kde.plasma.panelspacer" "org.kde.plasma.colorpicker" - { + { systemTray.items = { # We explicitly show bluetooth and battery shown = [ From fff9d3e6ee0d736624d1352fce50edcf796ce5a7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Dec 2025 00:44:22 +0100 Subject: [PATCH 161/204] update flake lock --- flake.lock | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index b781bfe..84f9df0 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764325801, - "narHash": "sha256-LQ7tsrXs1wuB6KBwUctL3JlUsG/FWI2pCI6NkoO52dk=", + "lastModified": 1764885363, + "narHash": "sha256-P6UHmw6enwxmP5wP4Lv722+tgpq1PFDAPAdtj7l/16U=", "owner": "catppuccin", "repo": "nix", - "rev": "a696fed6b9b6aa89ef495842cdca3fc2a7cef0de", + "rev": "95042630028d613080393e0f03c694b77883c7db", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1764350888, - "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", + "lastModified": 1764627417, + "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", "owner": "nix-community", "repo": "disko", - "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", + "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", "type": "github" }, "original": { @@ -155,11 +155,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1764544324, - "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=", + "lastModified": 1764952935, + "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612", + "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764275117, - "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764578750, - "narHash": "sha256-4twV5EanZLNUuWcd/XzLVcn/gd/QRxQ093xlMum9OFQ=", + "lastModified": 1764622702, + "narHash": "sha256-HggOVvg2U3EwT44wPHEwFKromf9qR9rTqfV1i3q7rYs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "012a6070936168440e6208703c5500b26a9bc5a2", + "rev": "6242b3b2b5e5afcf329027ed4eb5fa6e2eab10f1", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1764595899, - "narHash": "sha256-gRYxU8TFgcdd2G6sOWvkavsf6JMyx02gT5jFFhEazHs=", + "lastModified": 1764977145, + "narHash": "sha256-zZIJvz/wWpsAcT1EQet7XZcm9RFSJUg6OgHquUeOTqQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fffe579825d8821ff74dc78b382e79a965bbe3b8", + "rev": "fb41ce8d34c0bc983d2301108d16b569f3722f1d", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -708,11 +708,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -839,11 +839,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1764381008, - "narHash": "sha256-s+/BuhPPSJHpPRcylqfW+3UFyYsHjAhKdtPSxusYn0U=", + "lastModified": 1764763336, + "narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "76bd7a85e78a9b8295782a9cf719ec3489d8eb55", + "rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e", "type": "gitlab" }, "original": { @@ -890,11 +890,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764550443, - "narHash": "sha256-ArO2V1YEHmEILilTj4KPtqF4gqc1q2HBrrrmygQ/UyU=", + "lastModified": 1764961493, + "narHash": "sha256-IMv2/LdW6R+P82AFvAZdPAneQKmDRXQU1Qls64ORFh8=", "owner": "nix-community", "repo": "stylix", - "rev": "794b6e1fa75177ebfeb32967f135858a1ab1ba15", + "rev": "46440f1bc877c467f2d31c5a825883437b8077f0", "type": "github" }, "original": { @@ -984,11 +984,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -1016,11 +1016,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { From 8479150c799f6264afc30422a828cbd12f9a4af8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 6 Dec 2025 02:01:30 +0100 Subject: [PATCH 162/204] remove steam from desktop stuff so it might stop breaking shodan hopefully --- home-manager/desktop/default.nix | 2 -- nixos/desktop/default.nix | 12 ++++++------ nixos/hosts/EDI/configuration.nix | 7 +++++++ nixos/hosts/GLaDOS/configuration.nix | 7 +++++++ nixos/shared/default.nix | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 03df262..94f28f9 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -165,8 +165,6 @@ # Gaming: prismlauncher - steam - gamescope # Multimedia: vlc diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 58cbf9b..3e750a5 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -133,12 +133,12 @@ enable = true; }; - steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - extest.enable = true; - }; + # steam = { + # enable = true; + # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + # extest.enable = true; + # }; kdeconnect.enable = true; noisetorch = { diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 1154d2f..fbe3c05 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -27,6 +27,13 @@ gparted ]; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + extest.enable = true; + }; + programs.virt-manager.enable = true; users.groups.libvirtd.members = ["lillian"]; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index a42df29..5e30a79 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -50,6 +50,13 @@ services.xserver.videoDrivers = ["amdgpu"]; programs = { + steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + extest.enable = true; + }; + # gamemode.enable = false; # gamemode.settings = { # general = { diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 63929e7..1fd8765 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -111,7 +111,7 @@ }; stylix = { - targets.qt.platform = lib.mkForce "kde"; + # targets.qt.platform = lib.mkForce "kde"; enable = true; # targets.qt.platform = "kde6"; autoEnable = true; From 52e7bf4813c70f1f2fdedc8afa83e7a94f2ec964 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Dec 2025 00:25:35 +0100 Subject: [PATCH 163/204] add some stuff to GLaDOS to fix her --- flake.nix | 1 - home-manager/desktop/default.nix | 1 + nixos/hosts/GLaDOS/configuration.nix | 16 +++++----------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 4478ef1..ca225bd 100644 --- a/flake.nix +++ b/flake.nix @@ -215,7 +215,6 @@ ++ desktopModules ++ [ {_module.args = {inherit pkgs-edge;};} - jovian.nixosModules.jovian # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix lanzaboote.nixosModules.lanzaboote diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 94f28f9..d312b26 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -165,6 +165,7 @@ # Gaming: prismlauncher + heroic # Multimedia: vlc diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 5e30a79..dabd92b 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -11,7 +11,6 @@ # Import home-manager's NixOS module inputs.home-manager.nixosModules.home-manager outputs.nixosModules.vpn-ip - inputs.jovian.nixosModules.jovian # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example @@ -77,16 +76,6 @@ # }; }; - jovian = { - steamos = { - enableAutoMountUdevRules = true; - }; - decky-loader = { - enable = true; - package = pkgs.decky-loader-prerelease; - extraPackages = [pkgs.python3]; - }; - }; boot = { loader.systemd-boot.enable = false; @@ -96,6 +85,11 @@ enable = true; pkiBundle = "/var/lib/sbctl"; }; + extraModprobeConfig = '' + #fix for https://gitlab.freedesktop.org/drm/amd/-/issues/4141 + amdgpu.runpm=0 + amdgpu.dcdebugmask=0x10 + ''; }; users.users.lillian.extraGroups = ["gamemode"]; From b3d077bace89532813a9cf5d63f89c7a65744fb0 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 11 Dec 2025 13:43:03 +0100 Subject: [PATCH 164/204] let's forget about the instances symlink, it just causes issues --- home-manager/desktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index d312b26..3fcd570 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -139,11 +139,11 @@ source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.mozilla/firefox"; target = ".librewolf"; }; - instances = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/instances"; - target = ".local/share/PrismLauncher/instances"; - force = true; - }; + # instances = { + # source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/instances"; + # target = ".local/share/PrismLauncher/instances"; + # force = true; + # }; }; # Add stuff for your user as you see fit: From 65ba323c17f5a3b96d7bb53ad902ab548ebd6f4b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Dec 2025 20:27:58 +0100 Subject: [PATCH 165/204] update flake lock --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 84f9df0..c0b1b6f 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764885363, - "narHash": "sha256-P6UHmw6enwxmP5wP4Lv722+tgpq1PFDAPAdtj7l/16U=", + "lastModified": 1765485905, + "narHash": "sha256-fk6zFzzcwz6su99K7UTxS2497+z/Cdk3FzNsacsmZKA=", "owner": "catppuccin", "repo": "nix", - "rev": "95042630028d613080393e0f03c694b77883c7db", + "rev": "b49c675acd80931fc8b54290920a90189b461dcf", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1763938834, - "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=", + "lastModified": 1765145449, + "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", "owner": "ipetkov", "repo": "crane", - "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2", + "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1764627417, - "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", + "lastModified": 1765326679, + "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", "owner": "nix-community", "repo": "disko", - "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", + "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765495779, + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1764952935, - "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=", + "lastModified": 1765480374, + "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", "owner": "nix-community", "repo": "home-manager", - "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d", + "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", + "lastModified": 1765526639, + "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", + "rev": "457a55ed77a105088a47cb55b9eccf7768559451", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764622702, - "narHash": "sha256-HggOVvg2U3EwT44wPHEwFKromf9qR9rTqfV1i3q7rYs=", + "lastModified": 1765382359, + "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6242b3b2b5e5afcf329027ed4eb5fa6e2eab10f1", + "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1764475780, - "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1764977145, - "narHash": "sha256-zZIJvz/wWpsAcT1EQet7XZcm9RFSJUg6OgHquUeOTqQ=", + "lastModified": 1765566456, + "narHash": "sha256-llli/v5zGR0n7b3yt7UmFzvJccsnLwjWPgdeQLmCw4s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb41ce8d34c0bc983d2301108d16b569f3722f1d", + "rev": "9f629b2c4429be9276e9f6dba98dcadc933a2633", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1764445028, - "narHash": "sha256-ik6H/0Zl+qHYDKTXFPpzuVHSZE+uvVz2XQuQd1IVXzo=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a09378c0108815dbf3961a0e085936f4146ec415", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -797,11 +797,11 @@ ] }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -858,11 +858,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1765553226, + "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "496a6f625f63b780ce849891868f2fad22fd49c6", "type": "github" }, "original": { @@ -890,11 +890,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764961493, - "narHash": "sha256-IMv2/LdW6R+P82AFvAZdPAneQKmDRXQU1Qls64ORFh8=", + "lastModified": 1765474444, + "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", "owner": "nix-community", "repo": "stylix", - "rev": "46440f1bc877c467f2d31c5a825883437b8077f0", + "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", "type": "github" }, "original": { From 99996b4e88fd0cd19d87f3354dfd5dda7fdd10f2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 12 Dec 2025 20:40:28 +0100 Subject: [PATCH 166/204] remove comma from desktop to avoid conflic --- nixos/desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 3e750a5..2bf69a2 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -52,7 +52,6 @@ jdk21_headless #bcachefs-tools clinfo - comma direnv exfat exfatprogs From 3832c86fc1e633770c4c404544bccc0ac98d9bd7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Dec 2025 14:54:05 +0100 Subject: [PATCH 167/204] update mail server certificate situation --- flake.lock | 134 +++++++++--------- .../package-configs/mail-server/default.nix | 7 +- 2 files changed, 72 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index c0b1b6f..9b59a62 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765485905, - "narHash": "sha256-fk6zFzzcwz6su99K7UTxS2497+z/Cdk3FzNsacsmZKA=", + "lastModified": 1765990358, + "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", "owner": "catppuccin", "repo": "nix", - "rev": "b49c675acd80931fc8b54290920a90189b461dcf", + "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1765145449, - "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", + "lastModified": 1765739568, + "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", "owner": "ipetkov", "repo": "crane", - "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", + "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", "type": "github" }, "original": { @@ -119,11 +119,11 @@ }, "crane_2": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1765739568, + "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1765326679, - "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1765495779, - "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1765480374, - "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", + "lastModified": 1765980955, + "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", + "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765526639, - "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", + "lastModified": 1766137899, + "narHash": "sha256-G4UMKyt6iLlK3eeFQuIKKG+9FwattDMmtYsoF0+b4zk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "457a55ed77a105088a47cb55b9eccf7768559451", + "rev": "d9879776a2ba5def8cf5e73c05b3f62563f77a71", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765382359, - "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", + "lastModified": 1766146127, + "narHash": "sha256-6bA+9FNE7bWOUanW6Mujcbzhm9A74dCTUBX5/bA0RVQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", + "rev": "b8c5ab2bd227f840bc8e1944631fe718b19c3336", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1765566456, - "narHash": "sha256-llli/v5zGR0n7b3yt7UmFzvJccsnLwjWPgdeQLmCw4s=", + "lastModified": 1766150654, + "narHash": "sha256-2jF7wydQiv4wd4kmWglzuaWemt9PbNXify4kPx2q5m8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f629b2c4429be9276e9f6dba98dcadc933a2633", + "rev": "17f5134b772cbcc784f3766eed8a2daf5784e238", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "lastModified": 1765457389, + "narHash": "sha256-ddhDtNYvleZeYF7g7TRFSmuQuZh7HCgqstg5YBGwo5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", + "rev": "f997fa0f94fb1ce55bccb97f60d41412ae8fde4c", "type": "github" }, "original": { @@ -682,11 +682,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1765464257, + "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", "type": "github" }, "original": { @@ -797,11 +797,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1765680428, + "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", "type": "github" }, "original": { @@ -818,11 +818,11 @@ ] }, "locked": { - "lastModified": 1754880555, - "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", + "lastModified": 1765939271, + "narHash": "sha256-7F/d+ZrTYyOxnBZcleQZjOOEWc1IMXR/CLLRLLsVtHo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", + "rev": "8028944c1339469124639da276d403d8ab7929a8", "type": "github" }, "original": { @@ -839,11 +839,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1764763336, - "narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=", + "lastModified": 1766109532, + "narHash": "sha256-WyJmJuH2JHHi0xRHQu+CLoh7LE1Wpnm5V15fEbmnMKI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e", + "rev": "616a57af55edaac3bee4343feef116f954de5b2a", "type": "gitlab" }, "original": { @@ -858,11 +858,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1765553226, - "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=", + "lastModified": 1765836173, + "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "496a6f625f63b780ce849891868f2fad22fd49c6", + "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", "type": "github" }, "original": { @@ -890,11 +890,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765474444, - "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", + "lastModified": 1765897595, + "narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=", "owner": "nix-community", "repo": "stylix", - "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", + "rev": "e6829552d4bb659ebab00f08c61d8c62754763f3", "type": "github" }, "original": { @@ -1037,11 +1037,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1761162625, - "narHash": "sha256-cJD5RccT5aFwLFiId8PW91z39MpoQZIymj+qZEJ5jTE=", + "lastModified": 1766016463, + "narHash": "sha256-aWp608krMtk5I+c3GXyuHkb6ugah40cBI0R52fNqMiI=", "owner": "dj95", "repo": "zjstatus", - "rev": "a4bb655af8f49fe53de7fefca54348de21ecbbb2", + "rev": "9a4b88fdceee8eb2b8c28111c53e94254d61c994", "type": "github" }, "original": { diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index 5bad2ac..1f0311c 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -87,8 +87,11 @@ "no-reply@git.lillianviolet.dev" "ongebonden@gladtherescake.eu" ]; - certificateScheme = "acme-nginx"; - certificateDomains = [ + x509.useACMEHost = config.mailserver.fqdn; + }; + security.acme.certs.${config.mailserver.fqdn} = { + webroot = "/var/lib/acme/acme-challenge/"; + extraDomainNames = [ "imap.lillianviolet.dev" "mail.lillianviolet.dev" "pop3.lillianviolet.dev" From 1d98250ed6e281018228352b99456bb785fb7eda Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 19 Dec 2025 15:01:38 +0100 Subject: [PATCH 168/204] 'use bleeding edge of plasma-vault for now as it's broken in unstable --- nixos/desktop/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 2bf69a2..28ca2b9 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -35,8 +35,8 @@ KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess" ''; - environment.systemPackages = - with pkgs; [ + environment.systemPackages = with pkgs; + [ # Custom tools dvd dvt @@ -78,7 +78,6 @@ kdePackages.plasma-integration kdePackages.plasma-activities kdePackages.plasma-workspace - kdePackages.plasma-vault kdePackages.discover kdePackages.filelight kdePackages.kcalc @@ -107,11 +106,9 @@ intiface-central #rustdesk ] - # ++ (with pkgs-edge; [ - # list of latest packages from nixpkgs master - # Can be used to install latest version of some packages - # ]) - ; + ++ (with pkgs-edge; [ + kdePackages.plasma-vault + ]); fonts.packages = [pkgs.ttf-ms-win10]; sops = { From 15ecb725f9f6cb6e9c3f5e3928cef2f0406be102 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 23 Dec 2025 20:24:06 +0100 Subject: [PATCH 169/204] add biscotti recipe to bookmarks --- home-manager/desktop/package-configs/firefox/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/desktop/package-configs/firefox/default.nix b/home-manager/desktop/package-configs/firefox/default.nix index 0abb48c..579c3d1 100644 --- a/home-manager/desktop/package-configs/firefox/default.nix +++ b/home-manager/desktop/package-configs/firefox/default.nix @@ -120,6 +120,11 @@ tags = ["baking" "US" "vegan" "cheesecake" "cake" "dessert" "sweet" "baked" "nut free" "cream cheese"]; url = "https://www.noracooks.com/vegan-cheesecake/"; } + { + name = "Biscotti"; + tags = ["baking" "Italian" "cookies" "sweet" "dessert" "fruits" "nuts" "almonds" "cranberries" "lemon"]; + url = "https://italianchef.org/the-ultimate-guide-to-homemade-italian-biscotti-recipes-tips-and-variations/"; + } ]; } ]; From f9dadacbe46cdf6ada2e2cb56144a57b98537f0d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Dec 2025 15:28:15 +0100 Subject: [PATCH 170/204] update flake lock --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 9b59a62..cf9015c 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1765739568, - "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", + "lastModified": 1766194365, + "narHash": "sha256-4AFsUZ0kl6MXSm4BaQgItD0VGlEKR3iq7gIaL7TjBvc=", "owner": "ipetkov", "repo": "crane", - "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", + "rev": "7d8ec2c71771937ab99790b45e6d9b93d15d9379", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1765980955, - "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "lastModified": 1766682973, + "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", "owner": "nix-community", "repo": "home-manager", - "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", + "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1766137899, - "narHash": "sha256-G4UMKyt6iLlK3eeFQuIKKG+9FwattDMmtYsoF0+b4zk=", + "lastModified": 1766561058, + "narHash": "sha256-VFqsBWqFFBTBqKFw0fGw2a2mJjPP9HPW8nXEW2A5zJM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d9879776a2ba5def8cf5e73c05b3f62563f77a71", + "rev": "9d0abe57d633a6e08d72865a761891a8c81e740f", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766146127, - "narHash": "sha256-6bA+9FNE7bWOUanW6Mujcbzhm9A74dCTUBX5/bA0RVQ=", + "lastModified": 1766582277, + "narHash": "sha256-mUZRMKId7Uycwnt31RytPwhmY/8UTbk92ckZWHoS0Eg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b8c5ab2bd227f840bc8e1944631fe718b19c3336", + "rev": "4c78502846c1ef668eedbd4f55d818ebac5388ac", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1766568855, + "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1766150654, - "narHash": "sha256-2jF7wydQiv4wd4kmWglzuaWemt9PbNXify4kPx2q5m8=", + "lastModified": 1766842912, + "narHash": "sha256-SzsTB2TwGJdUhftnhzbOSl7E9zCA+arDf2UekBosEwo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17f5134b772cbcc784f3766eed8a2daf5784e238", + "rev": "e84c4549c32ee83f156e0f402b1bb9a7fbeff42e", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1765457389, - "narHash": "sha256-ddhDtNYvleZeYF7g7TRFSmuQuZh7HCgqstg5YBGwo5s=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f997fa0f94fb1ce55bccb97f60d41412ae8fde4c", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1765464257, - "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -797,11 +797,11 @@ ] }, "locked": { - "lastModified": 1765680428, - "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", + "lastModified": 1766285238, + "narHash": "sha256-DqVXFZ4ToiFHgnxebMWVL70W+U+JOxpmfD37eWD/Qc8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", + "rev": "c4249d0c370d573d95e33b472014eae4f2507c2f", "type": "github" }, "original": { @@ -839,11 +839,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1766109532, - "narHash": "sha256-WyJmJuH2JHHi0xRHQu+CLoh7LE1Wpnm5V15fEbmnMKI=", + "lastModified": 1766321686, + "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "616a57af55edaac3bee4343feef116f954de5b2a", + "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3", "type": "gitlab" }, "original": { @@ -858,11 +858,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1765836173, - "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", + "lastModified": 1766289575, + "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", + "rev": "9836912e37aef546029e48c8749834735a6b9dad", "type": "github" }, "original": { @@ -890,11 +890,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765897595, - "narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=", + "lastModified": 1766603026, + "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", "owner": "nix-community", "repo": "stylix", - "rev": "e6829552d4bb659ebab00f08c61d8c62754763f3", + "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", "type": "github" }, "original": { From e7c15976a20adae667819f615de3adc013a664c8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Dec 2025 15:46:55 +0100 Subject: [PATCH 171/204] make downloads on GLaDOS be tmpfs --- disko/GLaDOS/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index 42aeb33..f998acc 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -14,7 +14,7 @@ type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; + mountOptions = ["umask=0077"]; }; }; nvme_luks = { @@ -22,7 +22,7 @@ content = { type = "luks"; name = "nvme_crypted"; - extraOpenArgs = [ ]; + extraOpenArgs = []; settings = { # if you want to use the key for interactive login be sure there is no trailing newline # for example use `echo -n "password" > /tmp/secret.key` @@ -65,5 +65,13 @@ }; }; }; + nodev = { + "/home/lillian/Downloads" = { + fsType = "tmpfs"; + mountOptions = [ + "size=4G" + ]; + }; + }; }; } From 4364ed325b0f1a04c5020d9367dd4e8e03af9041 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Dec 2025 16:17:40 +0100 Subject: [PATCH 172/204] make steam symlink in home for easy access --- home-manager/desktop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 3fcd570..d97e1fe 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -139,6 +139,10 @@ source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.mozilla/firefox"; target = ".librewolf"; }; + steam = { + source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.local/share/Steam/"; + target = "Steam"; + }; # instances = { # source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/instances"; # target = ".local/share/PrismLauncher/instances"; From 23d9888458af4c8c8ef88e12480458a0847104e8 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Dec 2025 16:34:33 +0100 Subject: [PATCH 173/204] spelling fix for lanzaboote --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 28f2521..a3071c5 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ if you don't want to use [sops](https://github.com/Mic92/sops-nix) secret manage Upon any of the above changes; also remove/replace the secret files, they can be found under the host configuration folders in ``hosts//secrets/sops.yaml`` -For the hosts EDI and GLaDOS, [lanzaboot](https://github.com/nix-community/lanzaboote) has to be disabled (and re-enabled if you want secure boot after install). You can first replace enabling lanzaboot with systemd-boot. You can do this by commenting out the lanzaboot configuration, and replace the line +For the hosts EDI and GLaDOS, [lanzaboote](https://github.com/nix-community/lanzaboote) has to be disabled (and re-enabled if you want secure boot after install). You can first replace enabling lanzaboot with systemd-boot. You can do this by commenting out the lanzaboote configuration, and replace the line ``boot.loader.systemd-boot.enable = lib.mkForce false;`` with ``boot.loader.systemd-boot.enable = true`` -To turn secure boot back on again you can look at the [lanzaboot](https://github.com/nix-community/lanzaboote) repository and follow the install steps. +To turn secure boot back on again you can look at the [lanzaboote](https://github.com/nix-community/lanzaboote) repository and follow the install steps. Then run this command with your cloned github repo (I put mine in /etc/nixos): From 31ace37709957745d01ae5966131084c347914e2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 27 Dec 2025 16:38:06 +0100 Subject: [PATCH 174/204] remove applications from task bar I no longer have installed --- .../desktop/package-configs/plasma-desktop/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index 3d44c61..c9f3f9e 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -96,7 +96,7 @@ "org.kde.milou" "org.kde.plasma.panelspacer" "org.kde.plasma.colorpicker" - { + { systemTray.items = { # We explicitly show bluetooth and battery shown = [ @@ -170,12 +170,10 @@ "applications:signal.desktop" "applications:vesktop.desktop" "applications:thunderbird.desktop" - "applications:cinny.desktop" "applications:steam.desktop" "applications:noisetorch.desktop" "applications:org.kde.plasma-systemmonitor.desktop" "applications:foot.desktop" - "applications:nitrokey-app.desktop" "applications:freetube.desktop" ]; }; From f95d8cdbcfee06b5c31ee370e46b972f46182a8e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Jan 2026 16:39:32 +0100 Subject: [PATCH 175/204] Disable wheatley, update flake lock, set up preservation in preparation for using it (setup encryption on queen first) --- flake.lock | 100 +++-- flake.nix | 25 +- home-manager/desktop/default.nix | 1 - nixos/desktop/default.nix | 10 + nixos/hosts/GLaDOS/configuration.nix | 1 + nixos/hosts/GLaDOS/secrets/sops.yaml | 14 +- nixos/hosts/queen/configuration.nix | 2 + nixos/shared/default.nix | 2 +- nixos/shared/packages/default.nix | 2 +- nixos/shared/preservation.nix | 195 ++++++++++ overlays/flake.nix | 110 ++++++ overlays/systemd-detect-fash.patch | 554 +++++++++++++++++++++++++++ 12 files changed, 953 insertions(+), 63 deletions(-) create mode 100644 nixos/shared/preservation.nix create mode 100644 overlays/flake.nix create mode 100644 overlays/systemd-detect-fash.patch diff --git a/flake.lock b/flake.lock index cf9015c..b21d7ba 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1766194365, - "narHash": "sha256-4AFsUZ0kl6MXSm4BaQgItD0VGlEKR3iq7gIaL7TjBvc=", + "lastModified": 1766774972, + "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", "owner": "ipetkov", "repo": "crane", - "rev": "7d8ec2c71771937ab99790b45e6d9b93d15d9379", + "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1766682973, - "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", + "lastModified": 1767437240, + "narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=", "owner": "nix-community", "repo": "home-manager", - "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", + "rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1766561058, - "narHash": "sha256-VFqsBWqFFBTBqKFw0fGw2a2mJjPP9HPW8nXEW2A5zJM=", + "lastModified": 1767082077, + "narHash": "sha256-2tL1mRb9uFJThUNfuDm/ehrnPvImL/QDtCxfn71IEz4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9d0abe57d633a6e08d72865a761891a8c81e740f", + "rev": "efd4b22e6fdc6d7fb4e186ae333a4b74e03da440", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766582277, - "narHash": "sha256-mUZRMKId7Uycwnt31RytPwhmY/8UTbk92ckZWHoS0Eg=", + "lastModified": 1767013031, + "narHash": "sha256-p8ANXBakAtfX/aEhLbU6w0tuQe3nrBvLdHbKirJP7ug=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4c78502846c1ef668eedbd4f55d818ebac5388ac", + "rev": "c2a82339373daee8cbbcad5f51f22ae6b71069e0", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1766842912, - "narHash": "sha256-SzsTB2TwGJdUhftnhzbOSl7E9zCA+arDf2UekBosEwo=", + "lastModified": 1767455410, + "narHash": "sha256-TSvmXw7o4JxF9ezZbexZRamzq2XL0JQurOncalFJeP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e84c4549c32ee83f156e0f402b1bb9a7fbeff42e", + "rev": "b32ae206cdbeb3d9fd5e15d7810fd97ff82e3a56", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1766125104, - "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", + "lastModified": 1766840161, + "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", + "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -767,6 +767,21 @@ "type": "github" } }, + "preservation": { + "locked": { + "lastModified": 1757436102, + "narHash": "sha256-mMI9IanU+Xw+pVogD2oT0I2kTmvz2Un/Apc5+CwUpEY=", + "owner": "nix-community", + "repo": "preservation", + "rev": "93416f4614ad2dfed5b0dcf12f27e57d27a5ab11", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "preservation", + "type": "github" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -783,6 +798,7 @@ "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", + "preservation": "preservation", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", "stylix": "stylix", @@ -797,11 +813,11 @@ ] }, "locked": { - "lastModified": 1766285238, - "narHash": "sha256-DqVXFZ4ToiFHgnxebMWVL70W+U+JOxpmfD37eWD/Qc8=", + "lastModified": 1766976750, + "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c4249d0c370d573d95e33b472014eae4f2507c2f", + "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", "type": "github" }, "original": { @@ -858,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1766289575, - "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9836912e37aef546029e48c8749834735a6b9dad", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -890,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766603026, - "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", + "lastModified": 1767397606, + "narHash": "sha256-QA1d/6XzxK3lsMiJ+xiJf340cpNeJs/xIM6D0/yLqs4=", "owner": "nix-community", "repo": "stylix", - "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", + "rev": "6850ad2e9f3f7ff6116e9e6fb73a9cca2d9b1a35", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ca225bd..888c106 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,9 @@ zjstatus.url = "github:dj95/zjstatus"; + # preservation + preservation.url = "github:nix-community/preservation"; + # Fix for steam cursor not being visible under wayland # Add any other flake you might need @@ -95,6 +98,7 @@ jovian, nixos-hardware, nix-index-database, + preservation, stylix, ... } @ inputs: let @@ -130,6 +134,7 @@ catppuccin.nixosModules.catppuccin stylix.nixosModules.stylix nix-index-database.nixosModules.nix-index + preservation.nixosModules.preservation {programs.nix-index-database.comma.enable = true;} { home-manager.sharedModules = [ @@ -254,16 +259,16 @@ ]; }; - wheatley = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = - sharedModules - ++ [ - {_module.args = {inherit pkgs-edge;};} - ./nixos/hosts/wheatley/configuration.nix - ]; - }; + # wheatley = nixpkgs.lib.nixosSystem { + # system = "aarch64-linux"; + # specialArgs = {inherit inputs outputs;}; + # modules = + # sharedModules + # ++ [ + # {_module.args = {inherit pkgs-edge;};} + # ./nixos/hosts/wheatley/configuration.nix + # ]; + # }; }; }; } diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index d97e1fe..60ae31e 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -60,7 +60,6 @@ # }) ]; config = { - permittedInsecurePackages = ["cinny-4.2.3" "cinny-unwrapped-4.2.3" "cinny-4.2.2" "cinny-unwrapped-4.2.2"]; # Configure your nixpkgs instance # Disable if you don't want unfree packages diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 28ca2b9..bbb9dc8 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -117,6 +117,16 @@ owner = config.users.users.lillian.name; path = "/home/lillian/.netrc"; }; + secrets."prod.keys" = { + mode = "0600"; + owner = config.users.users.lillian.name; + path = "/home/lillian/.config/Ryujinx/system/prod.keys"; + }; + secrets."title.keys" = { + mode = "0600"; + owner = config.users.users.lillian.name; + path = "/home/lillian/.config/Ryujinx/system/title.keys"; + }; }; programs = { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index dabd92b..e8c31c5 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -78,6 +78,7 @@ boot = { loader.systemd-boot.enable = false; + initrd.systemd.enable = true; binfmt.emulatedSystems = ["aarch64-linux"]; diff --git a/nixos/hosts/GLaDOS/secrets/sops.yaml b/nixos/hosts/GLaDOS/secrets/sops.yaml index d2521b7..6e48ec8 100644 --- a/nixos/hosts/GLaDOS/secrets/sops.yaml +++ b/nixos/hosts/GLaDOS/secrets/sops.yaml @@ -1,12 +1,11 @@ lillian-password: ENC[AES256_GCM,data:aHJCYmnpGIWJMsNZ8aw51Rquuv4F7kgGvfIxHMELuDlEqgjkg+SAhh+UQEpv16F0WVxrYZ/EwxKFMBpfPv9M2NLZC98bav0D9g==,iv:uzYLfmxG46ubmgeFsfW7aqXZbcL+TQw0VdDcklV0/ZI=,tag:Ozcf5qXC7xh0VcsBzhyo2g==,type:str] +#ENC[AES256_GCM,data:RrwVo88C14k703l24w5RQd81lQFy/49aJUa1IZWdY0at1GfiKSbbep+kdxtQBpU0Bp9VYg==,iv:+K1BLn+6SlQC5JAjgzMUZnuqT4cuqisETzHBKUfS+y4=,tag:jTMn4LcoNnhWyzVzLOvXrA==,type:comment] wg-private-key: ENC[AES256_GCM,data:em6sci3eefw5TJHpzgTaGGuQp8UuvOmkHRsQltg0TKpMb1Lrcxicb23cQxo=,iv:VEeGmzncHyAgP5toTOwDK6qw0OT4/6Etxh8Zr4uYQD4=,tag:nvse11zMhzukzClx5ub4dw==,type:str] ssh-private-key: ENC[AES256_GCM,data:YM8GTH6EEXLt1ZC1ZdyLWVJyGUykS0DulTL0QgOFCTztRA+5JoA6Af42MIEMm4sMSatOt9pbGE9BXh5T53uNkx87cS8pfb714N8EKrMTYmtWi2M2TatEM6+qMRpP777GalB3v2HnfTfwhx+TfQ+iSCEo45Unsumzr+/9uZ/b4vYBxbd82UKO1tmlTw3R7aEpesJuJe/I3sAg0ZXTWti0e2MYfFawlSXtgQo382bFnV/mi9JkNx62AUFI6Q0a09V2C3FU4e4qP9jeP+COfCuCjRuaf8eu0VYczy4vVkN5NNBhkuLCZl0xANfqM5tDt8q+meYHmYWq1ceyeZ9OdZhKA7lMJi2K1DgTmgbD356itEtjXb7KF7VWIVnR0Gm+vVHx90Bv6eQp4n2I5mWbCVy8wqiIlacxuH8PO6jAPUM1Q8E+SVJb2HcLPdlURHyyK0fLVWaFhtFH4rwyKAv/2yEO2iNfZd9zFqvX5/JdyUPRCpMKkjxQgZN+raVHok0SwvPfXA9wvRpQyYSD4SUqCYsRcs6JugW8a14bZrvg,iv:L9ACOUFtAxkWsXW+tDKGwKn1ZHYNv7WmBty5krayVu8=,tag:hbrgscOczukqLBU/Y+6aLA==,type:str] nextcloud-password: ENC[AES256_GCM,data:ClQk7M7BTeIhgWTWsgjTFb0Um8qZ901530dI9xnbs63ZGIni4+bWjLPetOmM3+PPsg33vF6r0xiwu0Ff,iv:jDy8miUoPcua3sraRQWOHWrhNacKEgf6nGsi8PVTYaY=,tag:ldGta+DdUmoajtAE6HLtkw==,type:str] +prod.keys: ENC[AES256_GCM,data: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,iv:0QEPw6CMkOeGPkpZq3hZenkKDFnAdNiBbJbIMOLCbHw=,tag:SqHlmsYEPIMlGfPhkVrDAQ==,type:str] +title.keys: ENC[AES256_GCM,data:mAlox5nq4dyZHmDndZkmghu8Qp7F5oTSx7CKEiygztmrFaSNji8csIdMp+t9eL43elrVatckALrLIw4e3Zlh7Osf9dqLAVbE6SV7YUfo/AeKfbmYU9UoM7+YlnxqS9T83xvmr++pNM/mxSZJwvgDTbQVWeW2T6+6Mglozmh/8yDOqT/vmj+gsHD6ndXID+FxohgI+kP3b8YI1oYlwdZaPAVtZYrYhgWpZ6yBiZbhhjtoBV5xIfQQRQdDAx8kC1xDbA0Ntmn5hGgPbCwpina3K+1Ukh30orGq1dB/7hb2AsuxsRVgWQ5uqSHCCV+BkybgoeHFR8G58VYl5/TzQbJSRb+NOo/2XeVByUq++kFyudQTSZvhijyjZ+GmErftpEz6rC4a/jte9j1MGaMLbAzEMTFZbBte4VLVgC4k/CNFDxkeYKcB3+Dspl4tMw+R70WWr5vo1hduUCkhC2N+2VlJ2vokFkoL+E4pw1r8XaQZN60JHz/3C5hgw/FwlNidro6DzlFzWSpZoRymkr1UPuEICb5P7fDB3au0yDYpqpWXCPqTU1WtFvAf2273kip2VOd1iWpcx4LcVOYdwvM2NkGx/gIzEmU2sJAIdB8m/p9Jjj3WHOxnXTR75OZo5zHi1aQiBvMjW+xg37pu6Dt7m9LNabPWpedgQtZxw3bhWhDrOqo0DfQEsyHvjaNzCTro3zZKnCPSqDPcEpAxD8fogtpSZoa6beNVCJYQ54o5qlGoH2eRvG/M2ncq9tzn9iwAP8MfKWlyIyPUwQzZaT14Wl3pl90HRrolu3tzZpAFNc1Ok7zKYTIXKzxMl3Au5hyP2mvGXYZl+GwhO2rk1CpdhFjNvq6orxFmnDQjX1e8QmxlR0B6tUeIwDWyssGO+Ie2k23eOW3mM1JLt+7HY3R65MoI6SdNaQxH7lqNnm21rp9eKjIQS0NBwLeO8XVM7VtyeYt7Awl7eBybmDrrRLTBi4JD2eayhBTqtvmjIwndNcxmSbY9chYs1n128ujNuzHud/QdTx4w0CndR9F8zIpISakonSZvVb4vh6JFY5uymONK0tlLy63sDLjPh3NMIM4/qEC7W0wTgX1uHG5Ac4AY2ptaaKFLlM/WNNS5cmObWZgytpR+UEWh5S+gmcSePf6DzAoZu/U2gBX+vA3eVA1Y5aAQA0gdDa+AI9jaBT9YGdM/+8im9brIzEozscybltpAdTe8/mUwl06FmziX1mO37mv/uxBAig4o2lUrEinH1vJEKWHtWWIOGIMIkz4BY0/3KK5vO/liie6aY2BbCnx47slRZg9r2jgPtz9iKxSW53QFeg62b51futQbmuipKoGwp0hW2NiKfa3UY5YQUNOoismU0YHvNGRm0VIKhUZZq7DUyHigxAQqrPFjpqw3318gVHQXWwacCgcr6onQ48Ke/H7/Vop/dRNmK7T5CKQE/zP+S/j9AixxNsnZ/FUBiRXQIeQoonrzo45Uh+9DEsn4G91S7utwrxYVEkNLIjGu4h80zpgxHqODop9v5dsvpvje2MX2C84hRttjB+zM1K5T3/xyH+g2Hk7owg9aIZsE+th8cGCkl2BVMl9750+fx5+K7j4iPgbw+6cub09W99Na+tuOMWAJT0M/IHr3,iv:LDGFvr5s5WvigWGeKmjOlY2mKEjAu+So3n6pRbChE+Q=,tag:9gQhB5fcFHNk7IltvrygKQ==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -17,8 +16,7 @@ sops: MUZWTVh0dVdMZlRzelJ4WlROUlIyNmcKphNuMN9Wh8h/gvmtUxQWjPKtgjWriLRD +DpEEVGrmu0RJ8/wUqjxGoL4GzLAlZm4EnKlyUyA0tw8sbLZ2Lnl/w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-01T15:48:15Z" - mac: ENC[AES256_GCM,data:64DmkqcYlLtzL+9WcgvnSOjF25MiZFkbEsgKP/xLrBBvhqqqm4ev9tk8QGoA5NJPHen+GItX7D3lJgfTyjX6LXn6vLFQWemrEP2+A9hZxnwvtdBjSD5dEl6wHGgY4mvqTJupmpv6Gg8zXP1kh5vsO82Un03TcfyPHVVgmfagpOw=,iv:j/6jJjRoiTUfTW2SJ0Ui6dAVQO9Ij8zN2mrKEhIt7fY=,tag:6r/GNnG/lw42KbWgIBoIzQ==,type:str] - pgp: [] + lastmodified: "2025-12-29T14:31:21Z" + mac: ENC[AES256_GCM,data:K6gtlrWGtNvWwcE7zExB45kl9dxpA3zxbaqAFJd18HhVZb6VP1QRe2VcaoS/rlKBU508Z76sVuh/9hj7PBUMp+oPxWyxuUD4PUkYHxvELN4sHFzrJ+whXQVxCC81VwP6adA0fhwSyMxRLETf0tZo/09jTXMmbLZKZIDnFI5vbLs=,iv:Fg1tyIr4yKtdi0R1k+9j+1wxkAGtwvCGwGVHVQMfeuU=,tag:vND8ZazwY7i+DFj4nnTrsA==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.11.0 diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 7823b4e..d2f43b5 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -30,6 +30,8 @@ # ../../../disko/queen ]; + preservation.enable = lib.mkForce false; + services.anubis.instances.default.settings.TARGET = "http://localhost:8123"; # required due to unix socket permissions diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 1fd8765..c217eaf 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -5,12 +5,12 @@ config, pkgs, pkgs-edge, - stdenv, ... }: { imports = [ ./locale ./packages + ./preservation.nix inputs.home-manager.nixosModules.home-manager #../hosts/${config.networking.hostName}/hardware-configuration.nix ]; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 81400f0..e6ee20c 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -28,7 +28,7 @@ age alejandra e2fsprogs - uutils-findutils + # uutils-findutils git git-filter-repo pre-commit diff --git a/nixos/shared/preservation.nix b/nixos/shared/preservation.nix new file mode 100644 index 0000000..f79891c --- /dev/null +++ b/nixos/shared/preservation.nix @@ -0,0 +1,195 @@ +{...}: { + preservation = { + # the module doesn't do anything unless it is enabled + enable = true; + + preserveAt."/persistent" = { + # preserve system directories + directories = [ + #Shared + "/var/lib/sbctl" + "/var/lib/bluetooth" + "/var/lib/fprint" + "/var/lib/fwupd" + "/var/lib/libvirt" + "/var/lib/tpm2-tss" + "/var/lib/tpm2-udev-trigger" + "/var/lib/power-profiles-daemon" + "/var/lib/systemd/coredump" + "/var/lib/systemd/rfkill" + "/var/lib/systemd/timers" + "/var/log" + #Desktop + "/var/lib/decky-loader" + "/var/lib/flatpak" + #Server + "/var/lib/continuwuity" + "/var/lib/dhcpcd" + "/var/lib/docker" + "/var/lib/dovecot" + "/var/lib/forgejo" + "/var/lib/gotosocial" + "/var/lib/grafana" + "/var/lib/jellyfin" + "/var/lib/media" + "/var/lib/mollysocket" + "/var/lib/private" + "/var/lib/mysql" + "/var/lib/nextcloud" + "/var/lib/onlyoffice" + "/var/lib/postfix" + "/var/lib/postgresql" + "/var/lib/prometheus2" + "/var/lib/rabbitmq" + "/var/lib/redis-nextcloud" + "/var/lib/redis-rspamd" + "/var/lib/secrets" + "/var/lib/writefreely" + "/var/db" + "/var/dkim" + "/var/secrets" + "/var/sieve" + "/var/vmail" + "/var/mysql" + { + directory = "/var/lib/nixos"; + inInitrd = true; + } + ]; + + # preserve system files + files = [ + { + file = "/etc/machine-id"; + inInitrd = true; + } + { + file = "/etc/ssh/ssh_host_rsa_key"; + how = "symlink"; + configureParent = true; + } + { + file = "/etc/ssh/ssh_host_ed25519_key"; + how = "symlink"; + configureParent = true; + } + "/var/lib/usbguard/rules.conf" + + # creates a symlink on the volatile root + # creates an empty directory on the persistent volume, i.e. /persistent/var/lib/systemd + # does not create an empty file at the symlink's target (would require `createLinkTarget = true`) + { + file = "/var/lib/systemd/random-seed"; + how = "symlink"; + inInitrd = true; + configureParent = true; + } + "/var/lib/systemd/tpm2-srk-public-key.pem" + "/var/lib/systemd/tpm2-srk-public-key.tpm2b_public" + ]; + + # preserve user-specific files, implies ownership + users = { + lillian = { + commonMountOptions = [ + "x-gvfs-hide" + ]; + directories = [ + { + directory = ".ssh"; + mode = "0700"; + } + #Desktop + "gnupg" + ".local/state/wireplumber" + ".local/share/direnv" + ".local/state/nix" + ".local/state/comma" + ".local/state/home-manager" + ".local/share/PrismLauncher" + ".local/share/qBittorrent" + ".local/share/kwalletd" + ".local/share/kwin" #TODO: add the window script via nix instead of saving it imperatively and keeping it + ".local/share/lutris" + ".local/share/Nextcloud" + ".local/share/Steam" + ".local/share/zoxide" + ".local/share/flatpak" + ".local/share/applications" + ".local/share/firefoxpwa/" + ".local/share/com.nonpolynomial.intiface_central" + ".mozilla" + ".steam" + ".zsh" + ".pki" + ".tldrc" + ".thunderbird" + "Code" + "Writing" + ".config/kdeconnect" + ".config/Nextcloud" + ".config/noisetorch" + ".config/qBittorrent" + ".config/r2modman" + ".config/r2modmanPlus-local" + ".config/Ryujinx" + ".config/Signal" + ".config/sops" + ".config/vesktop" + ]; + #Shared + files = [ + ".z" + ".zsh_history" + ]; + }; + root = { + # specify user home when it is not `/home/${user}` + home = "/root"; + directories = [ + { + directory = ".ssh"; + mode = "0700"; + } + ]; + }; + }; + }; + }; + + # Create some directories with custom permissions. + # + # In this configuration the path `/home/butz/.local` is not an immediate parent + # of any persisted file, so it would be created with the systemd-tmpfiles default + # ownership `root:root` and mode `0755`. This would mean that the user `butz` + # could not create other files or directories inside `/home/butz/.local`. + # + # Therefore systemd-tmpfiles is used to prepare such directories with + # appropriate permissions. + # + # Note that immediate parent directories of persisted files can also be + # configured with ownership and permissions from the `parent` settings if + # `configureParent = true` is set for the file. + systemd.tmpfiles.settings.preservation = { + "/home/lillian/.config".d = { + user = "lillian"; + group = "users"; + mode = "0755"; + }; + "/home/lillian/.local".d = { + user = "lillian"; + group = "users"; + mode = "0755"; + }; + "/home/lillian/.local/share".d = { + user = "lillian"; + group = "users"; + mode = "0755"; + }; + "/home/lillian/.local/state".d = { + user = "lillian"; + group = "users"; + mode = "0755"; + }; + }; +} diff --git a/overlays/flake.nix b/overlays/flake.nix new file mode 100644 index 0000000..cfa353a --- /dev/null +++ b/overlays/flake.nix @@ -0,0 +1,110 @@ +{ + description = "An overlay to remove fascist artifacts"; + + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + + outputs = { self, nixpkgs }: { + overlays.antifa = final: prev: + let + patchSystemd = d: d.overrideAttrs (old: { + # https://github.com/systemd/systemd/pull/39285 + patches = old.patches ++ [ ./systemd-detect-fash.patch ]; + }); + disableAuthor = author: throw '' + This package was disabled by nixpkgs-antifa because: it is authored by ${author} + ''; + disableCorp = corp: throw '' + This package was disabled by nixpkgs-antifa because: it exclusively integrates with offerings from ${corp} + ''; + # NB: not listing out culture names in code -- yet + disablePropaganda = throw '' + This package was disabled by nixpkgs-antifa because: it is ethnonationalist propaganda + ''; + in rec { + # https://lix.systems/add-to-config/#flake-based-configurations + inherit (prev.lixPackageSets.stable) lix nixpkgs-review nix-eval-jobs nix-fast-build colmena; + nix = lix; + + certmgr = disableAuthor "Cloudflare"; + cf-terraforming = disableAuthor "Cloudflare"; + cf-vault = disableCorp "Cloudflare"; + cfdyndns = disableCorp "Cloudflare"; + cfssl = disableAuthor "Cloudflare"; + cloudflare-cli = disableCorp "Cloudflare"; + cloudflare-dynamic-dns = disableCorp "Cloudflare"; + cloudflare-dyndns = disableCorp "Cloudflare"; + cloudflare-utils = disableCorp "Cloudflare"; + cloudflare-warp = disableAuthor "Cloudflare"; + cloudflared = disableAuthor "Cloudflare"; + flarectl = disableAuthor "Cloudflare"; + gortr = disableAuthor "Cloudflare"; + prometheus-cloudflare-exporter = disableCorp "Cloudflare"; + proski = disableCorp "Cloudflare"; + wgcf = disableCorp "Cloudflare"; + worker-build = disableAuthor "Cloudflare"; + wrangler = disableAuthor "Cloudflare"; + wrangler_1 = disableAuthor "Cloudflare"; + gnomeExtensions.warp-toggle = disableCorp "Cloudflare"; + octodns-providers.cloudflare = disableCorp "Cloudflare"; + pythonPackages.certbot-dns-cloudflare = disableCorp "Cloudflare"; + pythonPackages.cloudflare = disableAuthor "Cloudflare"; + pythonPackages.pycfdns = disableCorp "Cloudflare"; + terraform-providers.cloudflare = disableCorp "Cloudflare"; + + brave = disableAuthor "Brendan Eich"; + + ladybird = disableAuthor "Andreas Kling"; + + palemoon = disableAuthor "Moonchild Straver"; + + _9base = disableAuthor "suckless"; + dmenu = disableAuthor "suckless"; + dwm = disableAuthor "suckless"; + farbfeld = disableAuthor "suckless"; + ii = disableAuthor "suckless"; + libgrapheme = disableAuthor "suckless"; + quark = disableAuthor "suckless"; + sent = disableAuthor "suckless"; + sic = disableAuthor "suckless"; + sinit = disableAuthor "suckless"; + slock = disableAuthor "suckless"; + slstatus = disableAuthor "suckless"; + sselp = disableAuthor "suckless"; + st = disableAuthor "suckless"; + surf = disableAuthor "suckless"; + svkbd = disableAuthor "suckless"; + tabbed = disableAuthor "suckless"; + wmname = disableAuthor "suckless"; + xssstate = disableAuthor "suckless"; + + blink = disableAuthor "Justine Tunney"; + cosmopolitan = disableAuthor "Justine Tunney"; + jart-jsoncpp = disableAuthor "Justine Tunney"; + pythonPackages.fabulous = disableAuthor "Justine Tunney"; + + hyprland = disableAuthor "Vaxry"; + + tailwindcss = disableAuthor "Adam Wathan"; + + urbit = disableAuthor "Curtis Yarvin"; + + bibletime = disablePropaganda; + biblesync = disablePropaganda; + grb = disablePropaganda; + kjv = disablePropaganda; + lukesmithxyz-bible-kjv = disablePropaganda; + sword = disablePropaganda; + vul = disablePropaganda; + xiphos = disablePropaganda; + + gnomeExtensions.quran-player = disablePropaganda; + + emacsPackages.holy-books = disablePropaganda; + + systemd = patchSystemd prev.systemd; + }; + nixosModules.antifa = { lib, pkgs, ... }: { + nix.package = lib.mkForce pkgs.lix; + }; + }; +} diff --git a/overlays/systemd-detect-fash.patch b/overlays/systemd-detect-fash.patch new file mode 100644 index 0000000..a7c8cd6 --- /dev/null +++ b/overlays/systemd-detect-fash.patch @@ -0,0 +1,554 @@ +From f09346dd2ceb30d0c7ea03bbd0099967e7e54be0 Mon Sep 17 00:00:00 2001 +From: soscho2143 +Date: Sun, 12 Oct 2025 13:52:36 -0400 +Subject: [PATCH 1/2] detect-fash: implement systemd-detect-fash + +--- + man/systemd-detect-fash.xml | 131 +++++++++ + shell-completion/bash/systemd-detect-fash | 40 +++ + src/detect-fash/detect-fash.c | 312 ++++++++++++++++++++++ + src/detect-fash/meson.build | 9 + + 4 files changed, 492 insertions(+) + create mode 100644 man/systemd-detect-fash.xml + create mode 100644 shell-completion/bash/systemd-detect-fash + create mode 100644 src/detect-fash/detect-fash.c + create mode 100644 src/detect-fash/meson.build + +diff --git a/man/systemd-detect-fash.xml b/man/systemd-detect-fash.xml +new file mode 100644 +index 0000000000000..aaebf4e48650b +--- /dev/null ++++ b/man/systemd-detect-fash.xml +@@ -0,0 +1,131 @@ ++ ++ ++ ++ ++ ++ ++ ++ systemd-detect-fash ++ systemd ++ ++ ++ ++ systemd-detect-fash ++ 1 ++ ++ ++ ++ systemd-detect-fash ++ Detect execution in a fascist environment ++ ++ ++ ++ ++ systemd-detect-fash ++ OPTIONS ++ ++ ++ ++ ++ Description ++ ++ systemd-detect-fash detects execution in ++ a fascist environment. It identifies the fascist ++ technology and can distinguish full machine fascism from ++ installed fashware. systemd-detect-fash ++ exits with a return value of 0 (success) if a fascism ++ technology is detected, and non-zero (error) otherwise. ++ ++ When executed without will print a ++ short identifier for the detected fascist technology. The ++ following technologies are currently identified: ++ ++ ++ Known fascist technologies ++ ++ ++ ++ ++ ++ ++ Type ++ ID ++ Product ++ ++ ++ ++ ++ omarchy ++ Omarchy linux distro. Detected by checking os-release. ++ ++ ++ ++ ladybird ++ Ladybird browser. Detected by checking for "ladybird" binary in path. ++ ++ ++ ++ hyprland ++ Hyperland window manager. Detected by checking the existence of hyprland config files on disk. ++ ++ ++ ++ dhh ++ Checks for DHH's public key on disk. ++ ++ ++ ++
++ ++ ++ ++ Options ++ ++ The following options are understood: ++ ++ ++ ++ ++ ++ ++ Only detects if os-release is Omarchy. ++ ++ ++ ++ ++ ++ ++ Only detects Hyprland. ++ ++ ++ ++ ++ ++ ++ Only detects Ladybird. ++ ++ ++ ++ ++ ++ ++ Only detects DHH. ++ ++ ++ ++ ++ ++ ++ Suppress output of the fascist technology identifier. ++ ++ ++ ++ ++ Exit status ++ ++ If a fascist technology is detected, 0 is returned, a ++ non-zero code otherwise. ++ ++ +diff --git a/shell-completion/bash/systemd-detect-fash b/shell-completion/bash/systemd-detect-fash +new file mode 100644 +index 0000000000000..dc2a7f5f4774a +--- /dev/null ++++ b/shell-completion/bash/systemd-detect-fash +@@ -0,0 +1,40 @@ ++# shellcheck shell=bash ++# systemd-detect-fash(1) completion -*- shell-script -*- ++# SPDX-License-Identifier: LGPL-2.1-or-later ++# ++# This file is part of systemd. ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++_systemd_detect_fash() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword ++ local i verb comps ++ ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version -q --quiet -o --omarchy -l --ladybird -y --hyprland -d --dhh' ++ ) ++ ++ _init_completion || return ++ ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++} ++ ++complete -F _systemd_detect_fash systemd-detect-fash +diff --git a/src/detect-fash/detect-fash.c b/src/detect-fash/detect-fash.c +new file mode 100644 +index 0000000000000..311547ec6a619 +--- /dev/null ++++ b/src/detect-fash/detect-fash.c +@@ -0,0 +1,312 @@ ++/* SPDX-License-Identifier: LGPL-2.1-or-later */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "alloc-util.h" ++#include "build.h" ++#include "log.h" ++#include "main-func.h" ++#include "pretty-print.h" ++#include "string-table.h" ++ ++static bool arg_quiet = false; ++static enum { ++ ANY_FASCISM, ++ ONLY_LADYBIRD, ++ ONLY_OMARCHY, ++ ONLY_HYPRLAND, ++ ONLY_DHH ++} arg_mode = ANY_FASCISM; ++ ++/* detects if os-release is omarchy */ ++static int detect_omarchy(void) { ++ const char *term = "omarchy"; ++ const int len = 256; ++ ++ /* if we cannot access os-release we cannot check */ ++ if (access("/etc/os-release", F_OK) != 0) ++ return -1; ++ ++ FILE *osfile = fopen("/etc/os-release", "r"); ++ char os[len]; ++ fgets(os, len, osfile); ++ if (strcasestr(os, term) != NULL) ++ return 1; ++ ++ return 0; ++} ++ ++/* ++ detects if the LadyBird browser ++ has been built on this machine ++ or if the binary exists in $PATH ++*/ ++static unsigned detect_ladybird(void) { ++ ++ /* name of the ladybird binary */ ++ const char* ladybird_bin = "/ladybird"; ++ ++ /* check if build variable is available */ ++ char* LADYBIRD_SOURCE_DIR = getenv("LADYBIRD_SOURCE_DIR"); ++ if (LADYBIRD_SOURCE_DIR != NULL) ++ return 1; ++ ++ char* PATH = getenv("PATH"); ++ if (PATH == NULL) ++ return 0; ++ ++ /* this value will get mutated so we need to duplicate it */ ++ char* path = strdup(PATH); ++ /* loop through PATH until we find a file named "ladybird" */ ++ char* path_iter = strtok(path, ":"); ++ char* abs_path = malloc(256); ++ while (path_iter != NULL) { ++ strncat(abs_path, path_iter, 128); ++ strncat(abs_path, ladybird_bin, 128); ++ /* if we do NOT find the binary at current path, keep going */ ++ if (access(abs_path, F_OK) != 0){ ++ path_iter = strtok(NULL, ":"); ++ abs_path[0] = 0; ++ continue; ++ } ++ free(abs_path); ++ free(path); ++ return 1; ++ } ++ free(abs_path); ++ free(path); ++ return 0; ++} ++ ++/* detects if hyprland is installed */ ++static unsigned detect_hyprland(void) { ++ const char* hyprland_config = "/hypr/hyprland.conf"; ++ const char* XDG_CONFIG_HOME = getenv("XDG_CONFIG_HOME"); ++ const char* HOME = getenv("HOME"); ++ int maxlen = 128; ++ ++ char *hyprland_abs_path = malloc(maxlen); ++ ++ if (XDG_CONFIG_HOME != NULL) { ++ strncat(hyprland_abs_path, XDG_CONFIG_HOME, maxlen - strlen(hyprland_config)); ++ } else if (HOME != NULL) { ++ strncat(hyprland_abs_path, HOME, maxlen - strlen(hyprland_config)); ++ strcat(hyprland_abs_path, "/.config"); ++ } else { ++ return 0; ++ } ++ strcat(hyprland_abs_path, hyprland_config); ++ if (access(hyprland_abs_path, F_OK) == 0){ ++ free(hyprland_abs_path); ++ return 1; ++ } ++ free(hyprland_abs_path); ++ return 0; ++} ++ ++/* detects if this is dhh's computer using his ssh pubkey */ ++static int detect_dhh(void) { ++ /* fingerprint of dhh's ssh public key */ ++ const char *dhh_fingerprint = "SHA256:YCKX7xo5Hkihy/NVH5ang8Oty9q8Vvqu4sxI7EbDxPg"; ++ /* path to ssh pubkey */ ++ const char *ssh_pubkey = "/.ssh/id_ed25519.pub"; ++ /* command to generate fingerprint */ ++ const char *ssh_fingerpint_cmd = "ssh-keygen -E sha256 -lf "; ++ ++ /* get the home directory */ ++ char *HOME = getenv("HOME"); ++ ++ if (HOME == NULL) ++ return -1; ++ /* check if we have read access to the public key on disk */ ++ char *ssh_pubkey_abs_path = (char *)malloc(strlen(HOME) + strlen(ssh_pubkey) + 1); ++ ssh_pubkey_abs_path[0] = 0; ++ strcat(ssh_pubkey_abs_path, HOME); ++ strcat(ssh_pubkey_abs_path, ssh_pubkey); ++ if (access(ssh_pubkey_abs_path, F_OK) != 0) ++ return 0; ++ ++ /* generate a fingerprint of it */ ++ char *get_fingerprint_cmd = (char *)malloc(strlen(ssh_fingerpint_cmd) + strlen(ssh_pubkey_abs_path) + 1); ++ get_fingerprint_cmd[0] = 0; ++ strcat(get_fingerprint_cmd, ssh_fingerpint_cmd); ++ strcat(get_fingerprint_cmd, ssh_pubkey_abs_path); ++ ++ char fingerprint[70]; ++ FILE *fingerprint_cmd_output = popen(get_fingerprint_cmd, "r"); ++ ++ if (fingerprint_cmd_output == NULL) ++ return -1; ++ fgets(fingerprint, 70, fingerprint_cmd_output); ++ ++ /* free memory */ ++ pclose(fingerprint_cmd_output); ++ free(ssh_pubkey_abs_path); ++ free(get_fingerprint_cmd); ++ ++ /* comare it to DHH's fingerprint */ ++ if (strstr(fingerprint, dhh_fingerprint) != NULL) ++ return 1; ++ return 0; ++} ++ ++static int help(void) { ++ _cleanup_free_ char *link = NULL; ++ int r; ++ ++ r = terminal_urlify_man("systemd-detect-fash", "1", &link); ++ if (r < 0) ++ return log_oom(); ++ ++ printf("%s [OPTIONS...]\n\n" ++ "Detect execution in a fascist environment.\n\n" ++ " -h --help Show this help\n" ++ " --version Show package version\n" ++ " -q --quiet Quiet mode\n" ++ " -o --omarchy Only detect omarchy\n" ++ " -l --ladybird Only detect ladybird\n" ++ " -y --hyprland Only detect hyprland\n" ++ " -d --dhh Only detect dhh\n" ++ "\nSee the %s for details.\n", ++ program_invocation_short_name, ++ link); ++ ++ return 0; ++} ++ ++static int parse_argv(int argc, char *argv[]) { ++ ++ enum { ++ ARG_VERSION = 0x100, ++ ARG_OMARCHY, ++ ARG_LADYBIRD, ++ ARG_HYPRLAND, ++ ARG_DHH ++ }; ++ ++ static const struct option options[] = { ++ { "help", no_argument, NULL, 'h' }, ++ { "version", no_argument, NULL, ARG_VERSION }, ++ { "omarchy", no_argument, NULL, 'o' }, ++ { "ladybird", no_argument, NULL, 'l' }, ++ { "hyprland", no_argument, NULL, 'y' }, ++ { "dhh", no_argument, NULL, 'd' }, ++ {} ++ }; ++ ++ int c; ++ ++ assert(argc >= 0); ++ assert(argv); ++ ++ while ((c = getopt_long(argc, argv, "hqolyd", options, NULL)) >= 0) ++ ++ switch (c) { ++ ++ case 'h': ++ return help(); ++ ++ case ARG_VERSION: ++ return version(); ++ ++ case 'q': ++ arg_quiet = true; ++ break; ++ ++ case 'l': ++ arg_mode = ONLY_LADYBIRD; ++ break; ++ ++ case 'o': ++ arg_mode = ONLY_OMARCHY; ++ break; ++ ++ case 'y': ++ arg_mode = ONLY_HYPRLAND; ++ break; ++ ++ case 'd': ++ arg_mode = ONLY_DHH; ++ break; ++ ++ case '?': ++ return -EINVAL; ++ ++ default: ++ assert_not_reached(); ++ } ++ return 1; ++} ++ ++static int run(int argc, char *argv[]) { ++ int dhh = 0; ++ int hyprland = 0; ++ int ladybird = 0; ++ int omarchy = 0; ++ int fascism = 0; ++ int r; ++ ++ /* This is mostly intended to be used for scripts which want ++ * to detect whether we are being run in a fascist ++ * environment or not */ ++ ++ log_setup(); ++ ++ r = parse_argv(argc, argv); ++ if (r <= 0) ++ return r; ++ ++ switch (arg_mode) { ++ case ONLY_OMARCHY: ++ omarchy = detect_omarchy(); ++ fascism = omarchy; ++ if (omarchy < 0) ++ return log_error_errno(fascism, "Failed to check for omarchy: %m"); ++ break; ++ ++ case ONLY_LADYBIRD: ++ ladybird = detect_ladybird(); ++ fascism = ladybird; ++ if (ladybird < 0) ++ return log_error_errno(fascism, "Failed to check for ladybird: %m"); ++ break; ++ ++ case ONLY_HYPRLAND: ++ hyprland = detect_hyprland(); ++ fascism = hyprland; ++ if (hyprland < 0) ++ return log_error_errno(fascism, "Failed to check for hyprland: %m"); ++ break; ++ ++ case ONLY_DHH: ++ dhh = detect_dhh(); ++ fascism = dhh; ++ if (dhh < 0) ++ return log_error_errno(fascism, "Failed to check for dhh: %m"); ++ break; ++ ++ case ANY_FASCISM: ++ default: ++ ladybird = detect_ladybird(); ++ omarchy = detect_omarchy(); ++ hyprland = detect_hyprland(); ++ dhh = detect_dhh(); ++ fascism = (ladybird | omarchy | hyprland | dhh); ++ if (fascism < 0) ++ return log_error_errno(fascism, "Failed to check for fascism: %m"); ++ } ++ ++ if (!arg_quiet) { ++ if (ladybird) puts("ladybird"); ++ if (omarchy) puts("omarchy"); ++ if (dhh) puts("dhh"); ++ if (hyprland) puts("hyprland"); ++ } ++ return fascism; ++} ++ ++DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run); +diff --git a/src/detect-fash/meson.build b/src/detect-fash/meson.build +new file mode 100644 +index 0000000000000..f4cca34117e7b +--- /dev/null ++++ b/src/detect-fash/meson.build +@@ -0,0 +1,9 @@ ++# SPDX-License-Identifier: LGPL-2.1-or-later ++ ++executables += [ ++ executable_template + { ++ 'name' : 'systemd-detect-fash', ++ 'public' : true, ++ 'sources' : files('detect-fash.c'), ++ }, ++] + +From 825072a331cb6d7464eb4479c4998ab0d020e32f Mon Sep 17 00:00:00 2001 +From: soscho2143 +Date: Sun, 12 Oct 2025 14:18:49 -0400 +Subject: [PATCH 2/2] detect-fash: added to meson.build + +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index c67e7b6c30de4..76c625d22080d 100644 +--- a/meson.build ++++ b/meson.build +@@ -2353,6 +2353,7 @@ subdir('src/cryptenroll') + subdir('src/cryptsetup') + subdir('src/debug-generator') + subdir('src/delta') ++subdir('src/detect-fash') + subdir('src/detect-virt') + subdir('src/dissect') + subdir('src/environment-d-generator') From 9231eb0d2de8ca0dd8f007061dc16e9e0d3b475c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Jan 2026 17:08:09 +0100 Subject: [PATCH 176/204] set ssh keys to the file dynamically for allowed keys, and fix all preservation settings erroring out --- nixos/shared/default.nix | 4 ++-- nixos/shared/preservation.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index c217eaf..c2995fd 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -273,8 +273,8 @@ shell = pkgs.zsh; hashedPasswordFile = config.sops.secrets."lillian-password".path; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS" + "${builtins.readFile ../../home-manager/hosts/GLaDOS/id_ed25519.pub}" + "${builtins.readFile ../../home-manager/hosts/EDI/id_ed25519.pub}" ]; }; diff --git a/nixos/shared/preservation.nix b/nixos/shared/preservation.nix index f79891c..36bcb48 100644 --- a/nixos/shared/preservation.nix +++ b/nixos/shared/preservation.nix @@ -100,7 +100,6 @@ mode = "0700"; } #Desktop - "gnupg" ".local/state/wireplumber" ".local/share/direnv" ".local/state/nix" From 5352be54e78ac7efa8a89e548f446ce94c852c49 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 5 Jan 2026 17:40:02 +0100 Subject: [PATCH 177/204] replace openssl with libressl --- nixos/hosts/queen/configuration.nix | 2 +- nixos/server/package-configs/writefreely/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index d2f43b5..6984f31 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -90,7 +90,7 @@ nats-server nginx onlyoffice-documentserver - openssl + libressl postgresql_16 python310 # python310Packages.nbconvert diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix index 43dc7bc..aeb9fa2 100644 --- a/nixos/server/package-configs/writefreely/default.nix +++ b/nixos/server/package-configs/writefreely/default.nix @@ -34,6 +34,6 @@ }; }; systemd.services.writefreely = { - path = [pkgs.openssl]; + path = [pkgs.libressl]; }; } From 80cfd1626863b64e1ec70b0589424e8b2386ead7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Jan 2026 15:33:57 +0100 Subject: [PATCH 178/204] update flake lock --- flake.lock | 100 ++++++++++++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index b21d7ba..e6cc430 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765990358, - "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", + "lastModified": 1767641618, + "narHash": "sha256-KuDZDIMU+YyPxWEiPzVCGCmJrARgHqhUcIbMnHz3h3I=", "owner": "catppuccin", "repo": "nix", - "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", + "rev": "ef4a7f437ea76ee3692b81d475ee79684058ff0d", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1766774972, - "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", + "lastModified": 1767461147, + "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", "owner": "ipetkov", "repo": "crane", - "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", + "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", "type": "github" }, "original": { @@ -171,15 +171,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1767437240, - "narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=", + "lastModified": 1767702900, + "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012", + "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767013031, - "narHash": "sha256-p8ANXBakAtfX/aEhLbU6w0tuQe3nrBvLdHbKirJP7ug=", + "lastModified": 1767697030, + "narHash": "sha256-0iVZ99H3kR5h6Lhw8kDDuUc5C/k6iismeWgCS1qWTQ4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "c2a82339373daee8cbbcad5f51f22ae6b71069e0", + "rev": "657469e8f036334db768daaf7732b1174676054b", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1767455410, - "narHash": "sha256-TSvmXw7o4JxF9ezZbexZRamzq2XL0JQurOncalFJeP4=", + "lastModified": 1767709687, + "narHash": "sha256-faz9310RieuL6668SZAtUSDW325ndQfQQC6l+TubqUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b32ae206cdbeb3d9fd5e15d7810fd97ff82e3a56", + "rev": "138acf984420f6e80f26217330055e6b614fd68d", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1766840161, - "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1763909441, - "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", + "lastModified": 1767662275, + "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", + "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1766976750, - "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", + "lastModified": 1767495280, + "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", + "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1766894905, - "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", + "lastModified": 1767499857, + "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", + "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767397606, - "narHash": "sha256-QA1d/6XzxK3lsMiJ+xiJf340cpNeJs/xIM6D0/yLqs4=", + "lastModified": 1767652667, + "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", "owner": "nix-community", "repo": "stylix", - "rev": "6850ad2e9f3f7ff6116e9e6fb73a9cca2d9b1a35", + "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", "type": "github" }, "original": { From 709f04689348c97ac084709e37c3042821af22c9 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Jan 2026 16:06:28 +0100 Subject: [PATCH 179/204] disable grafana and loki --- nixos/server/package-configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index f685ff2..9c129cb 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -9,7 +9,7 @@ ./postgres ./roundcube ./coturn - ./dashboard + # ./dashboard #./cinny #./firefox-sync ./writefreely From 9fe280f753377c43d3a62ffc04d80520aaae5cbc Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 14:40:59 +0100 Subject: [PATCH 180/204] re-enable wheatley --- flake.nix | 20 ++++++++++---------- nixos/hosts/wheatley/configuration.nix | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 888c106..8933b57 100644 --- a/flake.nix +++ b/flake.nix @@ -259,16 +259,16 @@ ]; }; - # wheatley = nixpkgs.lib.nixosSystem { - # system = "aarch64-linux"; - # specialArgs = {inherit inputs outputs;}; - # modules = - # sharedModules - # ++ [ - # {_module.args = {inherit pkgs-edge;};} - # ./nixos/hosts/wheatley/configuration.nix - # ]; - # }; + wheatley = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + specialArgs = {inherit inputs outputs;}; + modules = + sharedModules + ++ [ + {_module.args = {inherit pkgs-edge;};} + ./nixos/hosts/wheatley/configuration.nix + ]; + }; }; }; } diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index ff89965..6572219 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -16,6 +16,8 @@ # Import shared settings ]; + preservation.enable = lib.mkForce false; + hardware.enableRedistributableFirmware = true; powerManagement.cpuFreqGovernor = "ondemand"; hardware.graphics.enable = true; From 803602949b041dc39cc2b96a97e223707ac67fad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 16:19:45 +0100 Subject: [PATCH 181/204] update mullvad setup on wheatley --- nixos/hosts/wheatley/configuration.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 6572219..cce2cc3 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -170,23 +170,25 @@ pkgs.stubby.passthru.settingsExample // { upstream_recursive_servers = [ + # kdig -d @194.242.2.4 +tls-ca +tls-host=base.dns.mullvad.net example.com { address_data = "192.242.2.4"; tls_auth_name = "base.dns.mullvad.net"; tls_pubkey_pinset = [ { digest = "sha256"; - value = "g8bfYNSxU86c8odFPsdTvWnC2VZkxIiHLZ2a6pydEjI="; + value = "vRABi3U719mJG1E/XyyrJ+3K43XdmJB+XuzaKESPRSs="; } ]; } + # kdig -d @2a07:e340::4 +tls-ca +tls-host=base.dns.mullvad.net example.com { address_data = "2a07:e340::4"; tls_auth_name = "base.dns.mullvad.net"; tls_pubkey_pinset = [ { digest = "sha256"; - value = "g8bfYNSxU86c8odFPsdTvWnC2VZkxIiHLZ2a6pydEjI="; + value = "1ABYdzvvAq7Ec7+Wl5KrRcgPeXsIGLBU7I+89u94bcw="; } ]; } @@ -249,7 +251,7 @@ # wg public key for host: A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg= # TODO: generate this dynamically based on other hosts wg0 = { - address = ["10.70.93.226/32" "fc00:bbbb:bbbb:bb01::7:5de1/128"]; + address = ["10.73.141.73/32" "fc00:bbbb:bbbb:bb01::a:8d48/128"]; privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; dns = ["100.64.0.7"]; extraOptions = { @@ -274,7 +276,7 @@ { publicKey = "/wPQafVa/60OIp8KqhC1xTTG+nQXZF17uo8XfdUnz2E="; allowedIPs = ["0.0.0.0/0" "::0/0"]; - endpoint = "31.171.154.50:51820"; + endpoint = "193.32.249.70:51820"; } ]; }; From b9d68f1f5442b9a2f6bd70b70bcbe412a599e023 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 16:26:41 +0100 Subject: [PATCH 182/204] forgot setting the first peer, fixed wireguard for real now --- nixos/hosts/wheatley/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index cce2cc3..45a5b64 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -274,7 +274,7 @@ peers = [ { - publicKey = "/wPQafVa/60OIp8KqhC1xTTG+nQXZF17uo8XfdUnz2E="; + publicKey = "33BoONMGCm2vknq2eq72eozRsHmHQY6ZHEEZ4851TkY="; allowedIPs = ["0.0.0.0/0" "::0/0"]; endpoint = "193.32.249.70:51820"; } From 34df00e4c3dee2009916b33c5ff96d8b63aedc0c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 21:15:18 +0100 Subject: [PATCH 183/204] disable starship theming for now as it breaks wheatley, I'll figure out a fix later if needed --- home-manager/shared/default.nix | 2 +- nixos/hosts/wheatley/configuration.nix | 1 + nixos/hosts/wheatley/secrets/sops.yaml | 13 ++++--------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 5889b96..650fc8f 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -8,7 +8,7 @@ ./shell/helix ./shell/zellij ./shell/zsh.nix - ./shell/starship.nix + # ./shell/starship.nix ./shell/eza.nix ./shell/hyfetch.nix ]; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index 45a5b64..7438597 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -14,6 +14,7 @@ ./hardware-configuration.nix # Import shared settings + ../../shared ]; preservation.enable = lib.mkForce false; diff --git a/nixos/hosts/wheatley/secrets/sops.yaml b/nixos/hosts/wheatley/secrets/sops.yaml index 6fcd84c..309f90c 100644 --- a/nixos/hosts/wheatley/secrets/sops.yaml +++ b/nixos/hosts/wheatley/secrets/sops.yaml @@ -1,15 +1,11 @@ wireless.env: ENC[AES256_GCM,data:a5sUW0Lc4GRd9aUJwHbmQvzvRB8WaRjMSQ==,iv:+3ncL38E3aqbejoCzzeBtMukLk4n/AQBJELlqhXDqSA=,tag:buY9Mp10DAEEEKqSyHwB3g==,type:str] -lillian-password: ENC[AES256_GCM,data:GY7WyfLRc/q4fecnazWzfoZsruN/F0ar7mJ9RaqTHSb9K6xhEmifmJeqpR5xGIJYW6MYciCsZ9YmRsJbuSHTIlo9PrCTYBGvXg==,iv:bzml3abPox3RdvtKBQiBAcVXHUdGAn0ETMsDpBtT8T0=,tag:2iaBJ4hFFBUbonslTvQH5Q==,type:str] +lillian-password: ENC[AES256_GCM,data:cr+Dix1YWrCDHjw0tj4Lnyy6X/bp+/tLSfHteBOsVHhwNRMK6IjZDZtuyFtrqtxfG2VQcFk7cPSkXaK8IQYzG4iYoDBxHxzWOQ==,iv:L1U+dT9eSMpE/WwSA3o9LoYaqv9aErqjXzsADdK2Gk0=,tag:onsOAyulyrbJvayVoGGfgg==,type:str] protonvpn-priv-key: ENC[AES256_GCM,data:s4LAq1Rqm+jGaK3OKcjIBCQYXPs3oEuTKJMAM+gFxIpZdwcJCIU7uyoCy6c=,iv:zoWv5u0xgJHldwdRGRv3bXI1kasaWQz1YD7wt0J890I=,tag:cFXnayZRq13UqP+XWuHnWw==,type:str] rpcSecret: ENC[AES256_GCM,data:3tCZk2csB/ofxPc6,iv:NwT6k1hh73moH6eErT23/Dvwgb1wP/qIuoxXnCgNSao=,tag:nh0mFsh9I4R1baCL1oH+AA==,type:str] webdav-secret: ENC[AES256_GCM,data:SDFyHaE+HprkguOmDfnzwQ/n5OYgbTpxcVl4FGiLcsItefbSDOIQg5l01fqVB8zv+rRGlPcyRrIn7KTPrTpBx7X4RNHfFK4FKKvAANt6z0e5pu1+wnoObWxTShCFjfFoRCLkoh/j/CmLFyFIafrI7rzZUhs=,iv:stygLmNVWXkZL5A0J83CKPefRr7TqXeygQVLszr28eY=,tag:9hss2c77JELSASnwUyAF4w==,type:str] wg-private-key: ENC[AES256_GCM,data:5WGAAst0qVqn1siX3snkAhsSDhZaS33XHT44BfViWLZqvzw+OhPB/jkSr4U=,iv:yXfN50SM3OWdycINB8iWXtvCSS01NBTrGBs1kxd1j0M=,tag:yhjDY1AM5aQ6DFeFEjo2Mw==,type:str] ssh-private-key: ENC[AES256_GCM,data:zbCR/+REHSN4BIQIXSOQjSRKYWhaXutdn4AE2zxmN44qHPzMI98c7/aX2KFhHOL+vKpgyhhR6JAGVTF5Jk72lmIHwDvwvwx+gLXgpZH1KEK3nTUdwUVcqBDsVB4Na5rTsHMWmRH+NxV7n+3nSQo/Byi0Jb602IPXRNREL+0toCbHon27/o2uIy4uzbsEWZu6N2hadzQCtXmHJM2dqmbKvpADt04TQ4wAcZ6wB0538g5WdtOSU6T1xcBBSDU7MNEVP7e7dUPKJWK79cI+RrzpGIh/da7cM6exSBRas711oL6woH4Hi3G6Yjd1rPxBPt1+/qq45gm/4UvjQywn/1s7BInCe9/5vJLn3TEzuUd96CsT36vEsxMeOekXf50Ntu6Xr02bnFRwUBm76BVGAggwGf/khRNJuLw0xHsCdeKzHsPD0efe5mHTJw8mB3M6vDhO6e3g6E3uRjjBaDnrPuHuD4NE1kCjQTTJh3NbuT2Ab55lhpSOEK+f0Ik2qZgKzALvJhn+MILjXSfP/hXgiwBeP4dkTY3fOcpmnPyS,iv:ojh2hzVzJFy1kvvo/WvaIpMpGT+b9aSC+L8L0iwhF1o=,tag:bHOj/fxDn/qUmp1eijLPuw==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -20,8 +16,7 @@ sops: Vm9mWk5JRGtZNVVhN1JQWTBlb2kySkEKoLI1MzS3uGNUbyn7kI5DylKZiPtc1div bKIboWoobTfDt0EURfmZ5+JrX6DlZxRyNQyl9dsKmZT6pLdaIppStA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-22T22:37:02Z" - mac: ENC[AES256_GCM,data:T31z1/pngI6Wa3HMyOxS5ofb2Y5YqK0v5m96mn7n5dQ0d992ooEpoNyE7r8qHsD+tXiHvLIybWUMiMlDLI7Gq8op9GLEYYnFNDfc24k7lQPPuQK/iraJFUQwiRBbK063Rmfa6q6S3P2YN58+oxUJUiKuAy4yUIJTNaHeCCH8HMc=,iv:uLbAtSNbUcsejWdE1oBvCQVOtuaHL7A3R0sT/ispjhU=,tag:t3D7h0B0dDDZ18qo8G8wiA==,type:str] - pgp: [] + lastmodified: "2026-01-08T19:47:05Z" + mac: ENC[AES256_GCM,data:G7YCN4C0fpNLoZLHqagDWqrnTSkWDOjNbs7F/P8Fn/s/U9HBC8gHWktAM41h8MT853t3kF38SoTOD59nno+an9EECoSkWJy66agdrNM3/NZHz7aTbDmlw1EsrFjh8HeleLIwrwrNkQiJuakPjbplvIhFAtNZsFoErDtd5xnHy6c=,iv:A5DCVRUa99xmeDnAoCQR15oIJOjkR/A1aqadLWZGbwg=,tag:YXvBLwXGoE64ZqUTEORX9A==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.11.0 From f7dec27b543a8de8a504ffac70b6d2cc06b9ebab Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 8 Jan 2026 21:23:18 +0100 Subject: [PATCH 184/204] disable all of catppuccin for now for wheatley, we can pull it apart later --- nixos/shared/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index c2995fd..76caf99 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -81,16 +81,16 @@ }; }; - catppuccin = { - flavor = "macchiato"; - tty.enable = true; - sddm.enable = true; - sddm.flavor = "macchiato"; - forgejo.enable = true; - forgejo.flavor = "macchiato"; - # plymouth.enable = false; - # grub.enable = false; - }; + # catppuccin = { + # flavor = "macchiato"; + # tty.enable = true; + # sddm.enable = true; + # sddm.flavor = "macchiato"; + # forgejo.enable = true; + # forgejo.flavor = "macchiato"; + # # plymouth.enable = false; + # # grub.enable = false; + # }; programs = { zsh = { From dd4d7d0f702368f717b40c88da2001f00af8290a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 11 Jan 2026 22:18:29 +0100 Subject: [PATCH 185/204] Add keys for switch to EDI, update flake --- flake.lock | 120 +++++++++++++++--------------- nixos/hosts/EDI/secrets/sops.yaml | 13 ++-- 2 files changed, 65 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index e6cc430..5ce1cdb 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767641618, - "narHash": "sha256-KuDZDIMU+YyPxWEiPzVCGCmJrARgHqhUcIbMnHz3h3I=", + "lastModified": 1767967164, + "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=", "owner": "catppuccin", "repo": "nix", - "rev": "ef4a7f437ea76ee3692b81d475ee79684058ff0d", + "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7", "type": "github" }, "original": { @@ -155,11 +155,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1767702900, - "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", + "lastModified": 1768068402, + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", "owner": "nix-community", "repo": "home-manager", - "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1767082077, - "narHash": "sha256-2tL1mRb9uFJThUNfuDm/ehrnPvImL/QDtCxfn71IEz4=", + "lastModified": 1767888166, + "narHash": "sha256-dfZKtAv2bTD8EsOxLQ6/a7zSZt8KTy+HuRq3wz1z3LA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "efd4b22e6fdc6d7fb4e186ae333a4b74e03da440", + "rev": "3e0747d31474cdb182801518e39511eed2c84c91", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1767709687, - "narHash": "sha256-faz9310RieuL6668SZAtUSDW325ndQfQQC6l+TubqUo=", + "lastModified": 1768165928, + "narHash": "sha256-dMDBPUf9jmIs6qYBVp9uzH9yLVvsrEQEqzaFXnkNRf4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "138acf984420f6e80f26217330055e6b614fd68d", + "rev": "f0dd51966aa7381b9ca2b610282d68b0bc458e75", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1768032153, + "narHash": "sha256-6kD1MdY9fsE6FgSwdnx29hdH2UcBKs3/+JJleMShuJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -708,11 +708,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1767499857, - "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", + "lastModified": 1768104471, + "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", + "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767652667, - "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", + "lastModified": 1768075324, + "narHash": "sha256-m4IAAwRqlty7C7Htxt6HDJ/HGXrzLRoHoBaNczzXBdo=", "owner": "nix-community", "repo": "stylix", - "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", + "rev": "5b5f21c46ed0ef1f0089df66d8cd83c78da980e9", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -1016,11 +1016,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1032,11 +1032,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { diff --git a/nixos/hosts/EDI/secrets/sops.yaml b/nixos/hosts/EDI/secrets/sops.yaml index 4db54a6..85292b6 100644 --- a/nixos/hosts/EDI/secrets/sops.yaml +++ b/nixos/hosts/EDI/secrets/sops.yaml @@ -2,11 +2,9 @@ lillian-password: ENC[AES256_GCM,data:0mwqnvA+xrDD/m6uQtPbo9MpcFsOoqHE+Cg2gF6xZz wg-private-key: ENC[AES256_GCM,data:CqXlIN0gKzMrZRJycAf96LUVNw9yCZpHtE8XP+JwV2Ftip46iUksg1uExxQ=,iv:LdcopSz8Hx5hO1M00B8r+C7XViwpjGOpvmoXUHIkFtc=,tag:rbskx98YjcYV1lB8OO2VxQ==,type:str] nextcloud-password: ENC[AES256_GCM,data:h93FmVY3XZdRZECEzz5ArBPnuRYyp0kJ6UUoxKmWVuVeFVkOzxQ5dGra6R/jZg8ofjhu+WosoDso3S/i,iv:J1K2NMAjv7Y26q91V/f11gNs82/UD6jbrMy0hVh81pw=,tag:/mQFulslQ3Mqabnc0mb1lQ==,type:str] ssh-private-key: ENC[AES256_GCM,data:AYyOFlqcNrlTnKSewgb8B/XzegkJGB79gUT419n6aYiH0xom+DmxfRqQm46x/fldlSeN8u2mmzisC6xcRt3fnK4+0gN5Ywvr6hQEtKKxu2N6Pj7+tFLvFmbYPFplecyGBs1S092UXL65ozQs8aYbogoXxVTVu6/MuCsks9UO1JQWq5utCAyU8VGc0/Ft4OZN2qUbS+VZ0ONZ0WzBA+s+CFZ1FNKsr4tvltLXf8fgpsiSHLUigS4rojlxm84+w8omE1IwpAOxOa9n9X1EDuPxrQvZ+LvcJcgwqrtU2HVGis1GfytPM6vRAoVdBKX37enXelPBX2z9W7wPtmTxippD7yzcEJOggJ6ETMUessNKm3yBsMzTcojSWYzHo4v3San1I+ZiNxjvykuHmomRhXdzdM/2RsBpev8q2sC9YU4euzjzCQdwfoNqhbqyN/1X2BOkJMceMqw8fD8nLc3mIbczMFNO6ByVocZ+iC9BvaBYeLrFd3gncqGRRCJdBCD5CYiOYcdIAipNGL7NQVhM1tcv,iv:RZKsKCENIKhIWo4aKyDVj9xx0GfdjhYLP0B2Rad2LSM=,tag:XOOxsyGidnKWzgGlUPmvXw==,type:str] +prod.keys: ENC[AES256_GCM,data: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,iv:h6ixSWPmuqXBeLbwy/Sl4EeEpMU1jQkisxowihuWx8g=,tag:P504lT9lggD0nrJIMj9/Qg==,type:str] +title.keys: ENC[AES256_GCM,data:ntJ3Cl7Bjzr2JSScVoXtFhrxTC3DZ85j5VaA946cQaNzAamHfE3lDGGFXB2fyjQC1Lg26U7bH5u7qTgdhaoMq38ymriWnNCIruw/ngqIWzsCZSFw8UiLeBglmcSMbWdTm5E+Utn22+ClJriK2SKsybkzX9+pbv+k8vKaRHXalvLajzZ61yfWzo8TAs8OYOa0lFbZHT5KuejuR8XP/ZEkpnHpnxXBpuEPwmDm0sOHTHGxqyAnp1lzDDjZdgAWjs57Dh0x7WB0VUClCUewLkRCWN4YmWJ9qbyKXOqGhKu1qi2yBMvmQSxh20qgAKF78EPxd3cmPISZ0OQCdNLWNtJAqpJpCFa+XNAJaSqojQ5UX5H2pI6qeK5W6Twr6vwS6ZDN7snrs4hXPRBCWfKUFgxsALqHbmMlNoA7+RyyCPVGwanZ/hzSyepxtZpXS7erYf+ld1yYU8mSRJ3Em39EcY/1Gihw8si3ZTfhj0h8TGRok3qNiBAFXD9/SN1xEEWgmRMbS3Ba72N+tsBVlDT6WSnXaM34As4MxAArhfPe6JYADZnbCf5DGxWQzBuTvJnS6YzzfkvhJZ9yD4qGsd8DZI6TvXVDNXa2X5hxTwcmmBdd/Y0QRi1q4qsJoViHILZU4UfUYiu1XEU/UycQQUS+4DxsGWOOav8Pt65IS/VGpNyCWhnSrN0V9Qnk3YoILDeUNP7IbRBPkycgrF+d+kMZN0Gwgh+/ohRvkmw5MD7uhlBFomUmgDzONGLRLuBrTYF++s7O3XwwcaOYoItib5lGLAOrFhsc9t9YeqXlxs4+gTCudvKeWs6dwmnL0v/c//HmMSMMCEf2OEWbkntyYzrk/CluhzDOLiqm4pppFLDITX2SjGz3I1OQXP3/LfHHvMfGlZmGoWHe/fGSPpDj7I0+g2Lvo+9EQvyJ7fzqDNQFiQ1edoTP6pxgBh1G0HHkX3tKPgca6LWFoB9g8dGRLlWlHmRz4+RMWt++p0euRT3/Mjk+1x2Es24EdKAC55V5lUSPl+L7UmGOwOx7zaOO1yamn/2e33DYE9crRn1eTP4atHjJPbwLSj/Bat80QcJWRNROAfAlCpHmuzztkUKSjv2eMGw8KjROW6KeAXY5idC2Q/ecPqQj5RX1Fy/lOnhlXWFVQpFHc3OF9F+n44kKs6ROGm4D/lM6eNEgXW8t0OE02sPsuDEgJ3O84ork5Kb4PUv+9iLv+ixhRA/VbECoLGj4hyoyTUMipN4UMgKqGNQQtodBlQYPGyUVtsVvWeM5amlfdQY+esv7dEbeR/FUj97BDXKfo9JbEXqnT5kwdQq5Zl0KZpKOVN7VkOGpX7vsYhJYcAlSx/92gGIuxRFYGN/pcF/ZqxyCuqm1QH0b34al5YcqknVOPUf8CeJM3muNp/JbGhlxCGl+nWNOFBjRVtMHcslQK/vgbTV7Kg9USSOZeoGe+hF7t52s/rx/oafn1gB6Pa/7h3mbfZpBhq877Pr9KK0WcRfKzLvAFetzXTZDH4e8gioEXTQ0yEBI1bgRymj7Du6DLZguKsil6UEU8/oKSlIS0TVkudwlZBzHQ8JKhxnMl62VUtaIF/WSmxbQCJJElEWNI1BmwngBmLyUREa1x1Q02g8bsNsX+MEk,iv:DIw0Ji3ztBVR6GF6Gik7YZRsqM7tDODy3nTxC+u0S5U=,tag:Y2eWgJrR705vNx9OyUEfvg==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz enc: | @@ -17,8 +15,7 @@ sops: eUZ6b09pYlRVWFBuUm1Ua2l6Z0dacW8KeQdAVsxXsDiDMtFA2koSpDsw7Ib63vA0 GE/ubWDwwRc7wMPFGuofIe6TaDSFgtVXza+yo+i4y51+BOpwqxlYYA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-09T23:59:45Z" - mac: ENC[AES256_GCM,data:DQ8uXsVkbzc1JrMDaTGHb9ijRB//6I6GN4bAU1LWnhyxGA2QjYEk5xwEI1950kroXVf1hDTw5fdh+MXvvEcNUL6BZOc4Ecl5lPliZ4aemjhz+O8FCkSbnW2o5JnV4m/rFe9CP6KaoFdr/tgSBVklzaUE4Qdo1DUWCfF7XssXECw=,iv:gb1b569ar5wlc2XMkLXnYfyVp/ZMsLjh9cXM85GrUz0=,tag:MGFgFcF4jIdJxteiFp2n/Q==,type:str] - pgp: [] + lastmodified: "2026-01-11T21:17:00Z" + mac: ENC[AES256_GCM,data:uezrk8E77Je1xxEbBL3UvHsmOscb4oOuVf5jL9DBdTjL2kMW9lgEidDInp0fRs6XikjH1JFj3hxAhwF5EkhKPcVp8BZxDClqCwHtdzgQjw9sQ+8fCXSmG7La/GN+UthHDrKenzKdgbblJxEdRfQ34qbcZvLtSH1ikBPDvlWPiJc=,iv:wKcrHt3LYhVQt357vugYU7yTi/il/Fo4gYI9NCHbFuE=,tag:+wJd/lSoQeIm3uJFUnj09g==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.11.0 From cb083eb8d9bf497aa2ff50133064ee7b6e13e1be Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 11 Jan 2026 22:33:01 +0100 Subject: [PATCH 186/204] add email address to spam list since someone used it for facebook signups --- nixos/server/package-configs/mail-server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index 1f0311c..58bc60a 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -86,6 +86,7 @@ "no-reply@social.gladtherescake.eu" "no-reply@git.lillianviolet.dev" "ongebonden@gladtherescake.eu" + "teluyep_canoja_52868396@gladtherescake.eu" ]; x509.useACMEHost = config.mailserver.fqdn; }; From 7b23a3d2cfd34544b836ed7fff9eaaba40d1cbcb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 23 Jan 2026 21:14:51 +0100 Subject: [PATCH 187/204] update flake lock --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 5ce1cdb..4f1421e 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767967164, - "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=", + "lastModified": 1769164550, + "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=", "owner": "catppuccin", "repo": "nix", - "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7", + "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1767461147, - "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", + "lastModified": 1767744144, + "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=", "owner": "ipetkov", "repo": "crane", - "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", + "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1766150702, - "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", + "lastModified": 1768923567, + "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", "owner": "nix-community", "repo": "disko", - "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", + "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1768068402, - "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", + "lastModified": 1769187349, + "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", + "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1767888166, - "narHash": "sha256-dfZKtAv2bTD8EsOxLQ6/a7zSZt8KTy+HuRq3wz1z3LA=", + "lastModified": 1769153735, + "narHash": "sha256-ZMMGBhFx7MSxn8PV33MfJDN5AwEm1qur2I+ygaCeMOg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3e0747d31474cdb182801518e39511eed2c84c91", + "rev": "ecddd35ae96e09e50c7cf0b0d7b3ca71ebb245ad", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767697030, - "narHash": "sha256-0iVZ99H3kR5h6Lhw8kDDuUc5C/k6iismeWgCS1qWTQ4=", + "lastModified": 1769175598, + "narHash": "sha256-xGlAdk2c1mVxOTMzzCYHDYuXaBMoH1BTr2nJOGkY/SQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "657469e8f036334db768daaf7732b1174676054b", + "rev": "1bea6e953d06da77729edd0004291ced527bcb4a", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1769086393, + "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1768165928, - "narHash": "sha256-dMDBPUf9jmIs6qYBVp9uzH9yLVvsrEQEqzaFXnkNRf4=", + "lastModified": 1769197102, + "narHash": "sha256-9cCeVZ6fPSAUXCNnuvcsGpNl+2nXrpHuibcmO0ZO1qA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0dd51966aa7381b9ca2b610282d68b0bc458e75", + "rev": "a5378e67b60792f8a60a3fc268f2a39945cb6f98", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1768032153, - "narHash": "sha256-6kD1MdY9fsE6FgSwdnx29hdH2UcBKs3/+JJleMShuJg=", + "lastModified": 1768569498, + "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", + "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1767495280, - "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", + "lastModified": 1768272338, + "narHash": "sha256-Tg/kL8eKMpZtceDvBDQYU8zowgpr7ucFRnpP/AtfuRM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", + "rev": "03dda130a8701b08b0347fcaf850a190c53a3c1e", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1768104471, - "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=", + "lastModified": 1768863606, + "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", "owner": "Mic92", "repo": "sops-nix", - "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004", + "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768075324, - "narHash": "sha256-m4IAAwRqlty7C7Htxt6HDJ/HGXrzLRoHoBaNczzXBdo=", + "lastModified": 1768744881, + "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "owner": "nix-community", "repo": "stylix", - "rev": "5b5f21c46ed0ef1f0089df66d8cd83c78da980e9", + "rev": "06684f00cfbee14da96fd4307b966884de272d3a", "type": "github" }, "original": { From 420a296921d84c542697090c0318d658d3ceae44 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 23 Jan 2026 21:34:33 +0100 Subject: [PATCH 188/204] add starship package to make sure it's there --- nixos/shared/packages/default.nix | 1 + pkgs/hytale/default.nix | 70 +++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/hytale/default.nix diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index e6ee20c..83fb9ad 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -47,6 +47,7 @@ knot-dns libressl nettools + starship # System libraries ]) diff --git a/pkgs/hytale/default.nix b/pkgs/hytale/default.nix new file mode 100644 index 0000000..2c549e2 --- /dev/null +++ b/pkgs/hytale/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, + makeWrapper, + gtk3, + nss, + libsecret, + libsoup_3, + gdk-pixbuf, + glib, + webkitgtk_4_1, + xdg-utils, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hytale-launcher-bin"; + version = "2026.01.11.b022ef5"; + + src = fetchzip { + url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-2026.01.11-b022ef5.zip"; + hash = "sha256-bJQwGSj7B1szXv1e7RN2VQdriSbGe+En1EQONIeLQ84="; + stripRoot = false; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + gtk3 + nss + libsecret + libsoup_3 + gdk-pixbuf + glib + webkitgtk_4_1 + ]; + + dontStrip = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/lib/${finalAttrs.pname}" "$out/bin" "$out/share/applications" + install -Dm755 "hytale-launcher" "$out/lib/${finalAttrs.pname}/hytale-launcher" + makeWrapper "$out/lib/${finalAttrs.pname}/hytale-launcher" "$out/bin/hytale-launcher" \ + --prefix PATH : "${lib.makeBinPath [xdg-utils]}" \ + --set __NV_DISABLE_EXPLICIT_SYNC 1 \ + --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ + --set DESKTOP_STARTUP_ID com.hypixel.HytaleLauncher + cat > "$out/share/applications/com.hypixel.HytaleLauncher.desktop" <<'desktop' + [Desktop Entry] + Type=Application + Name=Hytale Launcher + Exec=hytale-launcher + Terminal=false + Categories=Game; + desktop + runHook postInstall + ''; + + meta = { + description = "Hytale Launcher (Native Linux)"; + homepage = "https://hytale.com"; + platforms = ["x86_64-linux"]; + license = lib.licenses.unfreeRedistributable; + mainProgram = "hytale-launcher"; + }; +}) From a3ccf6a5654e6fd58b0b7e34c2e97810e6c3985c Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Jan 2026 14:01:58 +0100 Subject: [PATCH 189/204] update flake lock --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 4f1421e..797491f 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769164550, - "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=", + "lastModified": 1769432988, + "narHash": "sha256-q4arZjXnLiuMnLzO972lrXIGdzyGb4DGaIt69CcCYdE=", "owner": "catppuccin", "repo": "nix", - "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1", + "rev": "d7a8632c0d8d144478aac1a8c8d5083b770cbb03", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1767744144, - "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=", + "lastModified": 1769287525, + "narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=", "owner": "ipetkov", "repo": "crane", - "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e", + "rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1768923567, - "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1769187349, - "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", + "lastModified": 1769579508, + "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", "owner": "nix-community", "repo": "home-manager", - "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", + "rev": "eec72f127831326b042d1f35003767a4ab6a9516", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769153735, - "narHash": "sha256-ZMMGBhFx7MSxn8PV33MfJDN5AwEm1qur2I+ygaCeMOg=", + "lastModified": 1769596123, + "narHash": "sha256-kcElu+HiwNIJiaNH41IdemFaaGyU3TqI4ebx5CQMHFs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ecddd35ae96e09e50c7cf0b0d7b3ca71ebb245ad", + "rev": "d6bf85533180720680544a0791c7334e315c4fd6", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1769175598, - "narHash": "sha256-xGlAdk2c1mVxOTMzzCYHDYuXaBMoH1BTr2nJOGkY/SQ=", + "lastModified": 1769417433, + "narHash": "sha256-0WZ7I/N9InaBHL96/qdiJxg8mqFW3vRla8Z062JmQFE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1bea6e953d06da77729edd0004291ced527bcb4a", + "rev": "1902463415745b992dbaf301b2a35a1277be1584", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769086393, - "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1769197102, - "narHash": "sha256-9cCeVZ6fPSAUXCNnuvcsGpNl+2nXrpHuibcmO0ZO1qA=", + "lastModified": 1769604778, + "narHash": "sha256-cVQGv7ghlNFS7IZl5NctoqBdzLz6w1CILF5GM+Px6z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a5378e67b60792f8a60a3fc268f2a39945cb6f98", + "rev": "9e5ba754d025adb74b9e1a62fbeba655667621b7", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1768569498, - "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", + "lastModified": 1769268028, + "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", + "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1768272338, - "narHash": "sha256-Tg/kL8eKMpZtceDvBDQYU8zowgpr7ucFRnpP/AtfuRM=", + "lastModified": 1769309768, + "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "03dda130a8701b08b0347fcaf850a190c53a3c1e", + "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1768863606, - "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", + "lastModified": 1769469829, + "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", + "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768744881, - "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", + "lastModified": 1769471853, + "narHash": "sha256-aqs0HkV2T/7Syf/pYLRVSwfk23PPAyGJmWT43U5ZSF4=", "owner": "nix-community", "repo": "stylix", - "rev": "06684f00cfbee14da96fd4307b966884de272d3a", + "rev": "805fa4262a21ada28cc918fa014359b9b35caea7", "type": "github" }, "original": { From 6d172184694fe0574deccfca2519c41b566aee7b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 28 Jan 2026 15:15:48 +0100 Subject: [PATCH 190/204] re-enable starship --- home-manager/shared/default.nix | 3 ++- home-manager/shared/shell/starship.nix | 6 +++--- home-manager/shared/shell/zsh.nix | 18 +++++++++--------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 650fc8f..7f4c1d9 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -8,7 +8,7 @@ ./shell/helix ./shell/zellij ./shell/zsh.nix - # ./shell/starship.nix + ./shell/starship.nix ./shell/eza.nix ./shell/hyfetch.nix ]; @@ -34,6 +34,7 @@ navi nil gh + starship ]; }; diff --git a/home-manager/shared/shell/starship.nix b/home-manager/shared/shell/starship.nix index 90dda44..0fa93c5 100644 --- a/home-manager/shared/shell/starship.nix +++ b/home-manager/shared/shell/starship.nix @@ -41,9 +41,9 @@ { owner = "catppuccin"; repo = "starship"; - rev = "5629d23"; # Replace with the latest commit hash - sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; + rev = "5906cc3"; # Replace with the latest commit hash + sha256 = "sha256-FLHjbClpTqaK4n2qmepCPkb8rocaAo3qeV4Zp1hia0g="; } - + /palettes/${flavor}.toml)); + + /themes/${flavor}.toml)); }; } diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 7579669..fea6086 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -27,15 +27,15 @@ sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; }; } - { - name = "terraform"; - src = pkgs.fetchFromGitHub { - owner = "macunha1"; - repo = "zsh-terraform"; - rev = "fd1471d3757f8ed13f56c4426f88616111de2a87"; - sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; - }; - } + # { + # name = "terraform"; + # src = pkgs.fetchFromGitHub { + # owner = "macunha1"; + # repo = "zsh-terraform"; + # rev = "fd1471d3757f8ed13f56c4426f88616111de2a87"; + # sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; + # }; + # } ]; autosuggestion.enable = true; enableCompletion = true; From b671e61a0aab73898fc45eca0b0b37774336d84a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 31 Jan 2026 16:10:37 +0100 Subject: [PATCH 191/204] add keys switch to shodan --- nixos/hosts/shodan/secrets/sops.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml index c6a2065..2ea5876 100644 --- a/nixos/hosts/shodan/secrets/sops.yaml +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -2,6 +2,8 @@ lillian-password: ENC[AES256_GCM,data:uPNBvMyhkiX3eedduFlsFUIcas/VBVSYrsmGTlgGUO wg-private-key: ENC[AES256_GCM,data:PeuKeYRHfOzGlekLI95EH3qq+blntZrrboPKaKC0ghD5zIyaCYrFHYWLkug=,iv:BcugGYW7+i7d04H4EKn+BdJJPqwMVVvlHBETO0x0kQM=,tag:Z/ammSrFpWTIbVfi4VJZ9w==,type:str] ssh-private-key: ENC[AES256_GCM,data:7K3p6Lu4je2fNmvtKpLY2z7MG5E0gg3486PCLTlm/NzWpiH0FO8KO2yPkPPVurXfUWj7ig3eiP+bc6+kufRQ8+MCHaR+JA056cdMch0MMK92FyPvJjNKzwB4W3BpdvOKipaZvuvSfgdrEdpz6rWRwBb9KaUW5aHBjW5eQNm+q0yP2uZjW6Ncp/zrdevjlRJyXGnNJD8CBDQgLILvqlvziRO4xBnSZOmFpdCKM9jMkxwHIQUND4ic71G6cheN+kIsgsa67DlJjfrngGWxKrlC3Q2DC+30vHtW8f18oa+g7eu9eTz8+bSLxYJf9TADwE+UYe2Hakib1ju67yxBkcomIjBvqgo+zEr0jC2qYmOvlKfqn64gSbAE7zEVCbavz6gA2EMb0g47twtAdgGUyzppGQ4LXjZXv6lyYov2gdXP7bzAcXXfzDh92BuTUOp9HXOTsLh7XC7cPKziowwwT+oUeOaSujMT9tgqkazgcVR3ne+PjxduptV75gxOwxeu6F2Zm+4Y4xJBdJeyP1Baq0yj4HNY/gv3pxEEXgU5,iv:TJ3AsSvXeUmBsKd6xy+Kc1ws+Yc9ZQ5Q4A8UFHI7Wsg=,tag:egCYoe3Mkbvkup0itszm4w==,type:str] nextcloud-password: ENC[AES256_GCM,data:vA+L/7rTne16AZbibUAaLAcQKLoKPvM1ATNL/hbzjVt+qmxHhmuQq0cqKdoPOFlOftMNLo5HSKiHdLxh,iv:kw0IorbyjT/ocanJDcR3kuPCqHsPwSD4axIp2dfn1Fc=,tag:5QLl3xKq4a0EiImO07ardQ==,type:str] +prod.keys: ENC[AES256_GCM,data:yywkRYD57q++Putwtw6y/g+oW2dqlTcdCK7f8nLJ+3YPGeIo1aJL9afyOaXjOlrrzFCokx1sAErnRNu+1xtKnOO8vvBbO8y/CpeBirnrG27eGhlIL4AfCMl2+B/IgGHMzXfyZaLrBpXkqw0AAhZtKe4QGTS+1jHK3H7rppNdcL6rtPjLzJ3X1js46Wt6zdu1VKYtzsM24bcjYl0KNlpUktlaCF/6B5YhBqZDVmQ+dXhYpGNu2GiGrK/gmG/t1B3ZERUQC2af3uEHb9hQh1YuREfwMMB9Lym6s9e6jVIp5zPQdemtIYxj3l9TmZ3W2Qz3YRBjG309w5WrmWm22t6xQK4Htva1bEsIlrdETSFfv8E/K1Hi6OQYjyi1J3LI28T3tL4wb1qz3WAINU1pV62rv4UazjMCwttDinMD2p0qeewoPH8kR4RcQDvbPDeXKqxgt7lfm26JIpTYb6EtPnBB6JtQBV4gm/XaemJDDMXW3aBfQoIAiu9Skd78ogn/Ywx+o64dd7tv8yLBhcEpiixkxpXd3yI+EBMPf4KW4jMhExG4OQRDfU1nP1MYDbDvqL+yieGIBAC835KJGdFfYX0DfZcIhT0lu7k0+gXxQVGu0hmijqlyYKoVojlUBZP/DUZrXYTJYh2etrbpgpIEPKV3Y+BrqWsfT2eg5X7Y7Hv68xwng7NVV1UtjG3wDMpPhVnAO6Kow9cQN749xkYsUg+N5eOJHbI2a8P89U7u6d+2OK8/kV9+3eamD1uSOPmI+Y58dzRpYaoWb/yt6lGNS2IMczBjRxV28Dlqv7DWCIxs6+yV5utrykSYV50BcSSuK7nckpXyXHn9gyxNMr8p5BW/r5yln9eYrT5wtzLPx3VwpW8Y6sVfRtjzViLCUQoCZc+WutwoJ82jaZcG2AjkEMNDsVSgmcO74wrFzetS7VWKlOhEiCy80SrFG+CCaVqtGkkYn/IYS7OD3dmxKTi9svmhAdSDKKFjxofTsE4zjHT2sLBpF77hh7KeSxv3bs18oJI3MZN4iQfnJrfvDUHbWUv21oSOdCnFQ975DNOs/wnIINpsfpI8+Kvhx9m3D3RT/z21lKk/rSXRkTtfBM/7IhctcY2C4x6+VPFMb4i/C929wPGA3kL0DBUTwVgNwVA4xpNYUXLGibds7MUU2kGUad/HzQmDxOeq6/6AgbvlFGWVtmflsfMRi0wbLDBIU/ALeKA8koxQRnD7tmYwlFzsNlmonCJ8xBwc0fpohj+nCY4EMSXyKMJtCVqMUZV+Ne9Z8UrGXhK8yE1DBHzmjwVb6V8uW/o8L0R3r++msPZ3T4VQ5hx4QfwFr8BcxX1EbXrU4fx7T0Lg/bPUMzdmaMn/L5hlGxJvFCGSl5+lkiZOgPvacfFmX7uX9ZjqjRX1eU1pXQUMn7vBnYRpLFJNromUceH4i7yG9uX5DRzEF6W8CmpadYoJgqI/oCiBGfj73Cn4UHRCQzo4zYgwlzsBwHtzrGuBXk0/bpVFU3mOUE6/DMMHVPO1mheemNy7eVdK63TQCAj1UbXj4NPThDBBQ5Spky6edJ+dMHjZn2PDSsSGjaHavRuany598vM/9HMxfPyh7Y84ccPTDGHQE7j7GWnUV/OcHa1suN0hJV7enWdIVXcorDkpjoMgba8J5NogZX9pBzFM5B3HboLJved0ib7oX67THPEf7i4vP5RBFSvRmeFHTd9woM4rNKINiHHa3y1oWXRreWBH01WQd9B5ugQ9vMjRSP5ZSNH0TOSyWusmsTfAgDVn15lQ8+MF3NO/CSie+SliU1ps3ZAiji3OD/eZbxVBfT5S/lUBZ1XCGVD1Y/biZ4nRU+vqT+fwhvDDuFOqNMtsmUXGvV/CXiOIyT1pPwxrgJbPFqF79DF59unnwXQpeAhyV4EiP2VO3g+CU6h6rGxuuUBqDNwCV3kFNs+HXjno+AKk0hk53cMhDRfitVUFh1W+wx9WxSDUDJYD5UY+ZWOclTQB3JG7A04PLBslxTmnKaYBteW9Dkmt5BDDxzYf+/0AkOKlXWrUwk9qkeDYRkywEWasbXs8uWFN48XzClFqxfJGWsIxXabln2ycaVW7g7Mmq+RTxAha6TaWSr/ZwX06HYnpHsvdUShZp8TW4BdSAkzO1NKPmZ2M8hIF14ml2ZVIjg/TodslZ3X1pDdFwecdEYVjv29oWrZVBT1jR3mkr4cges6xN9OmXJL/N3dOdIQ0bEXYB12+Fth+mcMV+Ia7XuBEQIg+gs4hKg0K5MWafXjQ9uV6KwckwvrGfsrBHeuc5miIcDOSJtAIRDs3yBI+amEmDh5K6GpLkGr5o7JqVrXSvia61Sxgk/k6dvhdmFQTyHx25tcoTuoQNDROEFb3bqK4c8N8RjCqz2lUjHWUIKaTBasI1KpghYjYc2X5jgPUnWVqUQ4GtjJVGnrAjTcRwDFfIMLSISfUOvnWB3MA/JOiQaNHS+ivEDbPog44azhzJCaAe7zp9YBJBiHVpk1iGLD2XgohHo5aDKioyBbZgIObPEhBNRkNn24486vWKi1dcpIQPEZEwf3pj3DgLuVHeuUQyoIqs0wcuszYDH0Or0X+XKRABWznSfWmmfGPu2WWtEUeunExTbaiSX525QE0zikKPlFF0MOSX9GCU9Ad/2/olbrBqMyE2l0Fo1wwF1Em0/BjMKDoW+d+ABZ5llj6kaW+TwqsyQr2cFGhI/9XSL+t0t9NDGfJ2aBG42NtT2nrXSQDp6OkV8pNBnG7wBiUmghbauZWXlkb0enw51VzJDUrbUD5DVzw+/UdiHBv3GhsxaDVWi1NiPhMy1hHUFP23EMtlW/pGy+0kw5UbILFoghNUbYuAfDiVODn0u9S9/KKZE06SBed+dpHIlYSM+gOXt9TXnKHhtcqSQ++J9oWyzQtMtVcnPiaWnwW6PGIZ4/kSS+uYvC5VN8EMZ7KfEBcsHU3NWiSwwY5EuQXihgYoorQ6CwiCwjPg5NeXoENggRU1i1nSSMQisZBiUdopufGKXUVBnevxfM+LZqiMvOgqBzqt/4g+7W1/YqdVwEqHxi7/VB3TrgKrGsKTIQkhpvpn22dPOxhHx3xQThZASC3EEP12Z2UiESyVGpFtKE42SCqe7fJaxjhPsYJCgkiKwryOjb86wIBUQirEtfyjm33uoDficOCrMoDMS80nmKJROwJDwexsqRMA8uo7LWHCm20shBBUzXsMQNqDt6aMi93SkgWxxUvbmASEh8emV7DQf+ws/AFFAq1Uw1LV2MtPn0hDE0+M5QBCy5Nm/o9VmvwS3AXdOrogYNqYFgZDNGKsJlTSaLviaUxetV+cqKyz8UyBw1Wdk9Xll0e2hJn+t43Ge7mEzfrrSbZ99HZ7firM8wgjyKwDbHcy1ajnEsZ2j06CUho/rZf6Mg9NgCysCibddLLR7xpNwn9AEwKeBNlUdMfdy4XWLkE/rBcwLp3mCJ4A1zDJqYEyjrO9bSLOMvr0ozJU8TsSLxITlxYiPdfNOjD8wOyUfApqt/sFRyX9tW0ZocJ9joCLp/TPCgQDJXZHk1OVRzjtCcFYekoInytb2ykK40+jBmLYqK7ejW5boKILeSfMWvcKkYFRwvUp4vHojdzkI3ea+wiFmUP0C072t9WqOy7lKWc//kc+yNfExtqLbP+m/VyNIoT6Gdr87JHcWjVdtW+CaIOsP2eMyFV+BlWmhj1IKUZKEG1lqc6MzYlpWTfhJAHHfpemkaoW/FPu/wOrHkkH0ke4qBZqNyivPnMK5oUm62OF7DZJu4HZlIbUPo6w+UPbJihD1+2iwG6x3P0fpYukUmrFtTOE0Eq2nPLE2mCA9XzH0FiTkXyRsMKibDjFKvQwcPKoRNKjYl8D7KPcBns/wGz7tOeW1GdPuNsnzP4FMubQ4WwOv6QVDlFlmHYOuUbV6QN5+aaIcTfrl8bnli7mvAr+HPUbl/fUGIJdhmxswGTkgiWIdkC34Io/ZNnW3N/Oxolh3yKQwJcye4QD9hK+I7LEo7uUIsZYQb7SBcqMSotJIKJQCgt+mOssIxy0IzAjNbpa6rP080Aa050M68tO8+56NY/XiBErhiirrryowe4aOAKeNQ7nOIYcn/oPBhVVRIwB0dyXShK6LiiG9YO58JSzKJ6hJdFAvus6sYeqjhZxMtu/NxJTd7waWIxz8OLgCaGdKdQYIZ+CqRpVntUkByHRAOCOlaMNbeAjrtZLNAW8ymybQp/0jjI+jlCl2KefGWr1RTEV/GzC9Ov+q2TCEpgjsr7KETq1N/6EugjnXJ+ib0spNHpwsma5QqTwA7ud69tXpstDpjOJlDQF+PIkUOP6pHbLcuDH7jMkUwCPFWbE/pbdMOqEom8Xt4rw8kLRtGTAeegfw3LyfDwtD2wPJ1VMMGyx+a76+shkhlQW7GvgFypFXXliM+QOacSmopFEqy3O3WNim0PvVadHvSdocWsaRMh6W7kVk2mj5yamY12nGqtyXyczTximJVs1STANNDdOj5gkqy+7ZQpROwfRFjuQepZXSfoTu/PDkwINf6H6+fY/hOlvtWYj7LSodSSNSC+ZuNxcOKXbp1b/fKTVQFvXru0XcG3C5iba5CihUsoMkKmZQf6anTVZ6HFmp9rhNa4pGIP9WZzSwYIlwIy9qzywR0nw/wkopGhpgjZFUqi6CgM1FTM5ah1wE3zwJkBVjEslCkgtDrF9rrZVjEa+TTVLyP//tRgJ88cnlpkBXq55DDMa29H+I48xlabK38gHBUIJ8X+8EbrUO28jK5R49qTw8WA5ovr1EdoI+ErQPMEISRN6xyuwA6Y4Wi+L9op5u3+PoqJ2VBExqj4/hhU12CRXd9ZTOr1eREz+EGjBD/Ehg0fE7WHX9kslL7c594JYSxnT1Ssc2uWOX/cNsm//1MGfi9eWHyPEWxsNrDOBwOyXJDir/x5EWb8TIh0so/1+zY+9+tyFP35voWLHh0xunqLMrPQnt7T+O3GSWp6/7rINvpmz+LmrLtsfKEmm8KEiNDBwZbhFnwTjC+BDrgh3xOKcE0wtJ2xxpG4KhyYGhesyjSME9OJ7jAZ+m3gxe3S5O/H9lpCETmkb1PbUoaxJ2x39L2KFFZfbbXQnzk6ZuIX/G/SCwQ8xdn3W68d6qrS9zLF41ERl2XEWNk4UBpIsmslBiSvhw9shoxtEQ2/ScNxtAYuMog1S6M0cXKVZKZJfDrE1jkZA6HW2quaMv1BNXsvOdY6vVHXMbChjpf1lvUV64zCz87lQ0miZsj0+qHbj+bO2PbAPFIye3ORip6lOhglJfa6sGCZUDzNkmGEYLaHzR4ZBCbtWa7pOHkUlizd0TOH24FlSj7FtGrp0faf98a04YOvYRwFtDlzSCrpHDODESD6dfMfANVPJSqW/KeUozyTywzSIa79gFywZtaW3mVajdlnBN8HAwvmacQmki/ZO/n7paNZ8XkZDBpxxZETWMhxJGwh++5xqxCitY6qrHxkzXfLjUS7xWGV31XE34cz4F60yVfu3pN1uRF4OycR2AeHW1fCGMll5NEHvUxEmmAXDIZrkGKZgMDIZIxi6XhH3X1bbAKOoPWCJbj0FKZ3Pr7z5guSPT/gEPftPS1f5O6KXXDGqUlXPMBxFtTUfjZIW7foDz4Dp04HTpJ4j5SvEmCU0Qe7gTdzTeYY1pDXFOWVA4TQ2AMOh/UkOCAm44p07BQqG7vmbDeRBADYNEJAmZv5fqmS142x51ZxQeaOnP8iMLThbel0SyIK/WJ3skGTZZFuQBNd5+sDZptTU3QzDyaBEL06ktQQ91hXqCeByJtT/8RMBVr4H9EJ/VZI/N0hRQwqK9qNYWMaCow/qgyWVLj2SFQbUIMkvzT5ROB/wnLwcnLbN4qF2lOhqXiXIB70fAsCtynpj7Z7p8a+yScckUBCP+pUyzQikRz86OuRvvxIDAoTxmtMFzGPfx15/EIThFgYC2Jx6NA+GuiGb1MvnCaU5rwb77n8tcesj6qyj2WzfDHv8GVENEH/vsT33nanHaWz3Jalz4N28qrkL8RwgESFDG1orPH6aIvVuCWnBY+0yBRP4qZvFS11MpugMuyp/uwtfDQTRw4KTu2JNS1N9AvfnCSlrRCLXMIzgE6hshKhusOnHMeLtT74rbM3bfoVNYvPsjqgLXHBM8aeBy8TbF5wTehk9NMnEfifDlZ23vqnhGO0DQuoTpcRwjKsMY4PWWCLxIGBKNCdZEA42g3rorLqKepIrRjz+wJTqkjhty345Mie4HiDlDLrzvDAv0bJR6QYqOMmsSfkEbuyG/WBT6F/RSUHHT4FbkTGSbNil7eyyFQ3ngnIKjVp/iITdkWK3bLGDJgFN7nrP3jtfD8sMXrKNncYOZMaesX3elb5pSQ6QnbkH+82/9mipZXrPW70HS6f+SBAeFvIoihsxnJtPpT+8Kenzyf1AcUYHUB5F1C46iLvtHyDD1eUXKVI4tyfpZyD3N4rolsuGNhBF1nAJfkUCx2BwciikFBebC3WkGMnSRKk+hhmUdbu5LzOrD7JdLAgYgikyRfjANWyRJuxwgNPCnum/kmgN2UyNSW5eQGDjXk0NcaXONp7fgb3scGK4jAMC8W+bqcJilLMX61LawRwiV7K9CwrDohWe9DMGaJwZrxVORO9vbku9Xzk32IQRgp2jkbTPPbizTocwJibcvouPWHS8RlKzvCBqHJsrigI/55xbalzpgfCoM0Z8RJnDEJmYVelR0CqhpMqnUmaL2k/9xzYy2PjDN1qsZE7rcgJ/tqJvxqEXvJOQGhQyo7F0t9GTawBvR+QEthMH0OwHQ2Hk6Q1pF6m7HtEclhJlNhsJ5K9PNVAKVOcsF2j1mPyMmbRxLv59P7XLHtDM/HUu687RfhARjA/od9iEGtgdxUDTmgHzkWAZ6RU1fU7Nk7CxKOdmBLWqZnYesVwSkMmCzCrEBGFKMwavR2tePLQkazONLutxRy7GEjlQM7wdkxqqjilFDm8rXDdekGDPY6wAty4HIdXHwCQgG/iBk/EsbjfSSObBHEAbZD1WOUg4LuOeczioHn5F/of6e5qMs0ShYc5GPtDqIaLPIcHhnmqUEVAj3Brsmhwbzjuwqgtlp99nA18Yet4fLgr3jFdN0UmmWB0G0LLgrmBhQlmz3MoxEWKyDFJYOMfMFQJrOFmTskgnqlNIzGlfFeCIGUm/DQTD3Bc1xu4f0SNymhWYjF0Q6iR2PRyKU/xgCESvaMEESBpmyFYcg3lPQhuP9pzTu0tuCD42qn8fKoXDUwtSx88ilHw0reUAviF7k3gwSvtXvr5p6ijXXS00ziy/ouxJbrKL3kr3ncHeemfvUfJ3+jaY3UKmFlfs599Qr6k1EUOu3DQKdXvgd0Skd4Ib+tOeD0XpCYhumlQjpTDPmVH4SoEkBr6enJFSWpARyzwldY7IJoGgve++QgtI/zHnLDx1PMhIpC/h8i/Snb2AbqMCIvjfX9Q3u1GocbHfYLFQdl04GAmK9XJCff2IKdxuO2LDgQ/4r9kAO4+4QJuYbl9cQESIuCndVlveIlVkqi/ZcN7YdvevAuom8QESJHWDEqmAgYLPN8bU/ExbK3S6rmj4alM8t8Hi+pnmVypAyOs6J1APRRKADmTcXF6VgFrLwE/ODOJC/prUkD6ynliTS/CThuhB2EopsIrWMCM5ezjTo2Q9O19TocAg5H8qs8cjQXuiB7MtmkNKG+X41afg6al27us0EHjoxcOalLhy/NIzdUfH7WEV/sbNr+IRpjib5awAJRLU14/LVFpskb80awbRDLLpreU2vSxF0pd9R2uf+Tn5JdpecITsJREJtgSxV11GiICC11dHKrDcN9pkRg5aqGo/W3IM/1KT806NYx57bnWrqk2AeHeWvt9O8dYYZoV8m2SI79xewHMR+Jb4rIoDDWYqgYlNh8Ar8NMJ6T3sdp9zkEwIijVOSIlciKMIf08gJP2r0IPF5WQc362k2HA8J+cIcmADTXlJXsSLy0c7lNHNpqtOlgP8DoTjd/pa+J+tLzcfXg14W9TrOg0zilcRPDG7tY0qc165vP/0vXRaGYJZylNcMxbQwHnq1ADwXXiOBPcVD1bNLRv2ZG7d7XaEQGFDOvep/djTJYeRdndCaHrrDnRuxrCGK4t0PmmjQaxAhteYE6EV2A3tWM4rD04wjf16nEIGa7yjkLXHvYdWyNgjvU+2ZJee5SFYlRfVQnoZGqmFlkNwyMc4lvorVjo+XtSjeOzmgm8PGrP7HBv6w7mpeieEDFfWHkx9f+RcSsQQmMBZHTkt70dUm2G7hWzEkxea+HN3AiS+OvOVTyEdj4qLr9AuE6oR8Yr/WHaV6DfrQfDcXhqA1TUEcuMLbIR0/p+/LePYRf/IRu3dScvWMCx9XPk6LEMqnW+k68vzslXm+maeoiYtqrIjiK+d4fjISFBQM5aY5lCJXcF/8z8jcYmT/RLZlHOBP5YQolf1I08Vln/gdyrwNZNWPaspbXMhJ3/thNwzY4ASJA19heMUPPcH1+6qHs77TVd5DN1Yhl7oXBPJsUWwyAHorRa/ijw1h/AMGpbWyRuuve16YUISxvnUUIYGYbIUuCz9MHf4Lpk060Hujnygip8pvcMd6HHxldsC+bQGlb1naQmgU0jSxPJ3a39fm5ZFUVHv+0d4lceZ2nm+/Pm/CMcCeXP+bWgi4Ml40H4qxuGwtWPigs/iPFTHRUXTKIxWXNo/lRp5NCftNuV5iAeNcwHnGAbBSfNAcvTpN6OYr8m+uHZOvM6iPVcHiuSxYx6ltwzEkqJMWitYkwJXIYeKZJVkPc1hs2nqKlbFKpqzFZIYM+VTlKLGZJVqPYFlCJpkgEODzwJRYJ2p3LExF0vP7E1X/Ukgi9htBjMgwp7jFEf2abz4OdiTm09ayzD8UMZNMOUBDFtZ3nI+eljvRvqGIkIQXluH0ES1fJ6tMgtqLz6K/0Qx2jJZpf8J7cnv0aX7nBHILOkgNtG+h9I2ocKONtigE+icPds2+zfYU8MQ/sREEDeyqIPb0oY8oSWq+f6HnWwmxeKXJ0Ps/mLNqaMZnfGw7wx6N1qpycwV6bxGMBAZj83yBOVyAGAij1CqWV3Jv6oI0X3ZYE0lrrECfCvX2wb8HgJr1Vu7wYuYotKuI+F7I+pTEcD4IV6T9hx1oBMEZ8wqYpkpqsQUORavzyY4RRviUKRq/57JrH/f70l3Z36gADp4RitWXCWPzIYoh8eOTq+brEdlc9zxE4fAdXP8EXVvn7FmATIX5FxHqjFsjKU+ed9WRZeWUDLY3Qkq654+kFb8E7e7oJQMVGaCRBMS+5wLW7hez25vX13ght5bumXBAWK2bOMNTtN4L4479gj4SlZTsU0oSjC+olJpJf1lQuvquV5QqbXbAhoePFBJkjU1hzjgpqED0H04Zn593jZiqnFPd3hEYf2JxALgD0TQse1WcUY/1nu3cYFGHb/D130+snhfJX8wkiGoQKpadyqeSB83/8nzGX81UA0VkzMDO0it3+Zy4rbQhZHMXiTf1ZhQ8p2v6TMQSjgIqY2L76SDy2Rf/LyW7PUw+kZz5y4pO2wAtEUtIegWSNGa/3EXWaPuKyX6AfBFlb0HWgGplcPzj9WcuD54RFnbrTN5puUi7O3cqhykdlCQozR6x8aBmTEo7plp/qfSZTjHOn2kmjLz1LAAQt38tZNwKab+/j7GijaJz8L+Ra9W3WIAMqHG1lYCerKkfww/MTgqmaxuYtJjp9p0cGZovcdX5sMNaqSHcbhSILd1zcR8CeLvyl4hpQB5P3d6S6pqXtD4QniMvGJ/7Mdi5jbYHxjoZGRR6t7iXevisbRWPQ1DEKEgM8cx4ojrHWqMVlg4wFjJi9d/bUZkr3vvxKacT3oAsKHO6/UjBxLka3TiKczfR9Uy/QmgyneA3bix9xRV4trHJ5hhYwic7UURl916CI4b64RgwFm5QkT1KhPcjGQHyUO+nVWA/GQbqCrvyg/V/5CrIoJ+S7UBbJ4stvsvIuRpzVp1JWdPJduNGzUpjAPctU4nSGHFKQE4yBq3Vz5yQ18nXTBN0nCue+GtIaoQtMZ0Jjo3aCwNB2W3/AUB/aaQvtCWe9RG9MoMdKTiXjQ9n7Si40mSEd1mGVGQViaDNZJW4yGe/X/DlRRvO9dsanWshvOIlnj4IvR+Q4z70ab3xhCTm1VWWZ4+3sP3FLVNBn4UvvbXvHmpfsMzNku0TdV+sgSY1sanoCYQk6nT6mzVXW9Oodbhth+JorVTQXMoHi3YQAgPeHuuQaTAMtmpFDgx404aVB9L4FQoF2MpBM71a27tHFRsrCtvyQcueWjtsjSSUoA82UkQwQlMy8QYQdS5UXKMSwgKmWl2nWu2aQvpEim0KTV41zcfrM7Op6UaYHSLy5q7r2h0xRw1e7liYwDyL1uuhFEfUzblksCU/Ejka62o4CUSWrKdS3TMoPZAlFOhcM4n2qV+EEYaEqsFlcyo9ifnTdGAp6MBRCCVs/mEeV/XP5T0A9hVU9sSrZwNyznPEeExHYcrUpqyLBIo8qmsAirkNi6lUo7aG4JFa/qs1D4mEApswukXzsm0aHpzSpjidOlz65I9ftRYMle0sw2R0Xy9aVy8wYu2C9ZuB9R5hGU2XREhYAXnK2ze+NdhDLWwC53atnWqRQIZKpsqOAMZdP4+f9cKrAre2lZMqy3VriyWaC9LhXW52BAwJDutZH0ZMWiWNwNvQmFCc+h+xauvdGBm8Aa+b8YxT2RgY7ZID+P7Xrpx3DePa4jPkR4CUlu/GBRERbEa2fiJ+n0N9czK4URgk0uUkUjfv8nPMrAEK6Kn7QyJ/R+xkkXJ8OXztiuqxGkl8cBPvSItN4xE2zY3IURmWssZBV2lZQMEfdk19uGagS6cJNkOsYzhiVr7/tRLIkZEkqTkNRTXLiG0A7Fv2CebNr0sD9Y/IRHgjdkhayCDzbj7BK4n9ZpfuL+2P4MYAkAVmNHjbnpZcQe/9r3L93KHO/4wG4bGR0iZfXLJcFL8Mg0zyfwPWrU+dBKRYMHTo3I3W42xkVT/H3nHsQUQhv4+miAFAYkPZ6u8tvWqd97z5jT1A74P7UiR5HEOPvzfunR/BvNVSnXk9mh88xCXd9UtF56TBBj8zJFrYUgzAaYSmHYBVxtjPTvVp+gfbNg79Cru6cMmZPgy2LB6Ddp4JGJjM8LIz/R4rIAC9DMtMqxKiTXHj4mKEA6TQYRuezrjtef9dWdWnfnio0nHa8V4AZ6IqPdS9sQ3FUM+zgCQaMaRWtSeCa0uSpA4cySAq31znLOF2UUdiBI0SV+yjafgjEigsweXkoJDoNBcGC2aPg4nuCj1STMYfTZHWc75j+dvHNHDBznnWaFYVlNUnVEP1wzSRy+z1MMVlQuc4RzjeXwt2rwcFGLAZ4XcjqmMtt2gnRHupjJA/7HTsI8cnpJF6ht2+GyNgsItPyEFpSMREuWiPreiVn6H4ycdLNFJomAMzdgSxHJhSXbxYuZW8pXJVI1GhEJP7Y91H5xZP7V4YvXAnNhxtO80f+5lnEpnwPe+a9wJfXR6QDsA1Jc++T4QbHMSx1kJCIykhMUGGYtQqHXEPs6HZH5qPGSyNGfMJAjxr4isTD9aod+NsSO8AUlOXAR0n5iqy3KeNRSDkHKoVwtOYVNxvnTJwjbKPEzn8L4MvKvaehZojBOyG/ejEHE+XKfguTySYxf4OAvxj9o6c3e3H1l8AtpnoAN8w4nszS2YWfgZi49246JhTxTSVsDoJhygzUafmTSscQ7qYr6OgZb74bXSZVL3IvBMe+3MDZ6PIEf/Vz15b0tzwQ0gdP4WPdayg17E2xxnLs9t8k3Nu0qVftLMy/YR5YMF1pY7z949XnO6TlQ7LXcLDMKzJCnBjdqgQK7s1MofCAiFers4m0M5nmDcOcFKSJc8YMpP70Dm3d2rEbYIgJRErr5IK8KQSwEUOHgec+jaduWT3Tp1mb9WwmigdgW++z4dyNqajfGd7HlkByiV3N0Xsjmh2t7wTcTkZyt3OqCrd0yJ8RTz4hf/UOFbqwuf32QpTvQ1pkT+/7wL5c2LSHkCT2XpU8kxc3mbIE1JbSCsDK1NF++hp1hCji0XPBLGVeznDaiWk3lBgwz7TGeNI3PEexMGaZd8hMW2orVRGjWptcTY95nyiSCupf1VbI8TQf1gaChb3dwMJiB5R7dDsuVimwkdPYTGgnxEl/F68qWRMeAQvWO559cClxucvAmThcsMlcReqTlNM/+xRCj0ID9N0S0aNq/HOTuKolz/WktGYFLiYZaIMU1tcOY56ZVDGFkbS6/6SYI+ZW5zL7LubnilkKX5UBbVWD4yZ2UIDLAX/c1ZPhWvAf/aGEd4hoqw8r+SpzqwODJX86jggeqXxXP1TS14vz8uDmdvd94cG/JSkjjnddNdi+ufiS3XHD3Gbr2/Bbu9n778QnQKF2uN+ZiucIEG9r/uqKIpcrsv6G9Gk+ysQC/ieOR390lRVSA1haBMWC9venesXXDQd8L2hPXnuK7/U42AKAx23kBgLNnX1KAVoVXzenmknRHfydPhKmTjplstl6Cyqj6qRw7FjixKw3I84vUO2CwGOrg2UygczLJi0ey6JQpsSUZi93l0oBuyd/UAEDn+wOtlMvVm7jYy+P2DMOkvsCqpRdVFXkTDBT0Sndi80jM9OV+a61we7lsSXwbeX4qML6ga0A1Q7efxW/ImYNvrqr+uHfkvTE+fOBFcrlY+zk72Oh2XELp4bupUDwCXDwGZWu7MImO7ynHU3rUB8Cs/PvCJzGUl2Q3alnq/rP/OCCzjyFogZAG8SFZ/lDg14Tini+/jxIbU3VzqfmPuWomL9te0DsyDTULEnxENzzdlIDXrk6kiuqapYEzvz74ezEZNJI4n6NF4VIGMW5igz9MQMvsa0uSMtQ0AT3taVI3b05xJQsI++XAcCnPO4mU0jtWpO8Xyq/m8b+ZcNGR82wNv5XY4PG4d54RlFrs0CHE4TrPPV9iuZFFtwKPxB/YTCKA1f8oX9M/abDw+T07gHtewkXfLDXjRMzZsNyZhy3SltRRdXIqV2U2ocY+tIV49gdPB3/iPdeNGdg8Ij5p0GISrBZaYrOIaIfd4GRRmEgbNoEUMZlofhqu6GuS/LY0o0WYTkb7IqonEvOISP5jxHtnqtWoaGFgg65GdCjKAGSPQ6Hi8Bkm+/N4HFeBhuYLX/wOgn7ddFgS6W7FNa1gWCG1FBOsj0/FUG8s1P4pDySsvTZOcNcZFu4CkmU3Bwo/85JysNvRg0vmNgLkS2S0pRR0bxtr109LScH13AmnwNFbVagyAnLIQgmYdcpjpA5bFbRFFZNPuTj50keztCB8HuCMLFDsd61xIA2T6o3sKFP4X3Qk0kwYBqauK9PHXAmzqMtmEYHsrsDaMVSYTgLKzO9qBNo3mVR66LXFrzrxMx026ASy8ieYc+DaIX19PU1JTn7HL9Zq+evi9x5ZVxashamPSoXAlWxKoI4Sglmx+UDivCJmsiTRtNNXsiDxZocU21vyhOqMbmzcidkZVqu2cWk+LinYkqO0zM2+8eHUd4FAQRxqauzu+hT6HLy8dg9Oi9aLKSHqSLTwLZHPazQNKBKkOzgcPBvAfpoRLZz8E/Fv2JzBEjHzXuAV9RTjCBDgQr04Jr4wa+Qdw2gA26Vr+P3NSXznUGmdkgPD5PbL6407HyszL/wxg/6c1Q7+W/MDk8wRG9IP5X9PbrsI2s6EthyMMyqDT5UPjmD1t1i83WM35zziMXoSyYLLlKSerxDaSurobyOvTlgX29ORaEuegjtSifwb+v+pYdq0RuYiowSqGX70QNzK2uzB20WLvtW+A06wfHsdBdpXDS0QyLa/6V3DC5C/VmE8tDqlQxZmv6im8xvvFfjXgC+e/8J4oEKaefgJ0lv8OYK1fU5JVy0f8hBEm6rBt8c2taI8lVQ4NmrexUXvCDXKwZIkOWLpHRaySP2PHQAi+RLJf+QT8yezau2jVabvAPOD4cZL+mjcOO6gAhBc1so02ccy5zrJt/5dIMaHXHDrrjX5USVoQRwqe9LcXvSx0BxbcYIaGNCAn4OFRo4wWrAmyuZUelvAVNAOm6AaSt2VqPLB4+BzqQb6QWIm689vpHHsDz5B3QRACm2kMi29m6I2iGQN3bXUKOqOMPySaOhQ4xwqmUJJrtZeDwxAbR326+buyx/AgGOJ/SBIHfgytwX+u1HJaV+PojeZIvsFaQQ3Q89lzicMVKBmnmUpDSCE6cQXcjjuXnUlAi4xtHvZZrYJsM8X4XTn6f8HjKsyKQJWcdH3wgeJJUCfzfYnTrL0OR0BAZ8SEwQy0tPmke8bOaIM1K0cgHXDmff3xjttydyIhgNxBkY3LA3Dc4/MNcaB5Lz5TwGbB2pShPq8JHqdTxtf4MNsfvPZal5N8G8YAv2VpayTxtsijHRpYw0iB2qZ8peO6DCklV7oK/Otrpq/0rug/SYUJ6oCwjvytxoFIRszdtz+XHnlyNvSz+lQg+d5J1VK/BsoBZNdI6mD7PXR9P3xSHZH2x5UWC4O9tMb3kDqGDQOM3ePYvjVfCdMrjdiQJuLF26ndgyR0GjIQ1alBfKKki+Qv7S+tTDO8IREczjrYoHMe+nr+G+BX4jbOCxuvPOmY3MnjHovZ7vVNMa9RM/GfZ2ltvaB5Oad1kpPk9aI9DsIHdUq9H6UUHg/o6UNdEgAkzzT81NPasvHO/o8280RKF4qUJKB/k6RKNuDuHPmrFh2lq9vsVGu472u3pZ0q2Mwx3RCE0yKAmEWMlbA+wOb8tnCPU4g3RvNgkJah0fKZWlKI3x8BrO0NVaJT6HdgkaQrTyDC7XUZzI1GI9qMubnc86mWRwF9kOIwfdMRS1M27Rqv73wxtof+MNq5VT/56u96kEnPpfSLYIDBG6IFvdrMhNSrMwjI8HjKxmyIHIuA1He4uAT8haspCbt0rLGF9BCTkbW2begvRVaxNxX8K46ozfbBIp5LqRyrrR3mDotz0vPwodjF+BmvNESG4EIWerNKnfEPRgb9n/n0WtVNRztYGl+i3Lt+rrYOh733uX7Y4pRX03T3mK/1foOpR8YXJyV63P5+QPK2un8XrTJ4qQyIj1JZ4OKIhdGgpAHSpegk7ae/a9qZ8o4NYpyM1Xo69SLs4mCCNWJyUhktIpKxnaqTmTYtDrL1s0B5sCY8rLqK4LhmrQ0VkqV3t6ezduKmr3r60IKKUoWXYOCMmXQGC0/udnoWi52DFwZMKfQeFCtssvH9FeuS0sM/X19WIvWga1mFjaXP79W7uk2IKYcBP7jFvBlJTy5iUulDG4AmD2PtNFcZNyH3EhVFbLkzxEbUSHqTPpcw0db5/Imc+FOe/HvBM2mPoDyO3W+Zw4s7U0NnZFZJiY57WF9y/tUHYQ7azyI+ZsjMATh+KOeCS7aE8Zn9ChJAf50CHorN5hZTNOxxotjHqeSdK3iJ+nWVmSGV19/E5IRin+9mNKGFC1Ml1UWm1Tg9OQc3qnz95oLMbG4ioqqzAKXooMEKNeHssax1Klo/Q4RwD7el5hc/SQIWI5DgFiRtWZoWrYaB2Uc0x9pjY61KOMd3e1mGmVkMczR86iB6ELd+v5SUCn7CsarkvoAWGIkMZtduaqeUZIoS5IA5iuRQ3B5G9OSUInVh8HaYAWpKmUhjQYeeLES07tL8NN/XLeQ5SVoaIw2l5H8D/kSNUTnko6cpQPB7NXxNqqhQ2oeDunbo2RMvftyHDZKE19NCrZhjABfVeAQPP7pNjdPU63e7KCd3svR9S0dfc97u7lpSpkJBToUvUp2/SbxkxcVzlL9RpqFaRH8cI2gATtpjvl7u71id5eRGW23YYqJC6lDY00aqDl8UN7qwvbOG7+UsTyaFvmgyb7nAluAqG3BPdVm1CKV6pFEtgF4qLjOWll8A5L47bJ8gLCSrzFmxfUhRREFBFOx5r4tj1PNPJVDE5Zg/b8VR91DQdcenzsDUzeLwySPSuGuvYkxCysyobQFlDirwXT62ljANd1qRD3KEraQeauN3Ah0L9VUpCj1yC7fkXzeHw0fPerqqX4dA+zlEXJUcH/pF+rqGeLBv4P3CjjxRTm7nlGdX7ypo/D16wCk2Dt9/OcpMbKyBDwgGdLjvMkshHwB0ZROsN5+zxztQJ2bVt1PDiJiSMMrKLFTneYdo9aYw5/XqAaUrS01LxblFab0v0GaRu98PtBJsl+hIQoWN2JYdgZc/TIaFi2SOHEc/kRRMNBWTzc6JitxkkG3HJhbSRhWeKw+9AD34IUqD9ZtV+HTMAZnP2qvh+i8rz9O1FllCGilDq0KFZ8Btkp4L0K3bzNdUAOgyF1lugtf8vjjDnbPk6NfM0jTl6ImmfcyD9BNUw9/wmXkB6FpLURQFcTEgBsTGgttjHPc60LorLej/ewJrHWgYiQ6jaJBnby9Clo5u1g0pPBnIJVhjkOwmXBMroYUBU6/TX+49dZzpzkYuSgL9sf9SWqvwbRrjys9IhXeUBoSnLc+7bZbq7yaXppPfnt7u/V84C87RE0+SeNVObw8MAKgPYLICtm2WwbvqxNRGt2e4JRjqhdBfDCtWi8Of/fv/+Ok0M2zLJBL/uGjl+umzwfqJPI+m2vVcM14fShzHNoyWP8dh1MGy7fr69lXBl2giSGKdew+B4rOkr2q5fWQBO88mUbSk09YD4jJBT5npgPw9IgHu568j6gbwZkSBM/SQRiNMnoClto4H5hJmqBd5F7Ctpt6GQm0KZU8FJTRvbZfyKy0vRwzP3pgntr6DrWSB1xdkq7OBbGuBH/W4YjozwNMUniUfPN41xFXCYUM6DrVwuB6PnUNckR0qdzPT8zUWe7zAVylWS7eSyDLaZ3kQo599U1C3YuS6W4RL9nylYV0lONb6sCFaxpRWmn+HFIMelxFe8BZwkW9owmhhtzIX9NhPAWg6zODs5PSnsV4Bertu+yhg4pUCeAhodsYKXsTATK12+m+hHtVXV5k3wvI/LpLrwePX3X/0tivJKVFb4MbwhMBLwqznrc3LHqwbtN9qIRPIl8cSdmnA0Tmd1bTx6+AnkwlHJfyjOyP18cADLAzCXyjZsG7dqhhgh/rfJfmHUZgfnZVBOdeDWAIeBjh0VJcKBjYaUH/nJLVWv6Lq4U1wtlcqAcKAUBHxN5KtfyGZhRT1X+tNS/KslPJZ/IwpebfKLerDRXEwNNpWE5mGJA73Ikdt9BV41i3Vg4a89rwWd+YoE/yPB34et5sTktKVdVo62F80CBw7v1iD0nUlOrbouNerNcMGjvFj5esqWPRA4lHUfw+VQ0HegKEG2LG/itFhLvaaQrEq1Ms9wPxTsV2ixCNvUkGRJblJDWKPEQRaei289yg4uVC8K/8v2QgRQ3z71FrWUsIi2ZtTyG6D8ojdkj5TChKrS6OC5wddN9pvhAYcEFy7tqYaEb5l1QxR8+mIMHC8saensYk14qCsXlG+e8wnTOwqHYtQSZ+WvvqRbkZ0LXsW+uXAj14jSqzj3+tKjZy5e3ZA58jiXv4Q4WJTO+vtcOylvaQsyaVDOyNSJOkwwTGppxdb2pMj6Yvy2HStZH1EzOSzoLQLh2wNxgYVRyJguNhF+e+AjQS5K/BZ3H3Qu+D5bfLlljWqO9BGmZjIHgivMe9JWKQaQ0Oef1FvcCeEfIh3g+26z2rARbrv0NFLdXDbKdqdGLh6sO8Bsqk9YB8Q3Dz0ARjqxh/cdhdG+tDd3qEQRnXbayJ0B1a9sOjTgueMmlbmMKpV1ZTsjfN63zFNNRdvVAmqwwu/NRtfBMUZNWsYR+dNZL5idtsQzjtre+O5lIW4sOqeSVMyhvPTtKnXQa+6QdQys2BqXMBUm1Xw9yxSJBmxwy/O2wcFTlrX9e++tvi3H/n0eX5W5me8hG8nN5zQ9ho2wB6OBqNy5vAXfS+EKwVf8UIHKY/RTcXWYCirSRAEk4v+iYphPGb/p8BREX/zyLMS28e2MYDl5SRWfv+Mx7xt3NdaCLEqu8dQIwHaTaE/7gJwqaeS/lLYa+YLvL8oZa9xfOVrTbK2Q4sBw9B6lEdOGL7GmI1y88whByOguTym+mZUe1lwzmtqHfiOx2KxteOIiRaY3LSZ9tGxAE3KM0m7RBqjeYl0oX3YD+1awEYAjVSnzkQGGve/2fN6YnY3fT9wFVQZKHD5543dVEHS02tALsVNQRVk7FUNtUwZnDmjh2cEfNB6+6pUPRWyzmWftIShuzLzZssPrX1RuXjC9sgqJDmi3d3h6tHCwRV8f2KVZwWmUhNEuBdMIuMigZ18HXjHwWPN18Wdp3HSAgaCUbxWCmjBSg5P1BpxBuqYStzNDY6Hs3dv28ywDHANVtjUzOmFbOkG8OLyg5zoMZ0TD+ii9gmeEWEvxSxTeJh2HVT1LSp5GJVkcI0fZSCOQRlQbfoqVvotr114gbYZXxVrTbBtDfm3fGAMjw6+CTk655aZy+l2rPf/83QzAPOI6Ame20CS2IUU4V49KKxTbqmJYiWrIiIzfKl/7+2/1gc8v6ux2VEBrrHh3AFwuyBGJEPVn42Nbz7BEWc6PuHhw7VoE4Kfzs/AVg+7m7Tgt+RK2dD78zejL1YElbkI/bO+M64nAqlaCmevongUsV7V5+iI5zi1Fr1j21+kT7HGW1o24QFwfqh8ssahVoP2pnhokEZgaLTQmwZS0t2hxtGuPHQmFQcaCNvNuniSWE9qCHWnBS5P4KTpg+VIkqc/A8NEQusiG8JUb+7dAAqH0bvToFKXWmtWElactnyuzSeayhHmIifh7HrOczD9Bshk/f9sIn3S9mEalITpWb2ldbGmzP+srYkoDGB3l30Wju9IN/IVVhbYb3yxpqBS9dSsV2wWfOvoLPeDvLZnfDnLCnpjb2Tu/3grgPGqs4ILqbLyUOAqB7CsY7SPGwaY/UiR1yGARgoTcX/uxf0Rmpdc/HvHuN0Okr450nGU3JOs6bWHQNZtVkn2Uc0WrKruHxoe6/YWgpDrlCrKUr7N3ycWi5MHE+Lmg7aOjPhvS9Ab0UM2gR0wp+Z1gr8sXwl4Wg9+vZXuP+ouhGPQ53GvHOchFV5hz6usx4RcqMIQygDPi3X+AFiVuMUu5bN70dK92NLGYoofenUgR5VWe7Mv+EWvR1j5mpT8Wn4O68DgxrfARYqxeHr2ExjVyBZTniemJRuMKYzrunwyCnSkGL83XUI3YE9eKqeULQoS+GiPUUtjTsGKlfqrYWYegB6w8Zi2zc56Vm7sqRmMacOiXFdDTtS+hrpw8WNmgbK0KeWsIYd9HuWhjZpcf4Z+JF8S+78wpVgf0vPWcgB+QDcN9pvnskoXT6PTJNyxaT55ZvH6FWWTyEW4lJICNY8dXky7M9NemnPGcDPh2cmVdaem7UXaQZX3CpO/JacEpv8I5kk/3YyDx+6+IEQE1fGe7hhy4UvbEcMLQlORQo9eSVS2dsU+j0fEfGHF/UkRDapoJFCPIKoaVfwIdTJxgMb3PUrGITkFhguzGQ5h9a0vXLPTDoA21/Em8mJFnD691oXhOqY3UuhjIT+24sAHO8/xqncBZVcF5PBPRkthL7alTMH5Um902j2iK92kBX7SIhtWgop67HgdSupQ4ATWMx4lbPhiLo5Li8h5u/K2pak3V9RX4r3XPRNXEx0GNUpggLSZemRc1T6YYRoH2aQIUr4St/NwXUIZQLzaO3xKvieVzyp4PTkd5NwiZiQySL/j30sA9CAiE4Jps0JWlGtDX+ovzTvYT3eHoiOatdfQrwraZ0YGtcYH1GYEYIBZZ4rEpzNot9HTeVMBII7Dd43JwDhnAzfB61MmZu5QkofQ8DSE/5b3f+/rRWutGAS0DkJ9/OQEAkP3x/VfDcvAASZCPv+3kuKjDvRBzsmRBOGDoJUbQmSqAlpOH32HIit5WpigAdDpekSNMtyApKeQn0xXsTlZZ0c+umTaX25iKqMNKA/32q/YivsfE2ZpkiBd+Gxf6zi9jCH1aFQ1bgn15egd9x1CtXE+BP3v1Wt0x1TAvt6D2b0aUJYV819VGRfxuF5w7mDxvpubWJCYX+oaIRG9NbveAH+YersQItzIZ/jB02A/XJR+/IUfEh018wJ6qvO6iMQnaDD18wFWY5ETZm0GlzHGKma28xh5U0Ffbc3skanUvGi+SjU8vaTf1v3fhksiXX9bsRaj4bO+me4schimFrTMrCuMDTfU3x0/xYLn8xgAosBunplFhfVkOzLJ++CfNMMOeW7LKhzSh/oXOWCkIfNi6eaM+S/+341OkapoCie969BZMdBQNx1F0+0/aQun2CDROWf5yVe0XOVNuAOdI+M4yGHD/aWAnOsGNxthN4USQM+JQ+ohBNMhVUiUDzhHavaWuuMO/7WIBxZrXmpFEqg8YuyrwrN+5LfFcFmVt200W3LKGf1WH7jXtrObvp4ZYmULMYNWGtik4ed2d/Hy3ajX44Ilc1FcsJjI/mNJmQumZn/EO1uocXLbHpRgxUuLDQkXND0rT2A0up+kn6FyQa0COhzMnw3dFL4yjSb7j0LgCn8Wve5qf8sDr6avXU0PyhdgIj+yPWEjfbzdgJHuULbzMKZofCJoJxtTalTLpliRqxQmpciZ4j3SPY5WQAw9hXZH29Ecvbv2LZdkqRJ1VQexas0yD7/bJuRtqxKLiAJ86pw7QzXvB1meSqws6/lLmtzE3cI5Z//+rb3eDGOR/FfKJhHdK15SAU1m1zrqIywe6RB5hYkNuTT9wO91trTERqspDRh6KNmXxjO7sZA+v2SsGcPwazrItBuVnD/Bv9dSsbd/1e4cY2rpOB9Hv2zd8n2sLBhG2WL2W/u3V6eEgp2ed1FOodVimZHmsgHaj16QHnkBrMCTMAiUJp9djYl1nP6mPXN+jm8IU98TpkG99+NjuaAuJEK3IH8Bcp/m0j32CALGinx41ZJSMnxceMHq0L0cLW7pnA7ISP1mVIwtUtTDtZ5+ewaRAlgcFP4Z8OaUFXg/miolYUrsOyT+gZqiBdRj9p71OlUAmrJeZ6feOBTCGOZ75onMUy+4TYRxGvQpccQ2P3O5iSQD13Kk3uUTV0KBdKHtmU22ma+c4q/hyULjKGwCbt+kvO5vAS+oC7tva+MExbjglXCsv+3jSRSz3saEQN5OTsJkIQOwevmU8f+e/1JVw0WwhhpE942+yo6cxGv+DNruxawTbKdQ1J1CEmiHvZtYfzxEBVeVoz+6yIiagOcuKWslRGtRbX/9D63agUN4UeLHMmAx0v8W+ARAtDbws11f3xpUbsJMV5Fe6o7Zw0MDvSg5CoUSRd1Lf2+CCAP/kjGxB5VvaKbW61AKnuZ0tZi49v42EfdnPz3257EKOvRu3DrOwKUSFH8bnNt5MpCJQu2SlwfbVxWDnRDRLQMFVo=,iv:KLy+ZPTzetrbJxCkkmqO2ywSOxQu3x973mMN6LtyLbc=,tag:vPy7805yJVv3hIpYiq3Ijw==,type:str] +title.keys: ENC[AES256_GCM,data:n+2dvLPwSFDUUjKAWasOk11jdcE5EAzFOTLepIYbALCxpBgCIMGDYLXv8HM6k5R6CHzMMnkLawCUgfqG8ozc+mnD7HDgpje1zjH2x/sEjyG93ThrSwaW2ydN8KrU4LvNgRUbGCr1gTBQ2utX5jbaOrO/P4PDLtjxLofqEHQKz3PXjQQuSs9CT0dif1daTNKhSqTHLojxuFS5FMPKTT5KxmDXj2tJi898izi+ZLz/MpM5S+ovs23Jz/nFPFzZcZcb9K9/KjjZAE92ArwMYaHu7SlLVyKmCyEB6kbKN6V7W9/UsQwglSH6KBH/PiknLtsdOwlZFBa7kR4dws+kOlzhR4SakEZZjYtTtZl+Fhbl1vGgn7npbTL1dHEIrbRd8IJSTIkDKdnSUPatEpnfM9BDhDRnYGQsShy0Pf3UENwadu2qDXtu1/RuztlR4XlOmcc2BbGytJ2TkqRcTclMGsT0CPtFORKIo0Mb9nsnOY/049oEkFjXQOaI9Gw3ahc73GgO+Fb256oGmJXmMCcvVDGm3qGR/ZjbFLB7VTOPCDO7M6Dy0kPUvPQYsGN43Wu8cM84cIYRV52JAwUJ5IunoKXl6ONHNMy2LpATGAQ35IKGVFUSJSK4y1RggFIU8ON/2L31u+gsfCrv0UNDQXyIJrZINA8YEFfsarlfBukakgJH8OvQ+DTTLbmJT9bEyhuDut8jR3u1tuEovWRhCtRqnYEiEBKeHzg377I47OFx8oYGABzibQecQf7/pvuvoYRU0pE+CnAW45rrhJMOrZ4U//4HbI+5e5VO7UMrfkuMQcddN0vXJaGpGjLb4O8l+9W+VYAZF/NZZ1vjjfy40coRwa6veiwo0BG4MyhRg9uvwFv27ne+33v7CEmvVUyY+8yafxTQkoaGSPVS1eawEKTdhC2VcsNaH9+LOhe0T8di5FxIho1QOJXYnyuZkIrcHbmIJt7lwwsDLxO1pjqa9xLcbwLDCjsqXVG42K8ZYQOvshuCR/YSG8lBXvqDQsZa7YzTX/gBFJ6d+t+4huPx17PT+oUaJu2Npy7FFb4RfKHWwjshveRG03MI5sYl6tBfZfyODHB8litTgQl0TGvKLkR6RC5jHoSt+ajy+hbB8f7Wenxb9XFoBW59gJVcvdkLXKNz2+b+0ZSLmKK1RkwA1iVSwlvsy7HOqF2Eb8FdaLQGNPBwnsGKYTTLO3+tgKEWH2vDoPQNUCvVcUTVYm+pEIgcGNfVGaw8ZcDUHk/h0D+XBoQYBOIf5Robsie78aTMVMxrZQ3Sf/PK9p0fDFzXNIUyqyUPECGIoXCdGtPDL7jYSlQheQFQulpu59m1A06uqakeUlVtQnaooe3IsRwwHh0UmtonZyv4HTxlb6mg33aLG2RMEyztV6yKRsUkV+TQYHr37Zmht1r7YL46yS1WOX9Gymxoz/5Gpvsf9zXP6+2TGzeRU9xcMaQSppDMrPLJrfBULXVZpXUCLCCnmtF0eemx0cUkILgbG+4U4plkHuvqAsHGPbyEPEhPILpLkF78k33KRpClS0eeVSJ+Sh2UVnZLBTg5tEVKenuuAtT3WNLyuaw4pDTmVzuZegsexbcNj8sMu+bFnxAvZk+WmtY8eLUfBohFiiPoIfdF6Hjf,iv:em/onbNK9UerSYcShqsw3iAhZMfhIQ5NOHB5Li1aJ88=,tag:Y/mILY1zxh3QhZ5pFuvy3g==,type:str] sops: age: - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz @@ -13,7 +15,7 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-10-22T13:25:05Z" - mac: ENC[AES256_GCM,data:qGLiJvoU+lyzMBr1jW3My5kNLCm59xVmdc3knyg64KMbAL65q7m5EJBC9uvRX0ZcxaNXWuRJWyUu1VV9tIKtSW+HLVJUZuTCi+0qswOL331LLuyDzhIkOKbPUPiDzKaMLif7EqENN9kN2aGSivpMVB5QkqRccmg6ya1Qkx5Ao7A=,iv:RiaIdq5Ve/PNVTD38Qh4YM+2x8fEU027r7hlmoNZI9A=,tag:jm9ZThwSVtpyed+kMIgaJw==,type:str] + lastmodified: "2026-01-31T15:10:12Z" + mac: ENC[AES256_GCM,data:9E1Ghev2RWb+r3+k7bomLTVEmdeUiQXdkO29fs6amMcJvsScvOqAfqXocbw/AQn+hj1KOVfLoGknPlQmUm9FQE3MCfASuJe01y8HjPXwU2C0PFB4qK+LoWyPax0GxfLRZqplCSJShFdhgIXKep5MAoJFTm48QQlmEw+yF10fKI8=,iv:EKbz3/ASb8SsDL3lqrHggnfdBehynYSzIKCXtsSCpmA=,tag:BTzlh1f8EnXhV3DEbf/+oQ==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 From cf4990e1d8dc1fecf709deb3241a0297881bc677 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 1 Feb 2026 21:35:30 +0100 Subject: [PATCH 192/204] shodan says it doesn't have zellij, let's add it to hm --- home-manager/shared/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 7f4c1d9..0b5bae7 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -35,6 +35,7 @@ nil gh starship + zellij ]; }; From 25a7ebe6101cd6f16f9902bc3449c6418048c5a1 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 6 Feb 2026 20:40:23 +0100 Subject: [PATCH 193/204] smol updates --- home-manager/hosts/GLaDOS/lillian.nix | 1 - nixos/hosts/EDI/configuration.nix | 2 ++ nixos/hosts/GLaDOS/configuration.nix | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index a978fd4..691837e 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -20,7 +20,6 @@ ryubing lutris vscodium - intiface-central unrar ]; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index fbe3c05..ab62e21 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -91,6 +91,8 @@ # for now. loader.systemd-boot.enable = lib.mkForce false; initrd.systemd.enable = true; + kernelPackages = pkgs.linuxPackages_latest; + supportedFilesystems = ["btrfs" "bcachefs"]; binfmt.emulatedSystems = ["aarch64-linux"]; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index e8c31c5..ba002ed 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -79,6 +79,8 @@ boot = { loader.systemd-boot.enable = false; initrd.systemd.enable = true; + kernelPackages = pkgs.linuxPackages_latest; + supportedFilesystems = ["btrfs" "bcachefs"]; binfmt.emulatedSystems = ["aarch64-linux"]; From e86ec419c2115ab1f12f0904cf126d6a2c52185b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Fri, 6 Feb 2026 20:43:29 +0100 Subject: [PATCH 194/204] update flake lock --- flake.lock | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 797491f..cecb968 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769432988, - "narHash": "sha256-q4arZjXnLiuMnLzO972lrXIGdzyGb4DGaIt69CcCYdE=", + "lastModified": 1770388745, + "narHash": "sha256-tmAONUMNHnlkozNcMR1kZJ/68OGea5wS56vl6vaUS5U=", "owner": "catppuccin", "repo": "nix", - "rev": "d7a8632c0d8d144478aac1a8c8d5083b770cbb03", + "rev": "5e9efb97caeffea3bf248023b6d8b68e63b839b9", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1769287525, - "narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=", + "lastModified": 1769737823, + "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=", "owner": "ipetkov", "repo": "crane", - "rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21", + "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1769579508, - "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", + "lastModified": 1770318660, + "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", "owner": "nix-community", "repo": "home-manager", - "rev": "eec72f127831326b042d1f35003767a4ab6a9516", + "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1769596123, - "narHash": "sha256-kcElu+HiwNIJiaNH41IdemFaaGyU3TqI4ebx5CQMHFs=", + "lastModified": 1770366813, + "narHash": "sha256-q6dmMSV2EcA6/EXy2oJXoLgxSGjrKY0bixfYbK4fi/4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d6bf85533180720680544a0791c7334e315c4fd6", + "rev": "2af374cd694b45c7d1773edda154081d0ee81f64", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1769417433, - "narHash": "sha256-0WZ7I/N9InaBHL96/qdiJxg8mqFW3vRla8Z062JmQFE=", + "lastModified": 1770064250, + "narHash": "sha256-3HB6gfnKZnwDoH77lnJktJtQWEZ+D35Oi53pNF6YwO4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1902463415745b992dbaf301b2a35a1277be1584", + "rev": "9985b98c74dcc7b1c7ccfe8693daf37caa4ed2ea", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1764234087, - "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", + "lastModified": 1769813415, + "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", + "rev": "8946737ff703382fda7623b9fab071d037e897d5", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1769604778, - "narHash": "sha256-cVQGv7ghlNFS7IZl5NctoqBdzLz6w1CILF5GM+Px6z4=", + "lastModified": 1770406597, + "narHash": "sha256-LmX0PAyFXs/5WWXCFeWu+6g8uNA+Yl6Ht6b/jyfdt7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e5ba754d025adb74b9e1a62fbeba655667621b7", + "rev": "8ea8ad0ad112e0aaa2a3bc583558a689a3345393", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1770019141, + "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769268028, - "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", + "lastModified": 1769740369, + "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", + "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1767662275, - "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=", + "lastModified": 1769956244, + "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e", + "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1769069492, - "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", + "lastModified": 1769939035, + "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", + "rev": "a8ca480175326551d6c4121498316261cbb5b260", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1769309768, - "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=", + "lastModified": 1770001842, + "narHash": "sha256-ZAyTeILfdWwDp1nuF0RK3McBduMi49qnJvrS+3Ezpac=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5", + "rev": "5018343419ea808f8a413241381976b7e60951f2", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1769469829, - "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", + "lastModified": 1770145881, + "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", + "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769471853, - "narHash": "sha256-aqs0HkV2T/7Syf/pYLRVSwfk23PPAyGJmWT43U5ZSF4=", + "lastModified": 1770382623, + "narHash": "sha256-NB9j2JsIcSPcY7FzzoIqJA04p4xSdJpgyLAwzzzncpc=", "owner": "nix-community", "repo": "stylix", - "rev": "805fa4262a21ada28cc918fa014359b9b35caea7", + "rev": "05c798e0074296df9bfc6ef3df0e936b878b835a", "type": "github" }, "original": { From 022ec828a8c0f06e0ddc43f8ac1f204ac3b974c6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 15 Feb 2026 17:06:15 +0100 Subject: [PATCH 195/204] fix all the issues with persistence, and change GLaDOS to btrfs as an experiment --- disko/GLaDOS/default.nix | 56 ++++++++++++------------- home-manager/hosts/GLaDOS/lillian.nix | 12 +++++- nixos/desktop/default.nix | 3 ++ nixos/hosts/GLaDOS/configuration.nix | 33 +++++++++++++-- nixos/shared/preservation.nix | 25 +++++------ pkgs/install-nix-no-inhibit/default.nix | 4 +- 6 files changed, 84 insertions(+), 49 deletions(-) diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index f998acc..6e64efe 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -30,8 +30,34 @@ allowDiscards = true; }; content = { - type = "lvm_pv"; - vg = "nvme_pool"; + type = "btrfs"; + extraArgs = ["-f"]; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = ["subvol=root" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120"]; + }; + "/home" = { + mountpoint = "/home"; + mountOptions = ["subvol=home" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120" "autodefrag"]; + }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = ["subvol=nix" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120" "nodatacow" "nodatasum"]; + }; + "/persist" = { + mountpoint = "/persistent"; + mountOptions = ["subvol=persistent" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120"]; + }; + "/log" = { + mountpoint = "/var/log"; + mountOptions = ["subvol=log" "compress=zstd:1" "noatime" "ssd" "discard=async" "space_cache=v2" "commit=120" "nodatacow" "nodatasum"]; + }; + "/swap" = { + mountpoint = "/swap"; + swap.swapfile.size = "8G"; + }; + }; }; }; }; @@ -39,32 +65,6 @@ }; }; }; - lvm_vg = { - nvme_pool = { - type = "lvm_vg"; - lvs = { - nvme_swap = { - size = "32G"; - content = { - type = "swap"; - discardPolicy = "both"; - resumeDevice = true; # resume from hiberation from this device - }; - }; - nvme_root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - }; - }; - }; nodev = { "/home/lillian/Downloads" = { fsType = "tmpfs"; diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 691837e..7e1c8a9 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -1,6 +1,10 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -22,6 +26,12 @@ vscodium unrar ]; + home.file = { + nextcloud = { + source = config.lib.file.mkOutOfStoreSymlink "/run/media/lillian/big-SSD/Nextcloud/"; + target = "Nextcloud"; + }; + }; programs.mangohud = { enable = true; diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index bbb9dc8..9829611 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -33,6 +33,8 @@ KERNEL=="hidraw*", KERNELS=="*057e:*", MODE="0660", TAG+="uaccess" KERNEL=="hidraw*", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" KERNEL=="hidraw*", KERNELS=="*2DC8:*", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", ATTRS{idProduct}=="6012", ATTRS{idVendor}=="2dc8", MODE="0660", TAG+="uaccess" + KERNEL=="hidraw*", KERNELS=="*2DC8:6012*", MODE="0660", TAG+="uaccess" ''; environment.systemPackages = with pkgs; @@ -60,6 +62,7 @@ pciutils podman podman-compose + python3Minimal sbctl tpm2-tools tpm2-tss diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index ba002ed..3ae30f8 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -75,8 +75,36 @@ # }; # }; }; - boot = { + # Nuke root AND home subvolumes on every boot + initrd.systemd.services.wipe-my-fs = { + requires = ["dev-mapper-nvme_crypted.device"]; + after = ["dev-mapper-nvme_crypted.device"]; + wantedBy = ["initrd.target"]; + script = '' + mkdir -p /btrfs_tmp + mount /dev/mapper/cryptroot /btrfs_tmp + + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + delete_subvolume_recursively "/btrfs_tmp/$i" + done + btrfs subvolume delete "$1" + } + + # Nuke and recreate root + delete_subvolume_recursively /btrfs_tmp/root + btrfs subvolume create /btrfs_tmp/root + + # Nuke and recreate home (wipes /home — but we restore via impermanence) + delete_subvolume_recursively /btrfs_tmp/home + btrfs subvolume create /btrfs_tmp/home + + umount /btrfs_tmp + ''; + }; + loader.systemd-boot.enable = false; initrd.systemd.enable = true; kernelPackages = pkgs.linuxPackages_latest; @@ -89,9 +117,6 @@ pkiBundle = "/var/lib/sbctl"; }; extraModprobeConfig = '' - #fix for https://gitlab.freedesktop.org/drm/amd/-/issues/4141 - amdgpu.runpm=0 - amdgpu.dcdebugmask=0x10 ''; }; diff --git a/nixos/shared/preservation.nix b/nixos/shared/preservation.nix index 36bcb48..c3acb6c 100644 --- a/nixos/shared/preservation.nix +++ b/nixos/shared/preservation.nix @@ -62,6 +62,7 @@ { file = "/etc/machine-id"; inInitrd = true; + how = "symlink"; } { file = "/etc/ssh/ssh_host_rsa_key"; @@ -155,20 +156,16 @@ }; }; }; - - # Create some directories with custom permissions. - # - # In this configuration the path `/home/butz/.local` is not an immediate parent - # of any persisted file, so it would be created with the systemd-tmpfiles default - # ownership `root:root` and mode `0755`. This would mean that the user `butz` - # could not create other files or directories inside `/home/butz/.local`. - # - # Therefore systemd-tmpfiles is used to prepare such directories with - # appropriate permissions. - # - # Note that immediate parent directories of persisted files can also be - # configured with ownership and permissions from the `parent` settings if - # `configureParent = true` is set for the file. + systemd.services.systemd-machine-id-commit = { + unitConfig.ConditionPathIsMountPoint = [ + "" + "/persistent/etc/machine-id" + ]; + serviceConfig.ExecStart = [ + "" + "systemd-machine-id-setup --commit --root /persistent" + ]; + }; systemd.tmpfiles.settings.preservation = { "/home/lillian/.config".d = { user = "lillian"; diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index a1dff9e..cee56c6 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -37,8 +37,8 @@ writeShellApplication --mode zap_create_mount \ "./disko/''${dir}/default.nix" echo "NixOS Installing..." - sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json - sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json + sudo nixos-install --flake .#"''${dir}" --show-trace -v |& nom + sudo nixos-install --flake .#"''${dir}" --show-trace -v |& nom popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." rm -rf ./install-nix From 45f1b7c7ed57ffc765cbd28668322bdc6a627eb2 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 15 Feb 2026 17:10:39 +0100 Subject: [PATCH 196/204] update flake lock and disable personal servo package --- flake.lock | 134 +++++++++++++++++++++++------------------------ pkgs/default.nix | 2 +- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index cecb968..772403f 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770388745, - "narHash": "sha256-tmAONUMNHnlkozNcMR1kZJ/68OGea5wS56vl6vaUS5U=", + "lastModified": 1770551880, + "narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=", "owner": "catppuccin", "repo": "nix", - "rev": "5e9efb97caeffea3bf248023b6d8b68e63b839b9", + "rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1769737823, - "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=", + "lastModified": 1770419512, + "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", "owner": "ipetkov", "repo": "crane", - "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba", + "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", "type": "github" }, "original": { @@ -187,15 +187,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1769939035, + "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "a8ca480175326551d6c4121498316261cbb5b260", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1770318660, - "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", + "lastModified": 1771132481, + "narHash": "sha256-Tc+YqZ/Q1K35vJK4ji4RbLB/qKGcEq6yh7p4CKoZF60=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", + "rev": "1e53254671f36cb7d0e2dcca08730f066d5e69b4", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770366813, - "narHash": "sha256-q6dmMSV2EcA6/EXy2oJXoLgxSGjrKY0bixfYbK4fi/4=", + "lastModified": 1770915266, + "narHash": "sha256-2oD6ud7iathz3rb0TcZyMqAsG+u2KRpkcAY3CCBt5rs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2af374cd694b45c7d1773edda154081d0ee81f64", + "rev": "deee66bd287521aa4008f0bb616060f37c058980", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770064250, - "narHash": "sha256-3HB6gfnKZnwDoH77lnJktJtQWEZ+D35Oi53pNF6YwO4=", + "lastModified": 1770734117, + "narHash": "sha256-PNXSnK507MRj+hYMgnUR7InNJzVCmOfsjHV4YXZgpwQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "9985b98c74dcc7b1c7ccfe8693daf37caa4ed2ea", + "rev": "2038a9a19adb886eccba775321b055fdbdc5029d", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1770315571, - "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", + "lastModified": 1771130777, + "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", + "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1771170586, + "narHash": "sha256-rGILJNlD8aDt8tIPRURnlbPjZ2kA0wA8I6v6g4bRB7E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "f9b0314599f0fa628c7d05433f15a42a2eef836a", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1770406597, - "narHash": "sha256-LmX0PAyFXs/5WWXCFeWu+6g8uNA+Yl6Ht6b/jyfdt7w=", + "lastModified": 1771171048, + "narHash": "sha256-mfvEZzZPoh5g7wguxUVIwdg5HjDL3okIRAeduw8tA4U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ea8ad0ad112e0aaa2a3bc583558a689a3345393", + "rev": "605407a873a521ff6b0e39cdabda60b07307a56c", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770019141, - "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1764374374, - "narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=", + "lastModified": 1770650459, + "narHash": "sha256-hGeOnueXorzwDD1V9ldZr+y+zad4SNyqMnQsa/mIlvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a49303095abc094ee77dc243a9e351b642e8e75", + "rev": "fff0554c67696d76a0cdd9cfe14403fbdbf1f378", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769740369, - "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1769956244, + "lastModified": 1770766818, "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", "owner": "pjones", "repo": "plasma-manager", - "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831", + "rev": "44b928068359b7d2310a34de39555c63c93a2c90", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1770001842, - "narHash": "sha256-ZAyTeILfdWwDp1nuF0RK3McBduMi49qnJvrS+3Ezpac=", + "lastModified": 1770520253, + "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5018343419ea808f8a413241381976b7e60951f2", + "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f", "type": "github" }, "original": { @@ -855,11 +855,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1766321686, - "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=", + "lastModified": 1770659507, + "narHash": "sha256-RVZno9CypFN3eHxfULKN1K7mb/Cq0HkznnWqnshxpWY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3", + "rev": "781e833633ebc0873d251772a74e4400a73f5d78", "type": "gitlab" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1770145881, - "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", + "lastModified": 1771166946, + "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", + "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770382623, - "narHash": "sha256-NB9j2JsIcSPcY7FzzoIqJA04p4xSdJpgyLAwzzzncpc=", + "lastModified": 1770914701, + "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", "owner": "nix-community", "repo": "stylix", - "rev": "05c798e0074296df9bfc6ef3df0e936b878b835a", + "rev": "db03fed72e5ca02be34e1d24789345a943329738", "type": "github" }, "original": { @@ -1053,11 +1053,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1766016463, - "narHash": "sha256-aWp608krMtk5I+c3GXyuHkb6ugah40cBI0R52fNqMiI=", + "lastModified": 1771148613, + "narHash": "sha256-nLzdw8jskekSRrunxBDCA0NCHr/2aJjcXqZ1Fcqm5eY=", "owner": "dj95", "repo": "zjstatus", - "rev": "9a4b88fdceee8eb2b8c28111c53e94254d61c994", + "rev": "7a039f56da80681408454d6e175fde3f54b9e592", "type": "github" }, "original": { diff --git a/pkgs/default.nix b/pkgs/default.nix index c979e58..66e28aa 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,7 +3,7 @@ pkgs: { dvd = pkgs.callPackage ./dvd {}; dvt = pkgs.callPackage ./dvt {}; - servo = pkgs.callPackage ./servo {}; + # servo = pkgs.callPackage ./servo {}; rebuild-no-inhibit = pkgs.callPackage ./rebuild-no-inhibit {}; rebuild = pkgs.callPackage ./rebuild {}; install-nix-no-inhibit = pkgs.callPackage ./install-nix-no-inhibit {}; From 782ef1437ba139623b5f1c7d0271d453ff748557 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 15 Feb 2026 17:13:08 +0100 Subject: [PATCH 197/204] replace winewow with winewow64 --- nixos/desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index 9829611..ff11589 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -48,7 +48,7 @@ # System tools aha ttf-ms-win10 - wineWowPackages.stable + wineWow64Packages.stable bottles tpm2-abrmd jdk21_headless From 32385907d3088d0fa259b583c062e819c427ec13 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 16 Feb 2026 17:35:07 +0100 Subject: [PATCH 198/204] add some startup programs with links, do some other maintanance for impermanence saving --- .../plasma-desktop/default.nix | 112 ++++++++++++------ nixos/shared/preservation.nix | 1 + 2 files changed, 79 insertions(+), 34 deletions(-) diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index c9f3f9e..745fce1 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -18,42 +18,86 @@ RemainAfterExit = true; }; }; - home.file.".config/kdeconnect/config" = { - text = '' - [General] - keyAlgorithm=EC - name=${osConfig.networking.hostName} - customDevices=10.0.0.2,10.0.0.3,10.0.0.4,10.0.0.5 - ''; - target = ".config/kdeconnect/config"; - force = true; - }; - home.file."Games/.directory" = { - text = '' - [Desktop Entry] - Icon=folder-games - ''; - target = "Games/.directory"; - force = true; - }; - home.file."Code/.directory" = { - text = '' - [Desktop Entry] - Icon=folder-script - ''; - target = "Code/.directory"; - force = true; - }; - home.file."Writing/.directory" = { - text = '' - [Desktop Entry] - Icon=folder-notes - ''; - target = "Writing/.directory"; - force = true; - }; + home.file = { + ".config/kdeconnect/config" = { + text = '' + [General] + keyAlgorithm=EC + name=${osConfig.networking.hostName} + customDevices=10.0.0.2,10.0.0.3,10.0.0.4,10.0.0.5 + ''; + target = ".config/kdeconnect/config"; + force = true; + }; + "Games/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-games + ''; + target = "Games/.directory"; + force = true; + }; + "Code/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-script + ''; + target = "Code/.directory"; + force = true; + }; + "Writing/.directory" = { + text = '' + [Desktop Entry] + Icon=folder-notes + ''; + target = "Writing/.directory"; + force = true; + }; + "mimeapps.list" = { + text = '' + [Added Associations] + x-scheme-handler/http=librewolf.desktop; + x-scheme-handler/https=librewolf.desktop; + [Default Applications] + x-scheme-handler/discord=vesktop.desktop + x-scheme-handler/http=librewolf.desktop; + x-scheme-handler/https=librewolf.desktop; + x-scheme-handler/sgnl=signal.desktop + x-scheme-handler/signalcaptcha=signal.desktop + x-scheme-handler/email=thunderbird.desktop + x-scheme-handler/text=helix.desktop + ''; + target = ".config/mimeapps.list"; + force = true; + }; + "librewolf.desktop" = { + target = ".config/autostart/librewolf.desktop"; + source = "${pkgs.librewolf}/share/applications/librewolf.desktop"; + }; + "signal.desktop" = { + target = ".config/autostart/signal.desktop"; + source = "${pkgs.signal-desktop}/share/applications/signal.desktop"; + }; + "foot.desktop" = { + target = ".config/autostart/foot.desktop"; + source = "${pkgs.foot}/share/applications/foot.desktop"; + }; + "vesktop.desktop" = { + target = ".config/autostart/vesktop.desktop"; + source = "${pkgs.vesktop}/share/applications/vesktop.desktop"; + }; + "com.nextcloud.desktopclient.nextcloud.desktop" = { + target = ".config/autostart/com.nextcloud.desktopclient.nextcloud.desktop"; + source = "${pkgs.nextcloud-client}/share/applications/com.nextcloud.desktopclient.nextcloud.desktop"; + }; + }; programs.plasma = { + workspace = { + lookAndFeel = "Catppuccin-Macchiato-Mauve"; + colorScheme = "CatppuccinMacchiatoMauve"; + cursor.theme = "catppuccin-macchiato-mauve-cursors"; + }; enable = true; desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; diff --git a/nixos/shared/preservation.nix b/nixos/shared/preservation.nix index c3acb6c..56f4a87 100644 --- a/nixos/shared/preservation.nix +++ b/nixos/shared/preservation.nix @@ -136,6 +136,7 @@ ".config/Signal" ".config/sops" ".config/vesktop" + ".config/kde.org" ]; #Shared files = [ From 3b1ee8ebff7c52ee058e632d36116651b8f9bc0b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 20:46:39 +0100 Subject: [PATCH 199/204] update flake lock --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 772403f..7d8a4f7 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770551880, - "narHash": "sha256-+cS5yXWsSLiK36+PP/+dcQdxpXSclx2d65p7l6Dis+A=", + "lastModified": 1771508520, + "narHash": "sha256-srt94sUlkaGEJHQg7k6gVrBF1QZcHUY/VBESjCgZmKI=", "owner": "catppuccin", "repo": "nix", - "rev": "db4dfe3f2a80e9c33492d839accd49f75c7324c2", + "rev": "ec35c21e843e4748e60822cd5543983eb61dc87a", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "crane": { "locked": { - "lastModified": 1770419512, - "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", + "lastModified": 1771121070, + "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=", "owner": "ipetkov", "repo": "crane", - "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", + "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1771469470, + "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", "type": "github" }, "original": { @@ -389,11 +389,11 @@ ] }, "locked": { - "lastModified": 1771132481, - "narHash": "sha256-Tc+YqZ/Q1K35vJK4ji4RbLB/qKGcEq6yh7p4CKoZF60=", + "lastModified": 1771519029, + "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e53254671f36cb7d0e2dcca08730f066d5e69b4", + "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770915266, - "narHash": "sha256-2oD6ud7iathz3rb0TcZyMqAsG+u2KRpkcAY3CCBt5rs=", + "lastModified": 1771440156, + "narHash": "sha256-IrznE3ZQ+tf6amuQW/zlVkA18LzknWK+Hbt6tdmNtnw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "deee66bd287521aa4008f0bb616060f37c058980", + "rev": "faf829408344456d53c33df0a99f2f307498c830", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770734117, - "narHash": "sha256-PNXSnK507MRj+hYMgnUR7InNJzVCmOfsjHV4YXZgpwQ=", + "lastModified": 1771492583, + "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2038a9a19adb886eccba775321b055fdbdc5029d", + "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771170586, - "narHash": "sha256-rGILJNlD8aDt8tIPRURnlbPjZ2kA0wA8I6v6g4bRB7E=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f9b0314599f0fa628c7d05433f15a42a2eef836a", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1771171048, - "narHash": "sha256-mfvEZzZPoh5g7wguxUVIwdg5HjDL3okIRAeduw8tA4U=", + "lastModified": 1771529647, + "narHash": "sha256-jg/CvWdnL3ZZhx58j8g1WDXJHALqiutiwnSyP4zPLj8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "605407a873a521ff6b0e39cdabda60b07307a56c", + "rev": "64a253ac18f1496577a30251a06c3871bdcaaa99", "type": "github" }, "original": { @@ -570,11 +570,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1769939035, - "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", + "lastModified": 1770726378, + "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a8ca480175326551d6c4121498316261cbb5b260", + "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", "type": "github" }, "original": { @@ -813,11 +813,11 @@ ] }, "locked": { - "lastModified": 1770520253, - "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=", + "lastModified": 1771125043, + "narHash": "sha256-ldf/s49n6rOAxl7pYLJGGS1N/assoHkCOWdEdLyNZkc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f", + "rev": "4912f951a26dc8142b176be2c2ad834319dc06e8", "type": "github" }, "original": { @@ -874,11 +874,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1771166946, - "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", + "lastModified": 1771524872, + "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", + "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", "type": "github" }, "original": { @@ -906,11 +906,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770914701, - "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", + "lastModified": 1771428844, + "narHash": "sha256-rTzo6bZEsdT7yHUZ0B4BYe32XQZzm8SiWKvWLJnxerE=", "owner": "nix-community", "repo": "stylix", - "rev": "db03fed72e5ca02be34e1d24789345a943329738", + "rev": "801843d10e9e22d7a00f660d069e2de70aa2980a", "type": "github" }, "original": { From a15584654c4cbb453eb5c436124799268a379d1e Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 21:39:56 +0100 Subject: [PATCH 200/204] disable python310 on queen for nw --- nixos/hosts/queen/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 6984f31..47a99db 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -92,7 +92,7 @@ onlyoffice-documentserver libressl postgresql_16 - python310 + # python310 # python310Packages.nbconvert janus-gateway jupyter From b8bbe16a7b7f6691e52b9bef2e066f2c9eacfc4a Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 22:29:45 +0100 Subject: [PATCH 201/204] disable anubis for now --- nixos/hosts/queen/configuration.nix | 50 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 47a99db..4de2ab2 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -32,33 +32,33 @@ preservation.enable = lib.mkForce false; - services.anubis.instances.default.settings.TARGET = "http://localhost:8123"; + # services.anubis.instances.default.settings.TARGET = "http://localhost:8123"; - # required due to unix socket permissions - users.users.nginx.extraGroups = [config.users.groups.anubis.name]; - services.nginx.virtualHosts."*.gladtherescake.eu" = { - locations = { - "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; - }; - }; - services.nginx.virtualHosts."*.lillianviolet.dev" = { - locations = { - "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; - }; - }; + # # required due to unix socket permissions + # users.users.nginx.extraGroups = [config.users.groups.anubis.name]; + # services.nginx.virtualHosts."*.gladtherescake.eu" = { + # locations = { + # "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; + # }; + # }; + # services.nginx.virtualHosts."*.lillianviolet.dev" = { + # locations = { + # "/".proxyPass = "http://unix:${config.services.anubis.instances.default.settings.BIND}"; + # }; + # }; - zramSwap.enable = false; - services = { - openssh = { - enable = true; - settings = { - # require public key authentication for better security - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - PermitRootLogin = "no"; - }; - }; - }; + # zramSwap.enable = false; + # services = { + # openssh = { + # enable = true; + # settings = { + # # require public key authentication for better security + # PasswordAuthentication = false; + # KbdInteractiveAuthentication = false; + # PermitRootLogin = "no"; + # }; + # }; + # }; nixpkgs = { # You can add overlays here From 1c9764f8fdaa159fc74f83440da2e9301546b627 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 22:37:12 +0100 Subject: [PATCH 202/204] Enable SSH lmao, don't break that --- nixos/hosts/queen/configuration.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 4de2ab2..da17a6c 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -47,18 +47,18 @@ # }; # }; - # zramSwap.enable = false; - # services = { - # openssh = { - # enable = true; - # settings = { - # # require public key authentication for better security - # PasswordAuthentication = false; - # KbdInteractiveAuthentication = false; - # PermitRootLogin = "no"; - # }; - # }; - # }; + zramSwap.enable = false; + services = { + openssh = { + enable = true; + settings = { + # require public key authentication for better security + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + PermitRootLogin = "no"; + }; + }; + }; nixpkgs = { # You can add overlays here From 2601555ac7237a0d2294abe46197fa8fd63528ad Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 22:45:58 +0100 Subject: [PATCH 203/204] fix continuwuity settings from conduit > new name --- nixos/server/package-configs/conduit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 17424c4..09268ee 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -28,7 +28,7 @@ } ''; in { - # Configure Conduit itself + # Configure continuwuity itself services.matrix-continuwuity = { enable = true; @@ -91,7 +91,7 @@ in { ]; locations."/_matrix/" = { - proxyPass = "http://backend_conduit"; + proxyPass = "http://backend_continuwuity"; proxyWebsockets = true; extraConfig = '' proxy_set_header Host $host; @@ -139,9 +139,9 @@ in { }; upstreams = { - "backend_conduit" = { + "backend_continuwuity" = { servers = { - "[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {}; + "[::1]:${toString config.services.matrix-continuwuity.settings.global.port}" = {}; }; }; }; From c6d25885c15d49f476cdddbfc654c06ff3d222eb Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 19 Feb 2026 23:18:58 +0100 Subject: [PATCH 204/204] add qrca for qr code scanning wifi networks on plasma --- nixos/desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index ff11589..8284ad6 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -98,6 +98,7 @@ kdePackages.krdc kdePackages.krfb kdePackages.kate + kdePackages.qrca libportal-qt5 libportal