From d5891684a970a8f6d9e0f1d526c8306f5b00d06b Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 12:47:55 +1000 Subject: [PATCH 1/8] clean flatpak modules --- flake.nix | 2 +- groups/all/default.nix | 4 ++++ groups/all/modules/flatpak.nix | 12 ++++++++++++ groups/cryde/default.nix | 3 --- hosts/myputer/modules/gamergrl/default.nix | 11 +++++++++++ 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 groups/all/modules/flatpak.nix create mode 100644 hosts/myputer/modules/gamergrl/default.nix diff --git a/flake.nix b/flake.nix index 100114b..168993f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ }; }; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; grub2-themes = { url = "github:vinceliuice/grub2-themes"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/groups/all/default.nix b/groups/all/default.nix index b367245..090cc7b 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -7,6 +7,10 @@ lib, ... }: { + imports = [ + ./modules/flatpak.nix + ]; + # NOTE: mkDefault is 1000 and mkForce is 50 # NOTE: so this is like a second mkDefault security.sudo.wheelNeedsPassword = lib.mkOverride 900 true; diff --git a/groups/all/modules/flatpak.nix b/groups/all/modules/flatpak.nix new file mode 100644 index 0000000..20cf828 --- /dev/null +++ b/groups/all/modules/flatpak.nix @@ -0,0 +1,12 @@ +{...}: { + services.flatpak = { + remotes = [ + { + location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; + name = "flathub"; + } + ]; + + uninstallUnmanaged = true; + }; +} diff --git a/groups/cryde/default.nix b/groups/cryde/default.nix index 3a75daa..359642e 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, config, ... @@ -11,8 +10,6 @@ ../../hosts/modules/wm/hyprland.nix ../../hosts/modules/steam.nix ../../hosts/modules/obsidian.nix - - # inputs.nix-flatpak.nixosModules.nix-flatpak ]; boot.loader.grub2-theme = { diff --git a/hosts/myputer/modules/gamergrl/default.nix b/hosts/myputer/modules/gamergrl/default.nix new file mode 100644 index 0000000..f295398 --- /dev/null +++ b/hosts/myputer/modules/gamergrl/default.nix @@ -0,0 +1,11 @@ +{...}: { + services.flatpak = { + packages = [ + { + # Linux Runtime for Roblox + appId = "org.vinegarhq.Sober"; + origin = "flathub"; + } + ]; + }; +} From 7bd393c7631242d7b84edc6d3d92cc632ed92b19 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 12:48:04 +1000 Subject: [PATCH 2/8] snow + flake :3 --- flake.lock | 10 +++--- flake.nix | 74 ++---------------------------------------- groups/all/default.nix | 5 ++- snow.nix | 66 +++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 80 deletions(-) create mode 100644 snow.nix diff --git a/flake.lock b/flake.lock index e0c1171..912db39 100644 --- a/flake.lock +++ b/flake.lock @@ -17,8 +17,8 @@ ] }, "locked": { - "lastModified": 1770869519, - "narHash": "sha256-3NyegyJeuQQSFuQMZKNCJhTw2qhJUjUL6ep432EOgJY=", + "lastModified": 1770938216, + "narHash": "sha256-BSsm9Lsqk0Rv5bk0jknms1+RPnfDiHk8m2IZ4BeoDIw=", "path": "/home/me/agribit/nexus/Cerulean", "type": "path" }, @@ -195,7 +195,7 @@ }, "original": { "owner": "gmodena", - "ref": "v0.7.0", + "ref": "latest", "repo": "nix-flatpak", "type": "github" } @@ -354,8 +354,8 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770855466, - "narHash": "sha256-hZyD4m2Iix0FKWiRtzNFhbgdaULq52oysD68LmtT5H4=", + "lastModified": 1770920652, + "narHash": "sha256-GkHYl2+lQ4go7jSHheIfjRdRVVvjl3LysdVNxWXcoec=", "path": "/home/me/agribit/nexus/nt", "type": "path" }, diff --git a/flake.nix b/flake.nix index 168993f..c833943 100644 --- a/flake.nix +++ b/flake.nix @@ -51,76 +51,6 @@ extra-experimental-features = "pipe-operators"; }; - outputs = { - cerulean, - home-manager, - grub2-themes, - dobutterfliescry-net, - ... - }: - cerulean.mkNexus ./. (self: { - nexus = { - overlays = - import ./overlays - ++ [ - dobutterfliescry-net.overlays.default - ]; - - groups = { - cryos = { - # oh frick i cried again - cryde = {}; - }; - server = {}; - }; - - nodes = let - inherit - (self.nexus) - groups - ; - in { - # my laptop <3 :3 - lolcathost = { - system = "x86_64-linux"; - groups = [groups.cryos.cryde]; - extraModules = [ - home-manager.nixosModules.default - grub2-themes.nixosModules.default - ]; - }; - - # i be on my puter frfr - myputer = { - system = "x86_64-linux"; - groups = [groups.cryos.cryde]; - extraModules = [ - home-manager.nixosModules.default - grub2-themes.nixosModules.default - ]; - }; - - # courtesy of aurora <3 - butterfly = { - system = "x86_64-linux"; - groups = [groups.server]; - deploy.ssh.host = "dobutterfliescry.net"; - }; - - # pls dont sue me im broke - hyrule = { - system = "x86_64-linux"; - groups = [groups.server]; - deploy.ssh.host = "hyrule.dobutterfliescry.net"; - }; - - # call me a statistician the way she spreads in my sheets - # matcha = { - # system = "x86_64-linux"; - # groups = [groups.server]; - # deploy.ssh.host = "bedroom.dobutterfliescry.net"; - # }; - }; - }; - }); + outputs = inputs: + import ./snow.nix inputs; } diff --git a/groups/all/default.nix b/groups/all/default.nix index 090cc7b..70b682d 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -1,13 +1,12 @@ { - root, inputs, - config, pkgs, - upkgs, lib, ... }: { imports = [ + inputs.dobutterfliescry-net.overlays.default + ./modules/flatpak.nix ]; diff --git a/snow.nix b/snow.nix new file mode 100644 index 0000000..5fe3054 --- /dev/null +++ b/snow.nix @@ -0,0 +1,66 @@ +{cerulean, ...} @ inputs: +cerulean.mkNexus ./. (self: { + nexus = { + specialArgs = {inherit inputs;}; + + groups = { + # wait.. that's too cold... + cryos = { + # oh frick i cried again + cryde = {}; + }; + # + server = {}; + }; + + nodes = let + inherit + (self.nexus) + groups + ; + in { + # my laptop <3 :3 + lolcathost = { + system = "x86_64-linux"; + groups = [groups.cryos.cryde]; + extraModules = with inputs; [ + home-manager.nixosModules.default + grub2-themes.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + ]; + }; + + # i be on my puter frfr + myputer = { + system = "x86_64-linux"; + groups = [groups.cryos.cryde]; + extraModules = with inputs; [ + home-manager.nixosModules.default + grub2-themes.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + ]; + }; + + # courtesy of aurora <3 + butterfly = { + system = "x86_64-linux"; + groups = [groups.server]; + deploy.ssh.host = "dobutterfliescry.net"; + }; + + # pls dont sue me im broke + hyrule = { + system = "x86_64-linux"; + groups = [groups.server]; + deploy.ssh.host = "hyrule.dobutterfliescry.net"; + }; + + # call me a statistician the way she spreads in my sheets + # matcha = { + # system = "x86_64-linux"; + # groups = [groups.server]; + # deploy.ssh.host = "bedroom.dobutterfliescry.net"; + # }; + }; + }; +}) From 737ba60df8d74f833ae5ad56dc7bc49607e7279f Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 12:48:30 +1000 Subject: [PATCH 3/8] add element-desktop --- groups/cryde/programs.nix | 1 + overlays/default.nix | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/groups/cryde/programs.nix b/groups/cryde/programs.nix index 8d8ba86..a07eaa7 100644 --- a/groups/cryde/programs.nix +++ b/groups/cryde/programs.nix @@ -20,6 +20,7 @@ signal-desktop kdePackages.gwenview # image viewer video-trimmer + element-desktop # Games prismlauncher # minecraft diff --git a/overlays/default.nix b/overlays/default.nix index 4865280..5c6507a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -17,5 +17,13 @@ sddm-theme-corners = import ../packages/sddm-theme-corners { pkgs = super; }; + + element-desktop = super.element-desktop.overrideAttrs (final: prev: { + desktopItems = [ + ((builtins.elemAt prev.desktopItems 0).override { + exec = "element-desktop %u --password-store=\"gnome-libsecret\""; + }) + ]; + }); }) ] From 4329feb5f4b6cf6e2b00d6aba6fbbbbe43ab75fb Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 12:49:52 +1000 Subject: [PATCH 4/8] use lib.mkDefault --- groups/all/default.nix | 4 ++-- groups/server/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/groups/all/default.nix b/groups/all/default.nix index 70b682d..3f851c9 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -12,7 +12,7 @@ # NOTE: mkDefault is 1000 and mkForce is 50 # NOTE: so this is like a second mkDefault - security.sudo.wheelNeedsPassword = lib.mkOverride 900 true; + security.sudo.wheelNeedsPassword = lib.mkDefault true; networking = { networkmanager.enable = true; @@ -42,7 +42,7 @@ time.timeZone = lib.mkDefault "Australia/Brisbane"; - i18n.defaultLocale = "en_US.UTF-8"; + i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; console = { font = "Lat2-Terminus16"; keyMap = "us"; diff --git a/groups/server/default.nix b/groups/server/default.nix index 5c447fc..6182ef1 100644 --- a/groups/server/default.nix +++ b/groups/server/default.nix @@ -44,7 +44,7 @@ isNormalUser = true; home = "/home/cry"; extraGroups = ["wheel"]; - openssh.authorizedKeys.keys = lib.mkOverride 900 [ + openssh.authorizedKeys.keys = lib.mkDefault [ (throw '' Hosts in the `server` group must set `users.users.cry.openssh.authorizedKeys.keys = [ ... ]`. '') From dd2e30801df7e7d68b6b3ded51aa71dc6461eb0a Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 12:50:01 +1000 Subject: [PATCH 5/8] cerulean now supports home-manager --- groups/all/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/groups/all/default.nix b/groups/all/default.nix index 3f851c9..2c84bee 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -50,16 +50,6 @@ users.defaultUserShell = pkgs.bash; - home-manager = { - users = - config.users.users - |> builtins.attrNames - |> builtins.filter (x: builtins.pathExists (root + "/homes/${x}")) - |> (x: lib.genAttrs x (y: import (root + "/homes/${y}"))); - - extraSpecialArgs = {inherit inputs pkgs upkgs;}; - }; - environment.systemPackages = with pkgs; [ git vim From a29292169dca9f6234cdebea35ca6c82e8f40463 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 12:50:22 +1000 Subject: [PATCH 6/8] disable man cache generation --- groups/cryos/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/groups/cryos/default.nix b/groups/cryos/default.nix index 795ed8b..82699d6 100644 --- a/groups/cryos/default.nix +++ b/groups/cryos/default.nix @@ -125,7 +125,10 @@ documentation = { enable = true; doc.enable = true; # install /share/doc packages - man.enable = true; # install manpages + man = { + enable = true; # install manpages + generateCaches = false; + }; info.enable = true; # install GNU info dev.enable = true; # install docs intended for developers nixos = { From e991a0611cd1260e9340d3f304eeecc2abeecbd6 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 13:10:39 +1000 Subject: [PATCH 7/8] update git config --- homes/modules/git.nix | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/homes/modules/git.nix b/homes/modules/git.nix index 6751849..f035281 100755 --- a/homes/modules/git.nix +++ b/homes/modules/git.nix @@ -7,8 +7,14 @@ enable = true; lfs.enable = true; - userName = "Emile Clark-Boman"; - userEmail = "eclarkboman@gmail.com"; + userName = "_cry64"; + userEmail = "them@dobutterfliescry.net"; + + signing = { + key = "F68745A836CA0412"; + format = "openpgp"; + signByDefault = true; + }; aliases = { s = "status"; @@ -21,7 +27,7 @@ extraConfig = { color.ui = true; core.editor = "hx"; - github.user = "emileclarkb"; + github.user = "cry128"; init = { defaultBranch = "main"; @@ -39,22 +45,16 @@ "gitlab:" ]; }; - "git@github.com:/Agribit/" = { + "git@codeberg.org:" = { insteadOf = [ - "agri:" - "Agri:" - "agribit:" - "Agribit:" + "cb:" + "codeberg:" ]; }; - "ssh://forgejo@forge.imbored.dev:2222/" = { + "forgejo@forge.dobutterfliescry.net:2222/" = { insteadOf = [ - "forge" - ]; - }; - "ssh://forgejo@forge.imbored.dev:2222/emileclarkb/" = { - insteadOf = [ - "cry" + "cry:" + "forge:" ]; }; }; @@ -65,6 +65,10 @@ path = "/home/me/agribit/.gitconfig"; condition = "gitdir:/home/me/agribit/**"; } + # { + # path = "/home/me/luminary/.gitconfig"; + # condition = "gitdir:/home/me/luminary/**"; + # } ]; }; } From 1e78d45ba88ed9c7c1f4885a6ca26c580bf1d0c4 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 13 Feb 2026 13:10:51 +1000 Subject: [PATCH 8/8] progress flake to latest upstreams --- flake.lock | 30 ++++++++++++++++++------------ flake.nix | 8 ++++---- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 912db39..f2657e6 100644 --- a/flake.lock +++ b/flake.lock @@ -17,14 +17,17 @@ ] }, "locked": { - "lastModified": 1770938216, - "narHash": "sha256-BSsm9Lsqk0Rv5bk0jknms1+RPnfDiHk8m2IZ4BeoDIw=", - "path": "/home/me/agribit/nexus/Cerulean", - "type": "path" + "lastModified": 1770950478, + "narHash": "sha256-y83gbdVEQheIYUvD8rzQcidLN0tcGCGq5b2TWQRjr4c=", + "owner": "cry128", + "repo": "Cerulean", + "rev": "5397bf5efcb1a047612a6e919bc2aad87ba9bb40", + "type": "github" }, "original": { - "path": "/home/me/agribit/nexus/Cerulean", - "type": "path" + "owner": "cry128", + "repo": "Cerulean", + "type": "github" } }, "deploy-rs": { @@ -354,14 +357,17 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770920652, - "narHash": "sha256-GkHYl2+lQ4go7jSHheIfjRdRVVvjl3LysdVNxWXcoec=", - "path": "/home/me/agribit/nexus/nt", - "type": "path" + "lastModified": 1770950436, + "narHash": "sha256-+h5jrsIJBea5P+rAk4OqUpScqnHYQTvCRUhgGv/MX34=", + "owner": "cry128", + "repo": "nt", + "rev": "8725f5079f8f27b3faafeff90e5fc075d55e7d0a", + "type": "github" }, "original": { - "path": "/home/me/agribit/nexus/nt", - "type": "path" + "owner": "cry128", + "repo": "nt", + "type": "github" } }, "root": { diff --git a/flake.nix b/flake.nix index c833943..238f561 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # nt.url = "github:emilelcb/nt"; - nt.url = "/home/me/agribit/nexus/nt"; + nt.url = "github:cry128/nt"; + # nt.url = "/home/me/cry/mk/nt"; cerulean = { - # url = "github:emilelcb/Cerulean"; - url = "/home/me/agribit/nexus/Cerulean"; + url = "github:cry128/Cerulean"; + # url = "/home/me/cry/mk/Cerulean"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs";