diff --git a/flake.lock b/flake.lock index f2657e6..e0c1171 100644 --- a/flake.lock +++ b/flake.lock @@ -17,17 +17,14 @@ ] }, "locked": { - "lastModified": 1770950478, - "narHash": "sha256-y83gbdVEQheIYUvD8rzQcidLN0tcGCGq5b2TWQRjr4c=", - "owner": "cry128", - "repo": "Cerulean", - "rev": "5397bf5efcb1a047612a6e919bc2aad87ba9bb40", - "type": "github" + "lastModified": 1770869519, + "narHash": "sha256-3NyegyJeuQQSFuQMZKNCJhTw2qhJUjUL6ep432EOgJY=", + "path": "/home/me/agribit/nexus/Cerulean", + "type": "path" }, "original": { - "owner": "cry128", - "repo": "Cerulean", - "type": "github" + "path": "/home/me/agribit/nexus/Cerulean", + "type": "path" } }, "deploy-rs": { @@ -198,7 +195,7 @@ }, "original": { "owner": "gmodena", - "ref": "latest", + "ref": "v0.7.0", "repo": "nix-flatpak", "type": "github" } @@ -357,17 +354,14 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770950436, - "narHash": "sha256-+h5jrsIJBea5P+rAk4OqUpScqnHYQTvCRUhgGv/MX34=", - "owner": "cry128", - "repo": "nt", - "rev": "8725f5079f8f27b3faafeff90e5fc075d55e7d0a", - "type": "github" + "lastModified": 1770855466, + "narHash": "sha256-hZyD4m2Iix0FKWiRtzNFhbgdaULq52oysD68LmtT5H4=", + "path": "/home/me/agribit/nexus/nt", + "type": "path" }, "original": { - "owner": "cry128", - "repo": "nt", - "type": "github" + "path": "/home/me/agribit/nexus/nt", + "type": "path" } }, "root": { diff --git a/flake.nix b/flake.nix index 238f561..100114b 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nt.url = "github:cry128/nt"; - # nt.url = "/home/me/cry/mk/nt"; + # nt.url = "github:emilelcb/nt"; + nt.url = "/home/me/agribit/nexus/nt"; cerulean = { - url = "github:cry128/Cerulean"; - # url = "/home/me/cry/mk/Cerulean"; + # url = "github:emilelcb/Cerulean"; + url = "/home/me/agribit/nexus/Cerulean"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -26,7 +26,7 @@ }; }; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0"; grub2-themes = { url = "github:vinceliuice/grub2-themes"; inputs.nixpkgs.follows = "nixpkgs"; @@ -51,6 +51,76 @@ extra-experimental-features = "pipe-operators"; }; - outputs = inputs: - import ./snow.nix inputs; + 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"; + # }; + }; + }; + }); } diff --git a/groups/all/default.nix b/groups/all/default.nix index 2c84bee..b367245 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -1,18 +1,15 @@ { + 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.mkDefault true; + security.sudo.wheelNeedsPassword = lib.mkOverride 900 true; networking = { networkmanager.enable = true; @@ -42,7 +39,7 @@ time.timeZone = lib.mkDefault "Australia/Brisbane"; - i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; + i18n.defaultLocale = "en_US.UTF-8"; console = { font = "Lat2-Terminus16"; keyMap = "us"; @@ -50,6 +47,16 @@ 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 diff --git a/groups/all/modules/flatpak.nix b/groups/all/modules/flatpak.nix deleted file mode 100644 index 20cf828..0000000 --- a/groups/all/modules/flatpak.nix +++ /dev/null @@ -1,12 +0,0 @@ -{...}: { - 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 359642e..3a75daa 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, config, ... @@ -10,6 +11,8 @@ ../../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/groups/cryde/programs.nix b/groups/cryde/programs.nix index a07eaa7..8d8ba86 100644 --- a/groups/cryde/programs.nix +++ b/groups/cryde/programs.nix @@ -20,7 +20,6 @@ signal-desktop kdePackages.gwenview # image viewer video-trimmer - element-desktop # Games prismlauncher # minecraft diff --git a/groups/cryos/default.nix b/groups/cryos/default.nix index 82699d6..795ed8b 100644 --- a/groups/cryos/default.nix +++ b/groups/cryos/default.nix @@ -125,10 +125,7 @@ documentation = { enable = true; doc.enable = true; # install /share/doc packages - man = { - enable = true; # install manpages - generateCaches = false; - }; + man.enable = true; # install manpages info.enable = true; # install GNU info dev.enable = true; # install docs intended for developers nixos = { diff --git a/groups/server/default.nix b/groups/server/default.nix index 6182ef1..5c447fc 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.mkDefault [ + openssh.authorizedKeys.keys = lib.mkOverride 900 [ (throw '' Hosts in the `server` group must set `users.users.cry.openssh.authorizedKeys.keys = [ ... ]`. '') diff --git a/homes/modules/git.nix b/homes/modules/git.nix index f035281..6751849 100755 --- a/homes/modules/git.nix +++ b/homes/modules/git.nix @@ -7,14 +7,8 @@ enable = true; lfs.enable = true; - userName = "_cry64"; - userEmail = "them@dobutterfliescry.net"; - - signing = { - key = "F68745A836CA0412"; - format = "openpgp"; - signByDefault = true; - }; + userName = "Emile Clark-Boman"; + userEmail = "eclarkboman@gmail.com"; aliases = { s = "status"; @@ -27,7 +21,7 @@ extraConfig = { color.ui = true; core.editor = "hx"; - github.user = "cry128"; + github.user = "emileclarkb"; init = { defaultBranch = "main"; @@ -45,16 +39,22 @@ "gitlab:" ]; }; - "git@codeberg.org:" = { + "git@github.com:/Agribit/" = { insteadOf = [ - "cb:" - "codeberg:" + "agri:" + "Agri:" + "agribit:" + "Agribit:" ]; }; - "forgejo@forge.dobutterfliescry.net:2222/" = { + "ssh://forgejo@forge.imbored.dev:2222/" = { insteadOf = [ - "cry:" - "forge:" + "forge" + ]; + }; + "ssh://forgejo@forge.imbored.dev:2222/emileclarkb/" = { + insteadOf = [ + "cry" ]; }; }; @@ -65,10 +65,6 @@ path = "/home/me/agribit/.gitconfig"; condition = "gitdir:/home/me/agribit/**"; } - # { - # path = "/home/me/luminary/.gitconfig"; - # condition = "gitdir:/home/me/luminary/**"; - # } ]; }; } diff --git a/hosts/myputer/modules/gamergrl/default.nix b/hosts/myputer/modules/gamergrl/default.nix deleted file mode 100644 index f295398..0000000 --- a/hosts/myputer/modules/gamergrl/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - services.flatpak = { - packages = [ - { - # Linux Runtime for Roblox - appId = "org.vinegarhq.Sober"; - origin = "flathub"; - } - ]; - }; -} diff --git a/overlays/default.nix b/overlays/default.nix index 5c6507a..4865280 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -17,13 +17,5 @@ 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\""; - }) - ]; - }); }) ] diff --git a/snow.nix b/snow.nix deleted file mode 100644 index 5fe3054..0000000 --- a/snow.nix +++ /dev/null @@ -1,66 +0,0 @@ -{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"; - # }; - }; - }; -})