diff --git a/README.md b/README.md index 008d8e2..a5c22ea 100644 --- a/README.md +++ b/README.md @@ -11,68 +11,9 @@ and rekey the secrets via [agenix][agenix], you could also just execute `ssh-keyscan ip_or_fqdn` to fetch the current public keys. After pushing the rekeyed secrets execute the commands below. -## Desktops +## Asgard -Generally after the installation I'm cloning this repository somewhere onto the -desktop machine and just execute `make switch` within that repository to apply -updates, if this is not the case I can always execute the following command to -get the latest changes pulled in: - -```console -nixos-rebuild switch --flake github:tboerger/nixos-config#hostname -``` - -### Anubis - -```console -sudo loadkeys de -sudo nix-shell --packages nixUnstable - -nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko --flake github:tboerger/nixos-config#anubis - -mkdir -p /mnt/etc/ssh -cp /etc/ssh/ssh_host_* /mnt/etc/ssh/ -nixos-install --no-root-password --root /mnt --flake github:tboerger/nixos-config#anubis -``` - -After a reboot of the system it should be fully provisioned with the regular -flake which includes all defined services: - -```console -nixos-rebuild switch --flake github:tboerger/nixos-config#anubis -``` - -### Chnum - -```console -sudo loadkeys de -sudo nix-shell --packages nixUnstable - -nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko --flake github:tboerger/nixos-config#chnum - -mkdir -p /mnt/etc/ssh -cp /etc/ssh/ssh_host_* /mnt/etc/ssh/ -nixos-install --no-root-password --root /mnt --flake github:tboerger/nixos-config#chnum -``` - -After a reboot of the system it should be fully provisioned with the regular -flake which includes all defined services: - -```console -nixos-rebuild switch --flake github:tboerger/nixos-config#chnum -``` - -## Servers - -To apply updates for servers this repository should be updated to the latest -version, after that it is possible to use `deploy-rs` to upgrade the deployment -with a command like this: - -```console -nix run github:serokell/deploy-rs github:tboerger/nixos-config#hostname -``` - -### Asgard +### Bootstrap ```console sudo loadkeys de @@ -85,14 +26,15 @@ cp /etc/ssh/ssh_host_* /mnt/etc/ssh/ nixos-install --no-root-password --root /mnt --flake github:tboerger/nixos-config#asgard ``` -After a reboot of the system it should be fully provisioned with the regular -flake which includes all defined services: +### Updates ```console nix run github:serokell/deploy-rs github:tboerger/nixos-config#asgard ``` -### Utgard +## Utgard + +### Bootstrap ```console sudo loadkeys de @@ -105,14 +47,15 @@ cp /etc/ssh/ssh_host_* /mnt/etc/ssh/ nixos-install --no-root-password --root /mnt --flake github:tboerger/nixos-config#utgard ``` -After a reboot of the system it should be fully provisioned with the regular -flake which includes all defined services: +### Updates ```console nix run github:serokell/deploy-rs github:tboerger/nixos-config#utgard ``` -### Vanaheim +## Vanaheim + +### Bootstrap ```console sudo loadkeys de @@ -125,14 +68,15 @@ cp /etc/ssh/ssh_host_* /mnt/etc/ssh/ nixos-install --no-root-password --root /mnt --flake github:tboerger/nixos-config#vanaheim ``` -After a reboot of the system it should be fully provisioned with the regular -flake which includes all defined services: +### Updates ```console nix run github:serokell/deploy-rs github:tboerger/nixos-config#vanaheim ``` -### Yggdrasil +## Yggdrasil + +### Bootstrap ```console sudo loadkeys de @@ -145,37 +89,12 @@ cp /etc/ssh/ssh_host_* /mnt/etc/ssh/ nixos-install --no-root-password --root /mnt --flake github:tboerger/nixos-config#yggdrasil ``` -After a reboot of the system it should be fully provisioned with the regular -flake which includes all defined services: +### Updates ```console nix run github:serokell/deploy-rs github:tboerger/nixos-config#yggdrasil ``` -## Finish - -Finally after I have setup the whole system I usually copy the remaining -credentials from my securely stored USB stick to get access to my SSH keys and -Gnupg keys if this is required on the machine. It should not be required for -servers. - -### SSH - -```console -mkdir -p ${HOME}/.ssh/ -cp /media/$(whoami)/secrets/ssh/id_* ${HOME}/.ssh/ -chown -R $(id -u):$(id -g) ${HOME}/.ssh -chmod u=rw,g=,o= ${HOME}/.ssh/id_* -``` - -### Gnupg - -```console -for FILE in /media/$(whoami)/secrets/gpg/*.asc; do - gpg --import ${FILE} -done -``` - ## Security If you find a security issue please contact thomas@webhippie.de first. diff --git a/desktops/anubis/boot.nix b/desktops/anubis/boot.nix deleted file mode 100644 index 3b56704..0000000 --- a/desktops/anubis/boot.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot = { - supportedFilesystems = [ - "ntfs" - ]; - - binfmt = { - emulatedSystems = [ - "aarch64-linux" - ]; - }; - - kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - - tmp = { - cleanOnBoot = true; - }; - - loader = { - efi = { - canTouchEfiVariables = true; - }; - - systemd-boot = { - enable = true; - consoleMode = "2"; - configurationLimit = 5; - editor = false; - }; - }; - - kernelModules = [ "coretemp" "thinkpad_acpi" ]; - extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; - - initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "acpi_call" ]; - kernelModules = [ "dm-snapshot" ]; - }; - }; -} diff --git a/desktops/anubis/default.nix b/desktops/anubis/default.nix deleted file mode 100644 index d591a03..0000000 --- a/desktops/anubis/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../../shared/modules - ../../shared/global - ../../shared/programs - ../../shared/services - - ./disko.nix - ./boot.nix - ./networking.nix - ./graphics.nix - ./hardware.nix - ./extras.nix - ]; - - personal = { - services = { - desktop = { - enable = config.personal.services.enable; - }; - docker = { - enable = config.personal.services.enable; - }; - libvirt = { - enable = config.personal.services.enable; - }; - printing = { - enable = config.personal.services.enable; - }; - tailscale = { - enable = config.personal.services.enable; - }; - }; - - programs = { - browser = { - enable = config.personal.programs.enable; - }; - lutris = { - enable = config.personal.programs.enable; - }; - mail = { - enable = config.personal.programs.enable; - }; - password = { - enable = config.personal.programs.enable; - }; - steam = { - enable = config.personal.programs.enable; - }; - }; - }; - - system = { - stateVersion = "23.11"; - }; -} diff --git a/desktops/anubis/disko.nix b/desktops/anubis/disko.nix deleted file mode 100644 index 880bbc8..0000000 --- a/desktops/anubis/disko.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ ... }: - -{ - disko = { - devices = { - disk = { - disk1 = { - type = "disk"; - device = "/dev/disk/by-id/nvme-WD_PC_SN810_SDCQNRZ-2T00-1001_22343X803590"; - - content = { - type = "gpt"; - - partitions = { - ESP = { - type = "EF00"; - size = "1G"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - - primary = { - size = "100%"; - content = { - type = "lvm_pv"; - vg = "system"; - }; - }; - }; - }; - }; - }; - - lvm_vg = { - system = { - type = "lvm_vg"; - - lvs = { - swap = { - size = "32G"; - content = { - type = "swap"; - resumeDevice = true; - }; - }; - - root = { - size = "20G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - - nix = { - size = "100G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/nix"; - }; - }; - - home = { - size = "50G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/home"; - }; - }; - - dummy1 = { - size = "1M"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/var/lib/dummy1"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/desktops/anubis/extras.nix b/desktops/anubis/extras.nix deleted file mode 100644 index b260ed0..0000000 --- a/desktops/anubis/extras.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - services = { - thinkfan = { - enable = true; - }; - }; - - systemd = { - services = { - thinkfan = { - preStart = " - /run/current-system/sw/bin/modprobe -r thinkpad_acpi && /run/current-system/sw/bin/modprobe thinkpad_acpi - "; - }; - }; - }; -} diff --git a/desktops/anubis/graphics.nix b/desktops/anubis/graphics.nix deleted file mode 100644 index 1b35341..0000000 --- a/desktops/anubis/graphics.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - hardware = { - nvidia = { - powerManagement = { - enable = true; - }; - - modesetting = { - enable = true; - }; - - prime = { - sync = { - enable = true; - }; - - nvidiaBusId = "PCI:3:0:0"; - intelBusId = "PCI:0:2:0"; - }; - }; - }; -} diff --git a/desktops/anubis/networking.nix b/desktops/anubis/networking.nix deleted file mode 100644 index 6270af6..0000000 --- a/desktops/anubis/networking.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - networking = { - hostName = "anubis"; - - networkmanager = { - enable = true; - }; - - # nat = { - # enable = true; - # enableIPv6 = true; - # internalInterfaces = [ "ve-+" ]; - # externalInterface = ""; - # }; - }; -} diff --git a/desktops/chnum/boot.nix b/desktops/chnum/boot.nix deleted file mode 100644 index b6c670f..0000000 --- a/desktops/chnum/boot.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot = { - supportedFilesystems = [ - "ntfs" - ]; - - binfmt = { - emulatedSystems = [ - "aarch64-linux" - ]; - }; - - kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - - tmp = { - cleanOnBoot = true; - }; - - loader = { - efi = { - canTouchEfiVariables = true; - }; - - systemd-boot = { - enable = true; - consoleMode = "2"; - configurationLimit = 5; - editor = false; - }; - }; - - kernelModules = [ "kvm-intel" ]; - extraModulePackages = with config.boot.kernelPackages; [ ]; - - initrd = { - availableKernelModules = [ "ahci" "atkbd" "rtsx_pci_sdmmc" "sd_mod" "usb_storage" "xhci_pci" ]; - kernelModules = [ "dm-snapshot" ]; - }; - }; -} diff --git a/desktops/chnum/default.nix b/desktops/chnum/default.nix deleted file mode 100644 index d591a03..0000000 --- a/desktops/chnum/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../../shared/modules - ../../shared/global - ../../shared/programs - ../../shared/services - - ./disko.nix - ./boot.nix - ./networking.nix - ./graphics.nix - ./hardware.nix - ./extras.nix - ]; - - personal = { - services = { - desktop = { - enable = config.personal.services.enable; - }; - docker = { - enable = config.personal.services.enable; - }; - libvirt = { - enable = config.personal.services.enable; - }; - printing = { - enable = config.personal.services.enable; - }; - tailscale = { - enable = config.personal.services.enable; - }; - }; - - programs = { - browser = { - enable = config.personal.programs.enable; - }; - lutris = { - enable = config.personal.programs.enable; - }; - mail = { - enable = config.personal.programs.enable; - }; - password = { - enable = config.personal.programs.enable; - }; - steam = { - enable = config.personal.programs.enable; - }; - }; - }; - - system = { - stateVersion = "23.11"; - }; -} diff --git a/desktops/chnum/disko.nix b/desktops/chnum/disko.nix deleted file mode 100644 index c4cfafd..0000000 --- a/desktops/chnum/disko.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ ... }: - -{ - disko = { - devices = { - disk = { - disk1 = { - type = "disk"; - device = "/dev/disk/by-id/ata-TOSHIBA_THNSNH512GCST_14DS100ATBAY"; - - content = { - type = "gpt"; - - partitions = { - ESK = { - type = "EF00"; - size = "1G"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - - primary = { - size = "100%"; - content = { - type = "lvm_pv"; - vg = "system"; - }; - }; - }; - }; - }; - }; - - lvm_vg = { - system = { - type = "lvm_vg"; - - lvs = { - swap = { - size = "32G"; - content = { - type = "swap"; - resumeDevice = true; - }; - }; - - root = { - size = "20G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - - nix = { - size = "100G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/nix"; - }; - }; - - home = { - size = "50G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/home"; - }; - }; - - dummy1 = { - size = "1M"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/var/lib/dummy1"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/desktops/chnum/graphics.nix b/desktops/chnum/graphics.nix deleted file mode 100644 index 88d8a3b..0000000 --- a/desktops/chnum/graphics.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ } diff --git a/desktops/chnum/networking.nix b/desktops/chnum/networking.nix deleted file mode 100644 index 2e3efd0..0000000 --- a/desktops/chnum/networking.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - networking = { - hostName = "chnum"; - - networkmanager = { - enable = true; - }; - - # nat = { - # enable = true; - # enableIPv6 = true; - # internalInterfaces = [ "ve-+" ]; - # externalInterface = "enp0s25"; - # }; - }; -} diff --git a/flake.nix b/flake.nix index d832634..a71acee 100644 --- a/flake.nix +++ b/flake.nix @@ -68,112 +68,18 @@ in { diskoConfigurations = { - anubis = import ./desktops/anubis/disko.nix; - chnum = import ./desktops/chnum/disko.nix; - asgard = import ./servers/asgard/disko.nix; - utgard = import ./servers/utgard/disko.nix; - vanaheim = import ./servers/vanaheim/disko.nix; + asgard = import ./machines/asgard/disko.nix; + utgard = import ./machines/utgard/disko.nix; + vanaheim = import ./machines/vanaheim/disko.nix; }; nixosConfigurations = { - anubis = mkComputer - ./desktops/anubis - "x86_64-linux" - [ - disko.nixosModules.disko - ./home/thomas/user.nix - ./home/anna/user.nix - ./home/adrian/user.nix - ./home/tabea/user.nix - - { - home-manager = { - extraSpecialArgs = { - desktopSystem = true; - }; - - users = { - thomas = { - imports = [ - agenix.homeManagerModules.default - ./home/thomas - ]; - }; - anna = { - imports = [ - agenix.homeManagerModules.default - ./home/anna - ]; - }; - adrian = { - imports = [ - agenix.homeManagerModules.default - ./home/adrian - ]; - }; - tabea = { - imports = [ - agenix.homeManagerModules.default - ./home/tabea - ]; - }; - }; - }; - } - ]; - - chnum = mkComputer - ./desktops/chnum - "x86_64-linux" - [ - disko.nixosModules.disko - ./home/thomas/user.nix - ./home/anna/user.nix - ./home/adrian/user.nix - ./home/tabea/user.nix - - { - home-manager = { - extraSpecialArgs = { - desktopSystem = true; - }; - - users = { - thomas = { - imports = [ - agenix.homeManagerModules.default - ./home/thomas - ]; - }; - anna = { - imports = [ - agenix.homeManagerModules.default - ./home/anna - ]; - }; - adrian = { - imports = [ - agenix.homeManagerModules.default - ./home/adrian - ]; - }; - tabea = { - imports = [ - agenix.homeManagerModules.default - ./home/tabea - ]; - }; - }; - }; - } - ]; - asgard = mkComputer - ./servers/asgard + ./machines/asgard "x86_64-linux" [ disko.nixosModules.disko - ./home/thomas/user.nix + ./profiles/thomas/user.nix { home-manager = { @@ -184,8 +90,8 @@ users = { thomas = { imports = [ - agenix.homeManagerModules.default - ./home/thomas + # agenix.homeManagerModules.default + ./profiles/thomas ]; }; }; @@ -194,11 +100,11 @@ ]; utgard = mkComputer - ./servers/utgard + ./machines/utgard "x86_64-linux" [ disko.nixosModules.disko - ./home/thomas/user.nix + ./profiles/thomas/user.nix { home-manager = { @@ -209,8 +115,8 @@ users = { thomas = { imports = [ - agenix.homeManagerModules.default - ./home/thomas + # agenix.homeManagerModules.default + ./profiles/thomas ]; }; }; @@ -219,11 +125,11 @@ ]; vanaheim = mkComputer - ./servers/vanaheim + ./machines/vanaheim "x86_64-linux" [ disko.nixosModules.disko - ./home/thomas/user.nix + ./profiles/thomas/user.nix { home-manager = { @@ -234,8 +140,8 @@ users = { thomas = { imports = [ - agenix.homeManagerModules.default - ./home/thomas + # agenix.homeManagerModules.default + ./profiles/thomas ]; }; }; @@ -244,11 +150,11 @@ ]; # yggdrasil = mkComputer - # ./servers/yggdrasil + # ./machines/yggdrasil # "aarch64-linux" # [ # hardware.nixosModules.raspberry-pi-4 - # ./home/thomas/user.nix + # ./profiles/thomas/user.nix # { # home-manager = { @@ -260,7 +166,7 @@ # thomas = { # imports = [ # agenix.homeManagerModules.default - # ./home/thomas + # ./profiles/thomas # ]; # }; # }; @@ -271,30 +177,6 @@ deploy = { nodes = { - anubis = { - sshOpts = [ "-p" "22" ]; - hostname = "anubis"; - fastConnection = true; - profiles = { - system = { - sshUser = "thomas"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.anubis; - user = "root"; - }; - }; - }; - chnum = { - sshOpts = [ "-p" "22" ]; - hostname = "chnum"; - fastConnection = true; - profiles = { - system = { - sshUser = "thomas"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.chnum; - user = "root"; - }; - }; - }; asgard = { sshOpts = [ "-p" "22" ]; hostname = "asgard.boerger.ws"; @@ -389,7 +271,6 @@ inputs.deploy-rs.packages.${system}.default git - gnumake home-manager nixpkgs-fmt rage diff --git a/servers/asgard/boot.nix b/machines/asgard/boot.nix similarity index 100% rename from servers/asgard/boot.nix rename to machines/asgard/boot.nix diff --git a/servers/asgard/default.nix b/machines/asgard/default.nix similarity index 100% rename from servers/asgard/default.nix rename to machines/asgard/default.nix diff --git a/servers/asgard/disko.nix b/machines/asgard/disko.nix similarity index 100% rename from servers/asgard/disko.nix rename to machines/asgard/disko.nix diff --git a/desktops/chnum/extras.nix b/machines/asgard/extras.nix similarity index 100% rename from desktops/chnum/extras.nix rename to machines/asgard/extras.nix diff --git a/servers/asgard/hardware.nix b/machines/asgard/hardware.nix similarity index 100% rename from servers/asgard/hardware.nix rename to machines/asgard/hardware.nix diff --git a/servers/asgard/networking.nix b/machines/asgard/networking.nix similarity index 100% rename from servers/asgard/networking.nix rename to machines/asgard/networking.nix diff --git a/servers/utgard/boot.nix b/machines/utgard/boot.nix similarity index 100% rename from servers/utgard/boot.nix rename to machines/utgard/boot.nix diff --git a/servers/utgard/default.nix b/machines/utgard/default.nix similarity index 100% rename from servers/utgard/default.nix rename to machines/utgard/default.nix diff --git a/servers/utgard/disko.nix b/machines/utgard/disko.nix similarity index 100% rename from servers/utgard/disko.nix rename to machines/utgard/disko.nix diff --git a/servers/asgard/extras.nix b/machines/utgard/extras.nix similarity index 100% rename from servers/asgard/extras.nix rename to machines/utgard/extras.nix diff --git a/desktops/anubis/hardware.nix b/machines/utgard/hardware.nix similarity index 100% rename from desktops/anubis/hardware.nix rename to machines/utgard/hardware.nix diff --git a/servers/utgard/networking.nix b/machines/utgard/networking.nix similarity index 100% rename from servers/utgard/networking.nix rename to machines/utgard/networking.nix diff --git a/servers/vanaheim/boot.nix b/machines/vanaheim/boot.nix similarity index 100% rename from servers/vanaheim/boot.nix rename to machines/vanaheim/boot.nix diff --git a/servers/vanaheim/default.nix b/machines/vanaheim/default.nix similarity index 100% rename from servers/vanaheim/default.nix rename to machines/vanaheim/default.nix diff --git a/servers/vanaheim/disko.nix b/machines/vanaheim/disko.nix similarity index 100% rename from servers/vanaheim/disko.nix rename to machines/vanaheim/disko.nix diff --git a/servers/vanaheim/extras.nix b/machines/vanaheim/extras.nix similarity index 100% rename from servers/vanaheim/extras.nix rename to machines/vanaheim/extras.nix diff --git a/desktops/chnum/hardware.nix b/machines/vanaheim/hardware.nix similarity index 100% rename from desktops/chnum/hardware.nix rename to machines/vanaheim/hardware.nix diff --git a/servers/vanaheim/networking.nix b/machines/vanaheim/networking.nix similarity index 100% rename from servers/vanaheim/networking.nix rename to machines/vanaheim/networking.nix diff --git a/servers/yggdrasil/boot.nix b/machines/yggdrasil/boot.nix similarity index 100% rename from servers/yggdrasil/boot.nix rename to machines/yggdrasil/boot.nix diff --git a/servers/yggdrasil/default.nix b/machines/yggdrasil/default.nix similarity index 100% rename from servers/yggdrasil/default.nix rename to machines/yggdrasil/default.nix diff --git a/servers/utgard/extras.nix b/machines/yggdrasil/extras.nix similarity index 100% rename from servers/utgard/extras.nix rename to machines/yggdrasil/extras.nix diff --git a/servers/yggdrasil/filesystems.nix b/machines/yggdrasil/filesystems.nix similarity index 100% rename from servers/yggdrasil/filesystems.nix rename to machines/yggdrasil/filesystems.nix diff --git a/servers/yggdrasil/hardware.nix b/machines/yggdrasil/hardware.nix similarity index 100% rename from servers/yggdrasil/hardware.nix rename to machines/yggdrasil/hardware.nix diff --git a/servers/yggdrasil/networking.nix b/machines/yggdrasil/networking.nix similarity index 100% rename from servers/yggdrasil/networking.nix rename to machines/yggdrasil/networking.nix diff --git a/home/adrian/default.nix b/profiles/adrian/default.nix similarity index 100% rename from home/adrian/default.nix rename to profiles/adrian/default.nix diff --git a/home/adrian/desktop/default.nix b/profiles/adrian/desktop/default.nix similarity index 100% rename from home/adrian/desktop/default.nix rename to profiles/adrian/desktop/default.nix diff --git a/home/adrian/desktop/gnome.nix b/profiles/adrian/desktop/gnome.nix similarity index 100% rename from home/adrian/desktop/gnome.nix rename to profiles/adrian/desktop/gnome.nix diff --git a/home/adrian/face.jpg b/profiles/adrian/face.jpg similarity index 100% rename from home/adrian/face.jpg rename to profiles/adrian/face.jpg diff --git a/home/adrian/programs/default.nix b/profiles/adrian/programs/default.nix similarity index 100% rename from home/adrian/programs/default.nix rename to profiles/adrian/programs/default.nix diff --git a/home/adrian/services/default.nix b/profiles/adrian/services/default.nix similarity index 100% rename from home/adrian/services/default.nix rename to profiles/adrian/services/default.nix diff --git a/home/adrian/user.nix b/profiles/adrian/user.nix similarity index 100% rename from home/adrian/user.nix rename to profiles/adrian/user.nix diff --git a/home/anna/default.nix b/profiles/anna/default.nix similarity index 100% rename from home/anna/default.nix rename to profiles/anna/default.nix diff --git a/home/anna/desktop/default.nix b/profiles/anna/desktop/default.nix similarity index 100% rename from home/anna/desktop/default.nix rename to profiles/anna/desktop/default.nix diff --git a/home/anna/desktop/gnome.nix b/profiles/anna/desktop/gnome.nix similarity index 100% rename from home/anna/desktop/gnome.nix rename to profiles/anna/desktop/gnome.nix diff --git a/home/anna/face.jpg b/profiles/anna/face.jpg similarity index 100% rename from home/anna/face.jpg rename to profiles/anna/face.jpg diff --git a/home/anna/programs/default.nix b/profiles/anna/programs/default.nix similarity index 100% rename from home/anna/programs/default.nix rename to profiles/anna/programs/default.nix diff --git a/home/anna/services/default.nix b/profiles/anna/services/default.nix similarity index 100% rename from home/anna/services/default.nix rename to profiles/anna/services/default.nix diff --git a/home/anna/user.nix b/profiles/anna/user.nix similarity index 100% rename from home/anna/user.nix rename to profiles/anna/user.nix diff --git a/home/shared/global/default.nix b/profiles/shared/global/default.nix similarity index 100% rename from home/shared/global/default.nix rename to profiles/shared/global/default.nix diff --git a/home/shared/global/dircolors.nix b/profiles/shared/global/dircolors.nix similarity index 100% rename from home/shared/global/dircolors.nix rename to profiles/shared/global/dircolors.nix diff --git a/home/shared/global/direnv.nix b/profiles/shared/global/direnv.nix similarity index 100% rename from home/shared/global/direnv.nix rename to profiles/shared/global/direnv.nix diff --git a/home/shared/global/fzf.nix b/profiles/shared/global/fzf.nix similarity index 100% rename from home/shared/global/fzf.nix rename to profiles/shared/global/fzf.nix diff --git a/home/shared/global/general.nix b/profiles/shared/global/general.nix similarity index 100% rename from home/shared/global/general.nix rename to profiles/shared/global/general.nix diff --git a/home/shared/global/lsd.nix b/profiles/shared/global/lsd.nix similarity index 100% rename from home/shared/global/lsd.nix rename to profiles/shared/global/lsd.nix diff --git a/home/shared/global/neovim.nix b/profiles/shared/global/neovim.nix similarity index 100% rename from home/shared/global/neovim.nix rename to profiles/shared/global/neovim.nix diff --git a/home/shared/global/readline.nix b/profiles/shared/global/readline.nix similarity index 100% rename from home/shared/global/readline.nix rename to profiles/shared/global/readline.nix diff --git a/home/shared/global/starship.nix b/profiles/shared/global/starship.nix similarity index 100% rename from home/shared/global/starship.nix rename to profiles/shared/global/starship.nix diff --git a/home/shared/global/tmux.nix b/profiles/shared/global/tmux.nix similarity index 100% rename from home/shared/global/tmux.nix rename to profiles/shared/global/tmux.nix diff --git a/home/shared/modules/default.nix b/profiles/shared/modules/default.nix similarity index 100% rename from home/shared/modules/default.nix rename to profiles/shared/modules/default.nix diff --git a/home/shared/programs/act.nix b/profiles/shared/programs/act.nix similarity index 100% rename from home/shared/programs/act.nix rename to profiles/shared/programs/act.nix diff --git a/home/shared/programs/banking.nix b/profiles/shared/programs/banking.nix similarity index 100% rename from home/shared/programs/banking.nix rename to profiles/shared/programs/banking.nix diff --git a/home/shared/programs/citrix.nix b/profiles/shared/programs/citrix.nix similarity index 100% rename from home/shared/programs/citrix.nix rename to profiles/shared/programs/citrix.nix diff --git a/home/shared/programs/clouds.nix b/profiles/shared/programs/clouds.nix similarity index 100% rename from home/shared/programs/clouds.nix rename to profiles/shared/programs/clouds.nix diff --git a/home/shared/programs/default.nix b/profiles/shared/programs/default.nix similarity index 100% rename from home/shared/programs/default.nix rename to profiles/shared/programs/default.nix diff --git a/home/shared/programs/develop.nix b/profiles/shared/programs/develop.nix similarity index 100% rename from home/shared/programs/develop.nix rename to profiles/shared/programs/develop.nix diff --git a/home/shared/programs/gnupg.nix b/profiles/shared/programs/gnupg.nix similarity index 100% rename from home/shared/programs/gnupg.nix rename to profiles/shared/programs/gnupg.nix diff --git a/home/shared/programs/golang.nix b/profiles/shared/programs/golang.nix similarity index 100% rename from home/shared/programs/golang.nix rename to profiles/shared/programs/golang.nix diff --git a/home/shared/programs/gomplate.nix b/profiles/shared/programs/gomplate.nix similarity index 100% rename from home/shared/programs/gomplate.nix rename to profiles/shared/programs/gomplate.nix diff --git a/home/shared/programs/graphics.nix b/profiles/shared/programs/graphics.nix similarity index 100% rename from home/shared/programs/graphics.nix rename to profiles/shared/programs/graphics.nix diff --git a/home/shared/programs/helm.nix b/profiles/shared/programs/helm.nix similarity index 100% rename from home/shared/programs/helm.nix rename to profiles/shared/programs/helm.nix diff --git a/home/shared/programs/joplin.nix b/profiles/shared/programs/joplin.nix similarity index 100% rename from home/shared/programs/joplin.nix rename to profiles/shared/programs/joplin.nix diff --git a/home/shared/programs/jq.nix b/profiles/shared/programs/jq.nix similarity index 100% rename from home/shared/programs/jq.nix rename to profiles/shared/programs/jq.nix diff --git a/home/shared/programs/jsonnet.nix b/profiles/shared/programs/jsonnet.nix similarity index 100% rename from home/shared/programs/jsonnet.nix rename to profiles/shared/programs/jsonnet.nix diff --git a/home/shared/programs/kubectl.nix b/profiles/shared/programs/kubectl.nix similarity index 100% rename from home/shared/programs/kubectl.nix rename to profiles/shared/programs/kubectl.nix diff --git a/home/shared/programs/kustomize.nix b/profiles/shared/programs/kustomize.nix similarity index 100% rename from home/shared/programs/kustomize.nix rename to profiles/shared/programs/kustomize.nix diff --git a/home/shared/programs/latex.nix b/profiles/shared/programs/latex.nix similarity index 100% rename from home/shared/programs/latex.nix rename to profiles/shared/programs/latex.nix diff --git a/home/shared/programs/lens.nix b/profiles/shared/programs/lens.nix similarity index 100% rename from home/shared/programs/lens.nix rename to profiles/shared/programs/lens.nix diff --git a/home/shared/programs/messages.nix b/profiles/shared/programs/messages.nix similarity index 100% rename from home/shared/programs/messages.nix rename to profiles/shared/programs/messages.nix diff --git a/home/shared/programs/minecraft.nix b/profiles/shared/programs/minecraft.nix similarity index 100% rename from home/shared/programs/minecraft.nix rename to profiles/shared/programs/minecraft.nix diff --git a/home/shared/programs/network.nix b/profiles/shared/programs/network.nix similarity index 100% rename from home/shared/programs/network.nix rename to profiles/shared/programs/network.nix diff --git a/home/shared/programs/ngrok.nix b/profiles/shared/programs/ngrok.nix similarity index 100% rename from home/shared/programs/ngrok.nix rename to profiles/shared/programs/ngrok.nix diff --git a/home/shared/programs/nodejs.nix b/profiles/shared/programs/nodejs.nix similarity index 100% rename from home/shared/programs/nodejs.nix rename to profiles/shared/programs/nodejs.nix diff --git a/home/shared/programs/office.nix b/profiles/shared/programs/office.nix similarity index 100% rename from home/shared/programs/office.nix rename to profiles/shared/programs/office.nix diff --git a/home/shared/programs/shortwave.nix b/profiles/shared/programs/shortwave.nix similarity index 100% rename from home/shared/programs/shortwave.nix rename to profiles/shared/programs/shortwave.nix diff --git a/home/shared/programs/streaming.nix b/profiles/shared/programs/streaming.nix similarity index 100% rename from home/shared/programs/streaming.nix rename to profiles/shared/programs/streaming.nix diff --git a/home/shared/programs/terminal.nix b/profiles/shared/programs/terminal.nix similarity index 100% rename from home/shared/programs/terminal.nix rename to profiles/shared/programs/terminal.nix diff --git a/home/shared/programs/terraform.nix b/profiles/shared/programs/terraform.nix similarity index 100% rename from home/shared/programs/terraform.nix rename to profiles/shared/programs/terraform.nix diff --git a/home/shared/programs/wine.nix b/profiles/shared/programs/wine.nix similarity index 100% rename from home/shared/programs/wine.nix rename to profiles/shared/programs/wine.nix diff --git a/home/shared/programs/yq.nix b/profiles/shared/programs/yq.nix similarity index 100% rename from home/shared/programs/yq.nix rename to profiles/shared/programs/yq.nix diff --git a/home/shared/programs/zathura.nix b/profiles/shared/programs/zathura.nix similarity index 100% rename from home/shared/programs/zathura.nix rename to profiles/shared/programs/zathura.nix diff --git a/home/shared/services/default.nix b/profiles/shared/services/default.nix similarity index 100% rename from home/shared/services/default.nix rename to profiles/shared/services/default.nix diff --git a/home/shared/services/nextcloud.nix b/profiles/shared/services/nextcloud.nix similarity index 100% rename from home/shared/services/nextcloud.nix rename to profiles/shared/services/nextcloud.nix diff --git a/home/shared/services/syncthing.nix b/profiles/shared/services/syncthing.nix similarity index 100% rename from home/shared/services/syncthing.nix rename to profiles/shared/services/syncthing.nix diff --git a/home/shared/services/udiskie.nix b/profiles/shared/services/udiskie.nix similarity index 100% rename from home/shared/services/udiskie.nix rename to profiles/shared/services/udiskie.nix diff --git a/home/tabea/default.nix b/profiles/tabea/default.nix similarity index 100% rename from home/tabea/default.nix rename to profiles/tabea/default.nix diff --git a/home/tabea/desktop/default.nix b/profiles/tabea/desktop/default.nix similarity index 100% rename from home/tabea/desktop/default.nix rename to profiles/tabea/desktop/default.nix diff --git a/home/tabea/desktop/gnome.nix b/profiles/tabea/desktop/gnome.nix similarity index 100% rename from home/tabea/desktop/gnome.nix rename to profiles/tabea/desktop/gnome.nix diff --git a/home/tabea/face.jpg b/profiles/tabea/face.jpg similarity index 100% rename from home/tabea/face.jpg rename to profiles/tabea/face.jpg diff --git a/home/tabea/programs/default.nix b/profiles/tabea/programs/default.nix similarity index 100% rename from home/tabea/programs/default.nix rename to profiles/tabea/programs/default.nix diff --git a/home/tabea/services/default.nix b/profiles/tabea/services/default.nix similarity index 100% rename from home/tabea/services/default.nix rename to profiles/tabea/services/default.nix diff --git a/home/tabea/user.nix b/profiles/tabea/user.nix similarity index 100% rename from home/tabea/user.nix rename to profiles/tabea/user.nix diff --git a/home/thomas/default.nix b/profiles/thomas/default.nix similarity index 100% rename from home/thomas/default.nix rename to profiles/thomas/default.nix diff --git a/home/thomas/desktop/default.nix b/profiles/thomas/desktop/default.nix similarity index 100% rename from home/thomas/desktop/default.nix rename to profiles/thomas/desktop/default.nix diff --git a/home/thomas/desktop/gnome.nix b/profiles/thomas/desktop/gnome.nix similarity index 100% rename from home/thomas/desktop/gnome.nix rename to profiles/thomas/desktop/gnome.nix diff --git a/home/thomas/desktop/i3.nix b/profiles/thomas/desktop/i3.nix similarity index 100% rename from home/thomas/desktop/i3.nix rename to profiles/thomas/desktop/i3.nix diff --git a/home/thomas/desktop/sway.nix b/profiles/thomas/desktop/sway.nix similarity index 100% rename from home/thomas/desktop/sway.nix rename to profiles/thomas/desktop/sway.nix diff --git a/home/thomas/face.jpg b/profiles/thomas/face.jpg similarity index 100% rename from home/thomas/face.jpg rename to profiles/thomas/face.jpg diff --git a/home/thomas/programs/autorandr.nix b/profiles/thomas/programs/autorandr.nix similarity index 100% rename from home/thomas/programs/autorandr.nix rename to profiles/thomas/programs/autorandr.nix diff --git a/home/thomas/programs/default.nix b/profiles/thomas/programs/default.nix similarity index 100% rename from home/thomas/programs/default.nix rename to profiles/thomas/programs/default.nix diff --git a/home/thomas/programs/git.nix b/profiles/thomas/programs/git.nix similarity index 100% rename from home/thomas/programs/git.nix rename to profiles/thomas/programs/git.nix diff --git a/home/thomas/programs/github.nix b/profiles/thomas/programs/github.nix similarity index 100% rename from home/thomas/programs/github.nix rename to profiles/thomas/programs/github.nix diff --git a/home/thomas/programs/gopass.nix b/profiles/thomas/programs/gopass.nix similarity index 100% rename from home/thomas/programs/gopass.nix rename to profiles/thomas/programs/gopass.nix diff --git a/home/thomas/programs/minio.nix b/profiles/thomas/programs/minio.nix similarity index 100% rename from home/thomas/programs/minio.nix rename to profiles/thomas/programs/minio.nix diff --git a/home/thomas/programs/netrc.nix b/profiles/thomas/programs/netrc.nix similarity index 100% rename from home/thomas/programs/netrc.nix rename to profiles/thomas/programs/netrc.nix diff --git a/home/thomas/programs/ssh.nix b/profiles/thomas/programs/ssh.nix similarity index 100% rename from home/thomas/programs/ssh.nix rename to profiles/thomas/programs/ssh.nix diff --git a/home/thomas/programs/vscode.nix b/profiles/thomas/programs/vscode.nix similarity index 100% rename from home/thomas/programs/vscode.nix rename to profiles/thomas/programs/vscode.nix diff --git a/home/thomas/scripts/each-dir.sh b/profiles/thomas/scripts/each-dir.sh similarity index 100% rename from home/thomas/scripts/each-dir.sh rename to profiles/thomas/scripts/each-dir.sh diff --git a/home/thomas/scripts/git-gh-pages.sh b/profiles/thomas/scripts/git-gh-pages.sh similarity index 100% rename from home/thomas/scripts/git-gh-pages.sh rename to profiles/thomas/scripts/git-gh-pages.sh diff --git a/home/thomas/scripts/git-promote.sh b/profiles/thomas/scripts/git-promote.sh similarity index 100% rename from home/thomas/scripts/git-promote.sh rename to profiles/thomas/scripts/git-promote.sh diff --git a/home/thomas/scripts/search-and-replace.sh b/profiles/thomas/scripts/search-and-replace.sh similarity index 100% rename from home/thomas/scripts/search-and-replace.sh rename to profiles/thomas/scripts/search-and-replace.sh diff --git a/home/thomas/secrets/github.age b/profiles/thomas/secrets/github.age similarity index 100% rename from home/thomas/secrets/github.age rename to profiles/thomas/secrets/github.age diff --git a/home/thomas/secrets/minio.age b/profiles/thomas/secrets/minio.age similarity index 100% rename from home/thomas/secrets/minio.age rename to profiles/thomas/secrets/minio.age diff --git a/home/thomas/secrets/netrc.age b/profiles/thomas/secrets/netrc.age similarity index 100% rename from home/thomas/secrets/netrc.age rename to profiles/thomas/secrets/netrc.age diff --git a/home/thomas/services/default.nix b/profiles/thomas/services/default.nix similarity index 100% rename from home/thomas/services/default.nix rename to profiles/thomas/services/default.nix diff --git a/home/thomas/user.nix b/profiles/thomas/user.nix similarity index 100% rename from home/thomas/user.nix rename to profiles/thomas/user.nix diff --git a/home/thomas/wallpapers/dark.jpg b/profiles/thomas/wallpapers/dark.jpg similarity index 100% rename from home/thomas/wallpapers/dark.jpg rename to profiles/thomas/wallpapers/dark.jpg diff --git a/home/thomas/wallpapers/light.jpg b/profiles/thomas/wallpapers/light.jpg similarity index 100% rename from home/thomas/wallpapers/light.jpg rename to profiles/thomas/wallpapers/light.jpg diff --git a/home/thomas/wallpapers/tower.jpg b/profiles/thomas/wallpapers/tower.jpg similarity index 100% rename from home/thomas/wallpapers/tower.jpg rename to profiles/thomas/wallpapers/tower.jpg diff --git a/servers/utgard/hardware.nix b/servers/utgard/hardware.nix deleted file mode 100644 index 2dfd030..0000000 --- a/servers/utgard/hardware.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - hardware = { - enableAllFirmware = true; - enableRedistributableFirmware = true; - - cpu = { - intel = { - updateMicrocode = lib.mkDefault true; - }; - }; - }; -} diff --git a/servers/vanaheim/hardware.nix b/servers/vanaheim/hardware.nix deleted file mode 100644 index 2dfd030..0000000 --- a/servers/vanaheim/hardware.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - hardware = { - enableAllFirmware = true; - enableRedistributableFirmware = true; - - cpu = { - intel = { - updateMicrocode = lib.mkDefault true; - }; - }; - }; -} diff --git a/servers/yggdrasil/extras.nix b/servers/yggdrasil/extras.nix deleted file mode 100644 index 88d8a3b..0000000 --- a/servers/yggdrasil/extras.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ }