diff options
| -rw-r--r-- | flake.lock | 17 | ||||
| -rwxr-xr-x | flake.nix | 23 | ||||
| -rwxr-xr-x | modules/base.nix | 3 | ||||
| -rwxr-xr-x | modules/users/Rory.nix | 29 |
4 files changed, 39 insertions, 33 deletions
diff --git a/flake.lock b/flake.lock index c9f38e0..93b67b8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "Rory-Open-Architecture": { + "flake": false, + "locked": { + "lastModified": 1715279645, + "narHash": "sha256-4hZRYgRI61a+exE8HcVS3cvzpz+Ekwd2wksJlsFpjiA=", + "ref": "refs/heads/master", + "rev": "f1ed052240ab4062d74bf176a5eb9a552dc1fc9a", + "revCount": 355, + "type": "git", + "url": "https://cgit.rory.gay/Rory-Open-Architecture.git" + }, + "original": { + "type": "git", + "url": "https://cgit.rory.gay/Rory-Open-Architecture.git" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -87,6 +103,7 @@ }, "root": { "inputs": { + "Rory-Open-Architecture": "Rory-Open-Architecture", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "secrets": "secrets", diff --git a/flake.nix b/flake.nix index b9c36ee..efd62bc 100755 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,21 @@ nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable"; }; + home-manager = { url = "github:nix-community/home-manager/master"; }; + secrets = { url = "git+http://secrets.internal.spacebar.chat/"; flake = false; }; + Rory-Open-Architecture = { # Rory user + url = "git+https://cgit.rory.gay/Rory-Open-Architecture.git"; + flake = false; + }; + spacebarchat-server-master = { url = "github:spacebarchat/server/master"; }; @@ -20,7 +27,7 @@ #moreinputs }; - outputs = { self, nixpkgs, home-manager, secrets, spacebarchat-server-master }: { + outputs = { self, nixpkgs, home-manager, secrets, Rory-Open-Architecture, spacebarchat-server-master }: { nixosConfigurations = { Spacebar-nginx = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -28,6 +35,9 @@ ./host/Spacebar-nginx/configuration.nix ./hardware-configuration.nix home-manager.nixosModules.home-manager + + ({ config, ... }: { programs.dconf.enable = true; }) # Fix for home-manager failing to deploy + (Rory-Open-Architecture + "/modules/users/Rory.nix") ]; specialArgs = { inherit home-manager; @@ -42,6 +52,9 @@ ./host/Spacebar-synapse/configuration.nix ./hardware-configuration.nix home-manager.nixosModules.home-manager + + ({ config, ... }: { programs.dconf.enable = true; }) # Fix for home-manager failing to deploy + (Rory-Open-Architecture + "/modules/users/Rory.nix") ]; specialArgs = { inherit home-manager; @@ -54,6 +67,9 @@ ./host/Spacebar-postgres/configuration.nix ./hardware-configuration.nix home-manager.nixosModules.home-manager + + ({ config, ... }: { programs.dconf.enable = true; }) # Fix for home-manager failing to deploy + (Rory-Open-Architecture + "/modules/users/Rory.nix") ]; specialArgs = { inherit home-manager; @@ -66,6 +82,9 @@ ./host/Spacebar-monitoring/configuration.nix ./hardware-configuration.nix home-manager.nixosModules.home-manager + + ({ config, ... }: { programs.dconf.enable = true; }) # Fix for home-manager failing to deploy + (Rory-Open-Architecture + "/modules/users/Rory.nix") ]; specialArgs = { inherit home-manager; @@ -74,4 +93,4 @@ }; }; }; -} +} \ No newline at end of file diff --git a/modules/base.nix b/modules/base.nix index ee27780..408b4cf 100755 --- a/modules/base.nix +++ b/modules/base.nix @@ -6,7 +6,6 @@ ./monitoring.nix ./infra-logs.nix ./auto-redeploy.nix - ./users/Rory.nix ./users/chris.nix ./users/maddy.nix ./vim.nix @@ -133,4 +132,4 @@ nixpkgs.config.allowUnfree = true; sound.enable = false; system.stateVersion = "22.11"; # DO NOT EDIT! -} +} \ No newline at end of file diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix deleted file mode 100755 index fe51acc..0000000 --- a/modules/users/Rory.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, pkgs, home-manager, ... }: -{ - users.users.Rory = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - packages = with pkgs; [ - ]; - initialPassword = "password"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILF2IuNu//0DP/wKMuDvBgVT3YBS2uULsipbdrhJCTM7 Rory-desktop" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN/kNkY/E5b6rvCQLMaSbpLQ/xoyywIwVVu9uo2j/B6p Rory@RoryNix" - ]; - }; - - home-manager.users.Rory = { - programs.git = { - enable = true; - userName = "TheArcaneBrony"; - userEmail = "root@thearcanebrony.net"; - extraConfig = { - safe = { - directory = "/"; - }; - }; - }; - home.stateVersion = "22.11"; - }; -} - |