From 512cf903fee6a586f84173c637d2c72f50fbfed2 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 15 Nov 2024 16:42:57 -0600 Subject: [PATCH] removing desktop systems and des --- .../home/modules/programs/de/default.nix | 0 .../modules/programs/de/gnome/default.nix | 0 {nixos => .archive}/hosts/telchar/default.nix | 0 .../hosts/telchar/secrets.sops.yaml | 0 .../modules/nixos/de/default.nix | 0 .../modules/nixos/de/gnome.nix | 0 {nixos => .archive}/modules/nixos/de/kde.nix | 0 .../nixos/services/cockpit/default.nix | 0 .../nixos/services/glances/default.nix | 0 .../nixos/services/postgresql/default.nix | 0 .../nixos/services/radicale/default.nix | 0 .../nixos/services/radicale/secrets.sops.yaml | 0 .../modules/nixos/services/vault/default.nix | 0 .../services/vault/resources/vault-config.hcl | 0 .../profiles/disko-telchar.nix | 0 .../profiles/hw-framework-16-7840hs.nix | 0 {nixos => .archive}/profiles/role-gaming.nix | 0 .../profiles/role-workstation.nix | 0 .vscode/settings.json | 6 +- flake.nix | 19 ------- nixos/home/modules/programs/default.nix | 1 - .../nixos/containers/backrest/default.nix | 56 ------------------- nixos/modules/nixos/containers/default.nix | 1 - nixos/modules/nixos/default.nix | 2 - nixos/modules/nixos/services/default.nix | 4 -- nixos/profiles/role-server.nix | 1 - 26 files changed, 3 insertions(+), 87 deletions(-) rename {nixos => .archive}/home/modules/programs/de/default.nix (100%) rename {nixos => .archive}/home/modules/programs/de/gnome/default.nix (100%) rename {nixos => .archive}/hosts/telchar/default.nix (100%) rename {nixos => .archive}/hosts/telchar/secrets.sops.yaml (100%) rename {nixos => .archive}/modules/nixos/de/default.nix (100%) rename {nixos => .archive}/modules/nixos/de/gnome.nix (100%) rename {nixos => .archive}/modules/nixos/de/kde.nix (100%) rename {nixos => .archive}/modules/nixos/services/cockpit/default.nix (100%) rename {nixos => .archive}/modules/nixos/services/glances/default.nix (100%) rename {nixos => .archive}/modules/nixos/services/postgresql/default.nix (100%) rename {nixos => .archive}/modules/nixos/services/radicale/default.nix (100%) rename {nixos => .archive}/modules/nixos/services/radicale/secrets.sops.yaml (100%) rename {nixos => .archive}/modules/nixos/services/vault/default.nix (100%) rename {nixos => .archive}/modules/nixos/services/vault/resources/vault-config.hcl (100%) rename {nixos => .archive}/profiles/disko-telchar.nix (100%) rename {nixos => .archive}/profiles/hw-framework-16-7840hs.nix (100%) rename {nixos => .archive}/profiles/role-gaming.nix (100%) rename {nixos => .archive}/profiles/role-workstation.nix (100%) delete mode 100644 nixos/modules/nixos/containers/backrest/default.nix diff --git a/nixos/home/modules/programs/de/default.nix b/.archive/home/modules/programs/de/default.nix similarity index 100% rename from nixos/home/modules/programs/de/default.nix rename to .archive/home/modules/programs/de/default.nix diff --git a/nixos/home/modules/programs/de/gnome/default.nix b/.archive/home/modules/programs/de/gnome/default.nix similarity index 100% rename from nixos/home/modules/programs/de/gnome/default.nix rename to .archive/home/modules/programs/de/gnome/default.nix diff --git a/nixos/hosts/telchar/default.nix b/.archive/hosts/telchar/default.nix similarity index 100% rename from nixos/hosts/telchar/default.nix rename to .archive/hosts/telchar/default.nix diff --git a/nixos/hosts/telchar/secrets.sops.yaml b/.archive/hosts/telchar/secrets.sops.yaml similarity index 100% rename from nixos/hosts/telchar/secrets.sops.yaml rename to .archive/hosts/telchar/secrets.sops.yaml diff --git a/nixos/modules/nixos/de/default.nix b/.archive/modules/nixos/de/default.nix similarity index 100% rename from nixos/modules/nixos/de/default.nix rename to .archive/modules/nixos/de/default.nix diff --git a/nixos/modules/nixos/de/gnome.nix b/.archive/modules/nixos/de/gnome.nix similarity index 100% rename from nixos/modules/nixos/de/gnome.nix rename to .archive/modules/nixos/de/gnome.nix diff --git a/nixos/modules/nixos/de/kde.nix b/.archive/modules/nixos/de/kde.nix similarity index 100% rename from nixos/modules/nixos/de/kde.nix rename to .archive/modules/nixos/de/kde.nix diff --git a/nixos/modules/nixos/services/cockpit/default.nix b/.archive/modules/nixos/services/cockpit/default.nix similarity index 100% rename from nixos/modules/nixos/services/cockpit/default.nix rename to .archive/modules/nixos/services/cockpit/default.nix diff --git a/nixos/modules/nixos/services/glances/default.nix b/.archive/modules/nixos/services/glances/default.nix similarity index 100% rename from nixos/modules/nixos/services/glances/default.nix rename to .archive/modules/nixos/services/glances/default.nix diff --git a/nixos/modules/nixos/services/postgresql/default.nix b/.archive/modules/nixos/services/postgresql/default.nix similarity index 100% rename from nixos/modules/nixos/services/postgresql/default.nix rename to .archive/modules/nixos/services/postgresql/default.nix diff --git a/nixos/modules/nixos/services/radicale/default.nix b/.archive/modules/nixos/services/radicale/default.nix similarity index 100% rename from nixos/modules/nixos/services/radicale/default.nix rename to .archive/modules/nixos/services/radicale/default.nix diff --git a/nixos/modules/nixos/services/radicale/secrets.sops.yaml b/.archive/modules/nixos/services/radicale/secrets.sops.yaml similarity index 100% rename from nixos/modules/nixos/services/radicale/secrets.sops.yaml rename to .archive/modules/nixos/services/radicale/secrets.sops.yaml diff --git a/nixos/modules/nixos/services/vault/default.nix b/.archive/modules/nixos/services/vault/default.nix similarity index 100% rename from nixos/modules/nixos/services/vault/default.nix rename to .archive/modules/nixos/services/vault/default.nix diff --git a/nixos/modules/nixos/services/vault/resources/vault-config.hcl b/.archive/modules/nixos/services/vault/resources/vault-config.hcl similarity index 100% rename from nixos/modules/nixos/services/vault/resources/vault-config.hcl rename to .archive/modules/nixos/services/vault/resources/vault-config.hcl diff --git a/nixos/profiles/disko-telchar.nix b/.archive/profiles/disko-telchar.nix similarity index 100% rename from nixos/profiles/disko-telchar.nix rename to .archive/profiles/disko-telchar.nix diff --git a/nixos/profiles/hw-framework-16-7840hs.nix b/.archive/profiles/hw-framework-16-7840hs.nix similarity index 100% rename from nixos/profiles/hw-framework-16-7840hs.nix rename to .archive/profiles/hw-framework-16-7840hs.nix diff --git a/nixos/profiles/role-gaming.nix b/.archive/profiles/role-gaming.nix similarity index 100% rename from nixos/profiles/role-gaming.nix rename to .archive/profiles/role-gaming.nix diff --git a/nixos/profiles/role-workstation.nix b/.archive/profiles/role-workstation.nix similarity index 100% rename from nixos/profiles/role-workstation.nix rename to .archive/profiles/role-workstation.nix diff --git a/.vscode/settings.json b/.vscode/settings.json index 1884a69..85252e4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,8 +8,8 @@ "files.trimTrailingWhitespace": true, "sops.defaults.ageKeyFile": "/home/jahanson/projects/mochi/age.key", "nix.enableLanguageServer": true, - "nix.serverPath": "/run/current-system/sw/bin/nil", - "nix.formatterPath": "/run/current-system/sw/bin/nixfmt", + "nix.serverPath": "/home/jahanson/.nix-profile/bin/nil", + "nix.formatterPath": "/home/jahanson/.nix-profile/bin/nixfmt", "nix.serverSettings": { "nil": { "formatting": { @@ -21,7 +21,7 @@ }, }, "nix": { - "binary": "/run/current-system/sw/bin/nix", + "binary": "/nix/var/nix/profiles/default/bin/nix", "maxMemoryMB": null, // disable memory limit "flake": { "autoEvalInputs": true, diff --git a/flake.nix b/flake.nix index 6cb44f7..a797ec6 100644 --- a/flake.nix +++ b/flake.nix @@ -167,25 +167,6 @@ }; in { - "telchar" = mkNixosConfig { - # Framework 16 Ryzen 7 7840HS - Radeon 780M Graphics - # Nix dev laptop - hostname = "telchar"; - system = "x86_64-linux"; - hardwareModules = [ - inputs.nixos-hardware.nixosModules.framework-16-7040-amd - ./nixos/profiles/hw-framework-16-7840hs.nix - disko.nixosModules.disko - (import ./nixos/profiles/disko-telchar.nix) - lix-module.nixosModules.default - ]; - profileModules = [ - ./nixos/profiles/role-dev.nix - ./nixos/profiles/role-workstation.nix - { home-manager.users.jahanson = ./nixos/home/jahanson/workstation.nix; } - ]; - }; - "varda" = mkNixosConfig { # Arm64 cax21 @ Hetzner # forgejo server diff --git a/nixos/home/modules/programs/default.nix b/nixos/home/modules/programs/default.nix index 63c13f9..6658c8e 100644 --- a/nixos/home/modules/programs/default.nix +++ b/nixos/home/modules/programs/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ ./browsers - ./de ./thunderbird ]; } diff --git a/nixos/modules/nixos/containers/backrest/default.nix b/nixos/modules/nixos/containers/backrest/default.nix deleted file mode 100644 index 393118e..0000000 --- a/nixos/modules/nixos/containers/backrest/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, config, ... }: -with lib; -let - app = "backrest"; - image = "garethgeorge/backrest:v1.1.0"; - user = "568"; #string - group = "568"; #string - port = 9898; #int - cfg = config.mySystem.services.${app}; - appFolder = "/var/lib/${app}"; - # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; -in -{ - options.mySystem.services.${app} = - { - enable = mkEnableOption "${app}"; - addToHomepage = mkEnableOption "Add ${app} to homepage" // { default = true; }; - }; - - config = mkIf cfg.enable { - # ensure folder exist and has correct owner/group - systemd.tmpfiles.rules = [ - "d ${appFolder}/config 0750 ${user} ${group} -" - "d ${appFolder}/data 0750 ${user} ${group} -" - "d ${appFolder}/cache 0750 ${user} ${group} -" - ]; - - virtualisation.oci-containers.containers.${app} = { - image = "${image}"; - user = "${user}:${group}"; - environment = { - BACKREST_PORT = "9898"; - BACKREST_DATA = "/data"; - BACKREST_CONFIG = "/config/config.json"; - XDG_CACHE_HOME = "/cache"; - }; - volumes = [ - "${appFolder}/nixos/config:/config:rw" - "${appFolder}/nixos/data:/data:rw" - "${appFolder}/nixos/cache:/cache:rw" - "${config.mySystem.nasFolder}/backup/nixos/nixos:/repos:rw" - "/etc/localtime:/etc/localtime:ro" - ]; - }; - - services.nginx.virtualHosts."${app}.${config.networking.domain}" = { - useACMEHost = config.networking.domain; - forceSSL = true; - locations."^~ /" = { - proxyPass = "http://${app}:${builtins.toString port}"; - extraConfig = "resolver 10.88.0.1;"; - }; - }; - - }; -} diff --git a/nixos/modules/nixos/containers/default.nix b/nixos/modules/nixos/containers/default.nix index cb449b0..f223338 100644 --- a/nixos/modules/nixos/containers/default.nix +++ b/nixos/modules/nixos/containers/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./backrest ./lego-auto ./scrutiny ]; diff --git a/nixos/modules/nixos/default.nix b/nixos/modules/nixos/default.nix index b8b3556..8c97ade 100644 --- a/nixos/modules/nixos/default.nix +++ b/nixos/modules/nixos/default.nix @@ -3,9 +3,7 @@ with lib; { imports = [ ./containers - ./de ./editor - ./games ./hardware ./lib.nix ./programs diff --git a/nixos/modules/nixos/services/default.nix b/nixos/modules/nixos/services/default.nix index 8bc19aa..81e76a2 100644 --- a/nixos/modules/nixos/services/default.nix +++ b/nixos/modules/nixos/services/default.nix @@ -1,18 +1,14 @@ { imports = [ ./bind - ./cockpit ./dnsmasq ./forgejo - ./glances ./haproxy ./libvirt-qemu ./matchbox ./nginx ./onepassword-connect ./podman - ./postgresql - ./radicale ./reboot-required-check.nix ./restic ./sanoid diff --git a/nixos/profiles/role-server.nix b/nixos/profiles/role-server.nix index 4df65bf..9cd7c5d 100644 --- a/nixos/profiles/role-server.nix +++ b/nixos/profiles/role-server.nix @@ -6,7 +6,6 @@ with lib; mySystem = { services.rebootRequiredCheck.enable = true; security.wheelNeedsSudoPassword = false; - services.cockpit.enable = true; system.motd.enable = true; };