diff --git a/host/federispitz/default.nix b/host/federispitz/default.nix deleted file mode 100644 index f682a77..0000000 --- a/host/federispitz/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, pkgs, ... }: { - - imports = [ - ./filesystems.nix - ./networking.nix - #./printing.nix - #./backup.nix #TODO: Extract applications from desktop role - - ../../hardware/thinkpad-t470s.nix - - ../../defaults/base - ../../defaults/cifs-auth-fix - ../../defaults/desktop - #../../defaults/games - ../../defaults/user-configuration - ../../defaults/user-configuration/fhauser - #../../defaults/printing - ]; - - #TODO: Clean up next section - services.xserver.dpi = 180; - - virtualisation = { # TODO: This should probably be somewhere else. - docker = { - enable = true; - enableOnBoot = false; - }; - libvirtd.enable = true; - }; - - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - - # This value determines the NixOS release from which the default - # settings for stateful data, like fi:le locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.05"; # Did you read the comment? - -} diff --git a/host/federispitz/filesystems.nix b/host/federispitz/filesystems.nix deleted file mode 100644 index 52e1d12..0000000 --- a/host/federispitz/filesystems.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, pkgs, lib, ... }: { - boot.initrd.luks.devices = { - "root".device = "/dev/disk/by-uuid/660b61d1-971d-4acc-9577-68a491eaf63b"; - "swap".device = "/dev/disk/by-uuid/350eebba-6641-46a0-be1d-a7197157b704"; - }; - - fileSystems = { - "/" = { - device = "/dev/mapper/root"; - fsType = "btrfs"; - options = [ "subvol=nixos" ]; - }; - "/home" = { - device = "/dev/mapper/root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/F2EF-1BBF"; - fsType = "vfat"; - }; - }; - - swapDevices = [{ device = "/dev/mapper/swap"; }]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - -} diff --git a/host/federispitz/networking.nix b/host/federispitz/networking.nix deleted file mode 100644 index 8c4ba74..0000000 --- a/host/federispitz/networking.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, pkgs, ... }: - -{ - - networking = { - networkmanager.enable = true; - useDHCP = false; - #wireless.enable = true; # Enables wireless support via wpa_supplicant. - hostName = "federispitz"; - }; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - #networking.wireguard.enable = true; - #networking.wireguard.interfaces = let - # meta = import ../../meta; - # vnetworks = meta.network.virtual; - # vnetworkName = "mgmt"; - #in { - # "wg-${vnetworkName}" = - # pkgs.lib.qois.wireguard.makeInterface config.networking.hostName - # vnetworkName vnetworks.${vnetworkName}; - #}; -} diff --git a/host/federispitz/printing.nix b/host/federispitz/printing.nix deleted file mode 100644 index bb07603..0000000 --- a/host/federispitz/printing.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, pkgs, ... }: - -{ - hardware.printers.ensureDefaultPrinter = "hsr-mfp-8261"; - hardware.printers.ensurePrinters = [{ - name = "hsr-mfp-8261"; - deviceUri = "smb://hsr.ch/printsrv-d.hsr.ch/d8261-a4mfp"; - location = "HSR 8.261"; - model = "HP/hp-color_laserjet_mfp_m577-ps.ppd.gz"; - ppdOptions = { - Duplex = "DuplexNoTumble"; - PageSize = "A4"; - auth-info-required = "username,password"; - }; - }]; -} diff --git a/host/hummelberg-old/default.nix b/host/hummelberg-old/default.nix deleted file mode 100644 index 4b0817b..0000000 --- a/host/hummelberg-old/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, pkgs, ... }: { - - imports = [ - ./filesystems.nix - ./networking.nix - ./printing.nix - #./backup.nix #TODO: Extract applications from desktop role - - ../../hardware/dell-precision-3530.nix - - ../../defaults/base - ../../defaults/cifs-auth-fix - ../../defaults/desktop - ../../defaults/development-tools - ../../defaults/games - ../../defaults/printing - ]; - - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "20.03"; # Did you read the comment? - -} diff --git a/host/hummelberg-old/filesystems.nix b/host/hummelberg-old/filesystems.nix deleted file mode 100644 index 2a89b97..0000000 --- a/host/hummelberg-old/filesystems.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ config, pkgs, lib, ... }: -let - networkShares = let - hsr_options = [ - "defaults" - "noauto" - #"iocharset=utf8" - "soft" - "user=fhauser" - "domain=hsr.ch" - "uid=1000" - "gid=1000" - ]; - hsr_share = share_name: - { domain ? "hsr.ch/root", path ? share_name, extra_options ? [ ] }: - lib.nameValuePair "/mnt/hsr/${share_name}" { - device = "//${domain}/${path}"; - fsType = "cifs"; - options = hsr_options ++ extra_options; - noCheck = true; - }; - in lib.mapAttrs' hsr_share { - "skripte".path = "alg/skripte"; - "scratch".path = "alg/scratch"; - "fhauser".domain = "c101.hsr.ch"; - #"fabian.hauser".domain = "svm-c113.ost.ch"; # User! - "afe" = { }; - "auw" = { }; - "ebooks" = { - path = "alg/ebooks"; - extra_options = [ "ro" ]; - }; - }; - -in { - boot.initrd.luks.devices = { - "root".device = "/dev/disk/by-uuid/28d2914f-c053-40a8-ad90-f2743190c772"; - "swap".device = "/dev/disk/by-uuid/ed89158d-4460-4012-86d7-f8761127371c"; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/6396b6eb-a7e6-430c-8c97-970404f88b35"; - fsType = "btrfs"; - options = [ "subvol=nixos" ]; - }; - "/home" = { - device = "/dev/disk/by-uuid/6396b6eb-a7e6-430c-8c97-970404f88b35"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/E86E-3C6C"; - fsType = "vfat"; - }; - } // networkShares; - - swapDevices = [{ device = "/dev/mapper/swap"; }]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - -} diff --git a/host/hummelberg-old/networking.nix b/host/hummelberg-old/networking.nix deleted file mode 100644 index 61cc2fd..0000000 --- a/host/hummelberg-old/networking.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, pkgs, ... }: - -{ - - networking = { - networkmanager.enable = true; - useDHCP = false; - #wireless.enable = true; # Enables wireless support via wpa_supplicant. - hostName = "hummelberg"; - }; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - networking.wireguard.enable = true; - networking.wireguard.interfaces = let - meta = import ../../meta; - vnetworks = meta.network.virtual; - vnetworkName = "mgmt"; - in { - "wg-${vnetworkName}" = - pkgs.lib.qois.wireguard.makeInterface config.networking.hostName - vnetworkName vnetworks.${vnetworkName}; - }; -} diff --git a/host/hummelberg-old/printing.nix b/host/hummelberg-old/printing.nix deleted file mode 100644 index bb07603..0000000 --- a/host/hummelberg-old/printing.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, pkgs, ... }: - -{ - hardware.printers.ensureDefaultPrinter = "hsr-mfp-8261"; - hardware.printers.ensurePrinters = [{ - name = "hsr-mfp-8261"; - deviceUri = "smb://hsr.ch/printsrv-d.hsr.ch/d8261-a4mfp"; - location = "HSR 8.261"; - model = "HP/hp-color_laserjet_mfp_m577-ps.ppd.gz"; - ppdOptions = { - Duplex = "DuplexNoTumble"; - PageSize = "A4"; - auth-info-required = "username,password"; - }; - }]; -}