From 2a2367e83513bcfe24db458f4a1c8fe287a51d34 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sat, 29 Mar 2025 02:06:36 +0100 Subject: [PATCH 01/46] 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 02/46] 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 03/46] 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 04/46] 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 05/46] 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 06/46] 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 07/46] 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 08/46] 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 09/46] 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 10/46] 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 11/46] 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 12/46] 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 13/46] 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 14/46] 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 15/46] 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 16/46] 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 17/46] 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 18/46] 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 19/46] 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 20/46] 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 21/46] 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 22/46] 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 23/46] 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 24/46] 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 25/46] 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 26/46] 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 27/46] 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 28/46] 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 29/46] 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 30/46] 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 31/46] 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 32/46] 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 33/46] 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 34/46] 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 35/46] 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 36/46] 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 37/46] 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 38/46] 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 39/46] 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 40/46] 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 41/46] 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 42/46] 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 43/46] 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 44/46] 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 45/46] 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 46/46] 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