diff --git a/systems/jeeves/docker/great_cloud_of_witnesses.nix b/systems/jeeves/docker/great_cloud_of_witnesses.nix deleted file mode 100644 index b143e70..0000000 --- a/systems/jeeves/docker/great_cloud_of_witnesses.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - config, - pkgs, - ... -}: - -let - vars = import ../vars.nix; -in -{ - - # environment.systemPackages = with pkgs; [ php.withExtensions ({ all, ... }: [ all.pdo_pgsql ]) ]; - - services.httpd = { - enable = true; - adminAddr = "webmaster@localhost"; - - enablePHP = true; - phpPackage = pkgs.php.withExtensions ( - { enabled, all }: - enabled - ++ [ - all.pdo - all.pdo_pgsql - ] - ); - extraModules = [ "rewrite" ]; - virtualHosts.great_cloud_of_witnesses = { - hostName = "localhost"; - listen = [ - { - ip = "*"; - port = 8092; - } - - ]; - documentRoot = "${vars.services}/great_cloud_of_witnesses"; - extraConfig = '' - - AllowOverride All - Require all granted - - ''; - }; - }; - - sops.secrets.gcw_password = { - sopsFile = ../../../users/secrets.yaml; - neededForUsers = true; - }; - - users = { - users.gcw = { - isSystemUser = true; - hashedPasswordFile = config.sops.secrets.gcw_password.path; - group = "gcw"; - }; - groups.gcw = { }; - }; -} diff --git a/systems/jeeves/services/postgress.nix b/systems/jeeves/services/postgress.nix index 215ec73..46ad091 100644 --- a/systems/jeeves/services/postgress.nix +++ b/systems/jeeves/services/postgress.nix @@ -30,18 +30,6 @@ in local hass hass trust local gitea gitea trust - # megan - host megan megan 192.168.90.1/24 trust - host megan megan 127.0.0.1/32 trust - - host gcw megan 192.168.90.1/24 trust - host gcw megan 127.0.0.1/32 trust - - # gcw - local gcw gcw trust - host gcw gcw 192.168.90.1/24 trust - host gcw gcw 127.0.0.1/32 trust - # math local postgres math trust host postgres math 127.0.0.1/32 trust @@ -100,26 +88,6 @@ in replication = true; }; } - { - name = "megan"; - ensureDBOwnership = true; - ensureClauses = { - login = true; - createrole = true; - createdb = true; - replication = true; - }; - } - { - name = "gcw"; - ensureDBOwnership = true; - ensureClauses = { - login = true; - createrole = true; - createdb = true; - replication = true; - }; - } { name = "math"; ensureDBOwnership = true; @@ -132,13 +100,9 @@ in } ]; ensureDatabases = [ - "gcw" "hass" "gitea" "math" - "megan" - "mxr_dev" - "mxr_prod" "n8n" "richie" ]; diff --git a/users/megan/default.nix b/users/megan/default.nix deleted file mode 100644 index d1669a0..0000000 --- a/users/megan/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - pkgs, - config, - ... -}: -{ - sops.secrets.megan_password = { - sopsFile = ../secrets.yaml; - neededForUsers = true; - }; - - users = { - users.megan = { - isNormalUser = true; - hashedPasswordFile = "${config.sops.secrets.megan_password.path}"; - - shell = pkgs.zsh; - group = "megan"; - extraGroups = [ - "audio" - "video" - "users" - ]; - uid = 1101; - }; - - groups.megan.gid = 1101; - }; - home-manager.users.megan = import ./systems/${config.networking.hostName}.nix; -} diff --git a/users/megan/home/cli/default.nix b/users/megan/home/cli/default.nix deleted file mode 100644 index 863c25f..0000000 --- a/users/megan/home/cli/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ - ./direnv.nix - ./git.nix - ./zsh.nix - ]; - - programs.starship.enable = true; -} diff --git a/users/megan/home/cli/direnv.nix b/users/megan/home/cli/direnv.nix deleted file mode 100644 index 75129d9..0000000 --- a/users/megan/home/cli/direnv.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - - programs.direnv = { - enable = true; - enableZshIntegration = true; - nix-direnv.enable = true; - }; -} diff --git a/users/megan/home/cli/git.nix b/users/megan/home/cli/git.nix deleted file mode 100644 index 589d78a..0000000 --- a/users/megan/home/cli/git.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - programs.git = { - enable = true; - settings = { - user = { - email = "mousikos112@gmail.com"; - name = "megan"; - }; - pull.rebase = true; - color.ui = true; - }; - lfs.enable = true; - }; -} diff --git a/users/megan/home/cli/zsh.nix b/users/megan/home/cli/zsh.nix deleted file mode 100644 index 4b6a5e9..0000000 --- a/users/megan/home/cli/zsh.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - programs.zsh = { - enable = true; - syntaxHighlighting.enable = true; - history.size = 10000; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "docker" - "docker-compose" - "colored-man-pages" - "rust" - "systemd" - "tmux" - "ufw" - "z" - ]; - }; - shellAliases = { - "lrt" = "eza --icons -lsnew"; - "ls" = "eza"; - "ll" = "eza --long --group"; - "la" = "eza --all"; - - "rspace" = "'for f in *\ *; do mv \"$f\" \"\${f// /_}\"; done'"; - "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/dotfiles#$HOST"; - "nix-test" = "nixos-rebuild test --flake /home/richie/dotfiles"; - }; - }; -} diff --git a/users/megan/home/global.nix b/users/megan/home/global.nix deleted file mode 100644 index 8c17056..0000000 --- a/users/megan/home/global.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, ... }: -{ - imports = [ - ./cli - ./programs.nix - ]; - - programs = { - home-manager.enable = true; - git.enable = true; - }; - - home = { - username = "megan"; - homeDirectory = "/home/${config.home.username}"; - stateVersion = "24.05"; - }; -} diff --git a/users/megan/home/programs.nix b/users/megan/home/programs.nix deleted file mode 100644 index ae475db..0000000 --- a/users/megan/home/programs.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - # cli - bat - btop - eza - fd - ffmpegthumbnailer - fzf - git - gnupg - imagemagick - jq - ncdu - neofetch - ouch - p7zip - poppler - rar - ripgrep - starship - tmux - unzip - yazi - zoxide - # system info - hwloc - lynis - pciutils - smartmontools - usbutils - # networking - iperf3 - nmap - wget - # python - poetry - ruff - ]; -} diff --git a/users/megan/systems/jeeves.nix b/users/megan/systems/jeeves.nix deleted file mode 100644 index 6bbef61..0000000 --- a/users/megan/systems/jeeves.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ../home/global.nix - ]; -}