From 783ff6c4d3e66f004653ed32e128f387bf274f73 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sun, 7 Jul 2024 13:05:04 +0200 Subject: [PATCH] chore: remove obsolete p330 and apache configs --- flake.nix | 55 ---------------------- machines/apache/configuration.nix | 7 --- machines/apache/hardware-configuration.nix | 42 ----------------- machines/apache/home-mandlm.nix | 5 -- machines/p330/configuration.nix | 6 --- machines/p330/hardware-configuration.nix | 49 ------------------- machines/p330/home-mandlm.nix | 42 ----------------- 7 files changed, 206 deletions(-) delete mode 100644 machines/apache/configuration.nix delete mode 100644 machines/apache/hardware-configuration.nix delete mode 100644 machines/apache/home-mandlm.nix delete mode 100644 machines/p330/configuration.nix delete mode 100644 machines/p330/hardware-configuration.nix delete mode 100644 machines/p330/home-mandlm.nix diff --git a/flake.nix b/flake.nix index 45ac0d3..8853e0e 100644 --- a/flake.nix +++ b/flake.nix @@ -30,61 +30,6 @@ in { nixosConfigurations = { - apache = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - ./swp/configuration.nix - ./greetd.nix - ./users.nix - ./machines/apache/configuration.nix - ./machines/apache/hardware-configuration.nix - - home-manager.nixosModules.home-manager - { - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user theme; }; - home-manager.users.${user} = { - imports = [ - ./home-${user}.nix - ./machines/apache/home-${user}.nix - ./swp/home-${user}.nix - ]; - nixpkgs.config = nixpkgs-config; - nixpkgs.overlays = [ overlay-unstable ]; - }; - } - ]; - }; - - p330 = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./configuration.nix - ./swp/configuration.nix - ./greetd.nix - ./users.nix - ./machines/p330/configuration.nix - ./machines/p330/hardware-configuration.nix - nixos-hardware.nixosModules.lenovo-thinkstation-p330 - - home-manager.nixosModules.home-manager - { - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user theme; }; - home-manager.users.${user} = { - imports = [ - ./home-${user}.nix - ./machines/p330/home-${user}.nix - ./swp/home-${user}.nix - ]; - nixpkgs.config = nixpkgs-config; - nixpkgs.overlays = [ overlay-unstable ]; - }; - } - ]; - }; - yoga = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ diff --git a/machines/apache/configuration.nix b/machines/apache/configuration.nix deleted file mode 100644 index 7f30ab2..0000000 --- a/machines/apache/configuration.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: - -{ - networking.hostName = "apache"; - boot.loader.grub.enableCryptodisk = true; -} - diff --git a/machines/apache/hardware-configuration.nix b/machines/apache/hardware-configuration.nix deleted file mode 100644 index bc1d014..0000000 --- a/machines/apache/hardware-configuration.nix +++ /dev/null @@ -1,42 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/58100870-c0e2-414f-aa8a-2f2cde8ae4da"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices = { - crypt-nixos.device = "/dev/disk/by-uuid/4345618c-6968-465f-8ebd-1d76defc0f57"; - crypt-swap.device = "/dev/disk/by-uuid/fa3440af-0354-4299-860e-01a3b012416f"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/01E5-F47D"; - fsType = "vfat"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/9b775e18-ab8c-4647-9ab1-a51391af6d6d"; }]; - - networking.useDHCP = lib.mkDefault true; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - services.tlp.enable = true; -} diff --git a/machines/apache/home-mandlm.nix b/machines/apache/home-mandlm.nix deleted file mode 100644 index 6703119..0000000 --- a/machines/apache/home-mandlm.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, user, ... }: - -{ - programs.kitty.font.size = 12; -} diff --git a/machines/p330/configuration.nix b/machines/p330/configuration.nix deleted file mode 100644 index 14add4f..0000000 --- a/machines/p330/configuration.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: - -{ - networking.hostName = "p330"; - boot.loader.grub.enableCryptodisk = true; -} diff --git a/machines/p330/hardware-configuration.nix b/machines/p330/hardware-configuration.nix deleted file mode 100644 index 120d4b7..0000000 --- a/machines/p330/hardware-configuration.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - - boot.initrd.luks.devices = { - crypted = { - device = "/dev/disk/by-uuid/c24c9fba-fa0b-41a2-87c1-75edc7b3f64d"; - preLVM = true; - }; - }; - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/9c6e1dc3-a442-431d-8cf4-6eaf1e45c296"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/3B69-8F97"; - fsType = "vfat"; - }; - - fileSystems."/home" = - { - device = "/dev/disk/by-uuid/6a44edab-e602-40e9-85c4-cb8517862992"; - fsType = "ext4"; - }; - - fileSystems."/var/lib/docker" = - { - device = "/dev/disk/by-uuid/1f8dae67-1640-4688-ac86-b0e6f5095d6e"; - fsType = "ext4"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/b90199d6-05e8-4994-bf9d-7b07f10d583e"; }]; - - networking.useDHCP = lib.mkDefault true; - - console.font = "ter-u32n"; -} diff --git a/machines/p330/home-mandlm.nix b/machines/p330/home-mandlm.nix deleted file mode 100644 index 5921058..0000000 --- a/machines/p330/home-mandlm.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, lib, pkgs, user, ... }: - -{ - services.kanshi = { - enable = true; - - profiles = { - home_office_left = { - outputs = [ - { - criteria = "Samsung Electric Company U28E590 HTPJ404252"; - mode = "3840x2160"; - scale = 1.5; - status = "enable"; - position = "0,526"; - } - { - criteria = "Samsung Electric Company U28E590 HTPJ300612"; - mode = "3840x2160"; - scale = 1.5; - status = "enable"; - position = "2560,0"; - transform = "270"; - } - ]; - exec = '' - exec swaymsg workspace 0, move workspace to output '"Samsung Electric Company U28E590 HTPJ300612"' - exec swaymsg workspace 8, move workspace to output '"Samsung Electric Company U28E590 HTPJ300612"' - exec swaymsg workspace 6, move workspace to output '"Samsung Electric Company U28E590 HTPJ300612"' - exec swaymsg workspace 4, move workspace to output '"Samsung Electric Company U28E590 HTPJ300612"' - exec swaymsg workspace 2, move workspace to output '"Samsung Electric Company U28E590 HTPJ300612"' - - exec swaymsg workspace 9, move workspace to output '"Samsung Electric Company U28E590 HTPJ404252"' - exec swaymsg workspace 7, move workspace to output '"Samsung Electric Company U28E590 HTPJ404252"' - exec swaymsg workspace 5, move workspace to output '"Samsung Electric Company U28E590 HTPJ404252"' - exec swaymsg workspace 3, move workspace to output '"Samsung Electric Company U28E590 HTPJ404252"' - exec swaymsg workspace 1, move workspace to output '"Samsung Electric Company U28E590 HTPJ404252"' - ''; - }; - }; - }; -}