diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix deleted file mode 100644 index 7f96406d..00000000 --- a/hosts/t490/configuration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ inputs, ... }: - -{ - imports = [ - inputs.agenix.nixosModules.default - inputs.nixos-hardware.nixosModules.common-gpu-intel - inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t490 - - ../common - - ./hardware-configuration.nix - ./services - - ../../users/luke.nix - ../../users/opdavies.nix - ]; - - nixpad.enable = true; - - boot = { - loader = { - efi.canTouchEfiVariables = true; - - systemd-boot.enable = true; - systemd-boot.configurationLimit = 10; - }; - }; - - systemd.settings.Manager = { - DefaultTimeoutStopSec = "10s"; - }; - - networking.networkmanager.enable = true; -} diff --git a/hosts/t490/hardware-configuration.nix b/hosts/t490/hardware-configuration.nix deleted file mode 100644 index 944633ab..00000000 --- a/hosts/t490/hardware-configuration.nix +++ /dev/null @@ -1,54 +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" - "nvme" - "usb_storage" - "sd_mod" - "rtsx_pci_sdmmc" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/001febe7-57e8-4c9a-bbaf-52c3d8305b63"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5F0A-3374"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/t490/services/cron.nix b/hosts/t490/services/cron.nix deleted file mode 100644 index a8872af2..00000000 --- a/hosts/t490/services/cron.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -{ - services.cron = { - enable = true; - - systemCronJobs = [ - "0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a" - ]; - }; -} diff --git a/hosts/t490/services/default.nix b/hosts/t490/services/default.nix deleted file mode 100644 index f626bbcb..00000000 --- a/hosts/t490/services/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - imports = [ - ./cron.nix - ./interception-tools.nix - ./udev.nix - ./xserver.nix - ]; - - services = { - auto-cpufreq.enable = true; - blueman.enable = true; - gvfs.enable = true; - power-profiles-daemon.enable = false; - printing.enable = true; - pulseaudio.enable = false; - throttled.enable = true; - thermald.enable = true; - upower.enable = true; - }; -} diff --git a/hosts/t490/services/interception-tools.nix b/hosts/t490/services/interception-tools.nix deleted file mode 100644 index 96e43b85..00000000 --- a/hosts/t490/services/interception-tools.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: - -{ - # Make Caps lock work as an Escape key on press and Ctrl on hold. - services.interception-tools = - let - dfkConfig = pkgs.writeText "dual-function-keys.yaml" '' - MAPPINGS: - - KEY: KEY_CAPSLOCK - TAP: KEY_ESC - HOLD: KEY_LEFTCTRL - ''; - in - { - enable = true; - plugins = pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ]; - udevmonConfig = '' - - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE" - DEVICE: - NAME: "AT Translated Set 2 keyboard" - EVENTS: - EV_KEY: [[KEY_CAPSLOCK, KEY_ESC, KEY_LEFTCTRL]] - ''; - }; -} diff --git a/hosts/t490/services/udev.nix b/hosts/t490/services/udev.nix deleted file mode 100644 index 732ca1d6..00000000 --- a/hosts/t490/services/udev.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - services.udev = { - enable = true; - - extraRules = '' - KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" - ''; - }; -} diff --git a/hosts/t490/services/xserver.nix b/hosts/t490/services/xserver.nix deleted file mode 100644 index 4120a2cf..00000000 --- a/hosts/t490/services/xserver.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - services.xserver = { - enable = true; - - xkb = { - layout = "gb"; - variant = ""; - }; - }; -} diff --git a/modules2/hosts/t490/imports.nix b/modules2/hosts/t490/imports.nix deleted file mode 100644 index f7afa2ed..00000000 --- a/modules2/hosts/t490/imports.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, ... }: - -{ - flake.modules.nixos."nixosConfigurations/t490".imports = with config.flake.modules.nixos; [ - pc - ]; -} diff --git a/modules2/nixos-configurations.nix b/modules2/nixos-configurations.nix index 883af57a..9e9a732a 100644 --- a/modules2/nixos-configurations.nix +++ b/modules2/nixos-configurations.nix @@ -51,12 +51,6 @@ modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ]; }; - t490 = mkNixosConfiguration rec { - hostname = "t490"; - - modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ]; - }; - PW05CH3L = mkNixosConfiguration rec { hostname = "PW05CH3L"; modules = [ config.flake.modules.nixos."nixosConfigurations/${hostname}" ];