progress flake to latest upstreams

flake.lock

@@ -17,14 +17,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1770869519,
+        "lastModified": 1770950478,
-        "narHash": "sha256-3NyegyJeuQQSFuQMZKNCJhTw2qhJUjUL6ep432EOgJY=",
+        "narHash": "sha256-y83gbdVEQheIYUvD8rzQcidLN0tcGCGq5b2TWQRjr4c=",
-        "path": "/home/me/agribit/nexus/Cerulean",
+        "owner": "cry128",
-        "type": "path"
+        "repo": "Cerulean",
+        "rev": "5397bf5efcb1a047612a6e919bc2aad87ba9bb40",
+        "type": "github"
       },
       "original": {
-        "path": "/home/me/agribit/nexus/Cerulean",
+        "owner": "cry128",
-        "type": "path"
+        "repo": "Cerulean",
+        "type": "github"
       }
     },
     "deploy-rs": {
@@ -195,7 +198,7 @@
       },
       "original": {
         "owner": "gmodena",
-        "ref": "v0.7.0",
+        "ref": "latest",
         "repo": "nix-flatpak",
         "type": "github"
       }
@@ -354,14 +357,17 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1770855466,
+        "lastModified": 1770950436,
-        "narHash": "sha256-hZyD4m2Iix0FKWiRtzNFhbgdaULq52oysD68LmtT5H4=",
+        "narHash": "sha256-+h5jrsIJBea5P+rAk4OqUpScqnHYQTvCRUhgGv/MX34=",
-        "path": "/home/me/agribit/nexus/nt",
+        "owner": "cry128",
-        "type": "path"
+        "repo": "nt",
+        "rev": "8725f5079f8f27b3faafeff90e5fc075d55e7d0a",
+        "type": "github"
       },
       "original": {
-        "path": "/home/me/agribit/nexus/nt",
+        "owner": "cry128",
-        "type": "path"
+        "repo": "nt",
+        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -12,12 +12,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # nt.url = "github:emilelcb/nt";
+    nt.url = "github:cry128/nt";
-    nt.url = "/home/me/agribit/nexus/nt";
+    # nt.url = "/home/me/cry/mk/nt";
 
     cerulean = {
-      # url = "github:emilelcb/Cerulean";
+      url = "github:cry128/Cerulean";
-      url = "/home/me/agribit/nexus/Cerulean";
+      # url = "/home/me/cry/mk/Cerulean";
       inputs = {
         systems.follows = "systems";
         nixpkgs.follows = "nixpkgs";
@@ -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";
@@ -51,76 +51,6 @@
     extra-experimental-features = "pipe-operators";
   };
 
-  outputs = {
+  outputs = inputs:
-    cerulean,
+    import ./snow.nix inputs;
-    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";
-          # };
-        };
-      };
-    });
 }

groups/all/default.nix

@@ -1,15 +1,18 @@
 {
-  root,
   inputs,
-  config,
   pkgs,
-  upkgs,
   lib,
   ...
 }: {
+  imports = [
+    inputs.dobutterfliescry-net.overlays.default
+
+    ./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;
+  security.sudo.wheelNeedsPassword = lib.mkDefault true;
 
   networking = {
     networkmanager.enable = true;
@@ -39,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";
@@ -47,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

groups/all/modules/flatpak.nix

@@ -0,0 +1,12 @@
+{...}: {
+  services.flatpak = {
+    remotes = [
+      {
+        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+        name = "flathub";
+      }
+    ];
+
+    uninstallUnmanaged = true;
+  };
+}

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 = {

groups/cryde/programs.nix

@@ -20,6 +20,7 @@
     signal-desktop
     kdePackages.gwenview # image viewer
     video-trimmer
+    element-desktop
 
     # Games
     prismlauncher # minecraft

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 = {

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 = [ ... ]`.
           '')

homes/modules/git.nix

@@ -7,8 +7,14 @@
     enable = true;
     lfs.enable = true;
 
-    userName = "Emile Clark-Boman";
+    userName = "_cry64";
-    userEmail = "eclarkboman@gmail.com";
+    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:"
+            "cb:"
-            "Agri:"
+            "codeberg:"
-            "agribit:"
-            "Agribit:"
           ];
         };
-        "ssh://forgejo@forge.imbored.dev:2222/" = {
+        "forgejo@forge.dobutterfliescry.net:2222/" = {
           insteadOf = [
-            "forge"
+            "cry:"
-          ];
+            "forge:"
-        };
-        "ssh://forgejo@forge.imbored.dev:2222/emileclarkb/" = {
-          insteadOf = [
-            "cry"
           ];
         };
       };
@@ -65,6 +65,10 @@
         path = "/home/me/agribit/.gitconfig";
         condition = "gitdir:/home/me/agribit/**";
       }
+      # {
+      #   path = "/home/me/luminary/.gitconfig";
+      #   condition = "gitdir:/home/me/luminary/**";
+      # }
     ];
   };
 }

hosts/myputer/modules/gamergrl/default.nix

@@ -0,0 +1,11 @@
+{...}: {
+  services.flatpak = {
+    packages = [
+      {
+        # Linux Runtime for Roblox
+        appId = "org.vinegarhq.Sober";
+        origin = "flathub";
+      }
+    ];
+  };
+}

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\"";
+        })
+      ];
+    });
   })
 ]

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 = {};
+      };
+      # <funny-joke-here/>
+      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";
+      # };
+    };
+  };
+})