From 2a2367e83513bcfe24db458f4a1c8fe287a51d34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 29 Mar 2025 02:06:36 +0100 Subject: [PATCH 001/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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/115] 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