From c74e827255ddc3c030701831acca88ef1b9b9f08 Mon Sep 17 00:00:00 2001 From: twoneis Date: Wed, 5 Jun 2024 23:57:02 +0200 Subject: [PATCH] bit of cleanup --- devices/akarso/default.nix | 39 ------------------- devices/akarso/disko.nix | 60 ------------------------------ devices/akarso/hardware-config.nix | 38 ------------------- devices/akarso/options.nix | 14 ------- flake.lock | 16 -------- flake.nix | 4 -- outputs.nix | 18 +-------- 7 files changed, 1 insertion(+), 188 deletions(-) delete mode 100644 devices/akarso/default.nix delete mode 100644 devices/akarso/disko.nix delete mode 100644 devices/akarso/hardware-config.nix delete mode 100644 devices/akarso/options.nix diff --git a/devices/akarso/default.nix b/devices/akarso/default.nix deleted file mode 100644 index a597523..0000000 --- a/devices/akarso/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, ... }: { - imports = [ - ./hardware-config.nix - ./options.nix - ]; - - networking.hostName = "akarso"; - - users.users.twoneis.extraGroups = [ "surface-control" ]; - - boot.loader = { - systemd-boot = { - enable = true; - }; - efi.canTouchEfiVariables = true; - }; - - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; - }; - - services.thermald.enable = true; - - microsoft-surface = { - ipts.enable = true; - surface-control.enable = true; - }; - - system.stateVersion = "23.05"; - -} diff --git a/devices/akarso/disko.nix b/devices/akarso/disko.nix deleted file mode 100644 index ba3b601..0000000 --- a/devices/akarso/disko.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - disko.devices = { - disk = { - vda = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - settings = { - allowDiscards = true; - }; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - }; - swap = { - swapfile = { - size = "8G"; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/devices/akarso/hardware-config.nix b/devices/akarso/hardware-config.nix deleted file mode 100644 index cb4d017..0000000 --- a/devices/akarso/hardware-config.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ config, lib, ... }: { - boot = { - initrd = { - availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; - kernelModules = [ ]; - luks.devices.cryptroot.device = "/dev/disk/by-uuid/A7FE-359B"; - }; - kernelModules = [ "kvm-intel" ]; - extraModulePackages = [ ]; - }; - - fileSystems = { - "/boot" = { - device = "/dev/disk/by-uuid/A7FE-359B"; - fsType = "vfat"; - }; - "/" = { - device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; - fsType = "btrfs"; - options = [ "subvol=root" "compress=zstd" "noatime" ]; - }; - "/nix" = { - device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress=zstd" "noatime" ]; - }; - "/persist" = { - device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; - fsType = "btrfs"; - options = [ "subvol=persist" "compress=zstd" "noatime" ]; - }; - }; - - networking.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/devices/akarso/options.nix b/devices/akarso/options.nix deleted file mode 100644 index 719044f..0000000 --- a/devices/akarso/options.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: { - minimal = false; - - withAudio = true; - withBluetooth = true; - withNvidia = false; - - withNiri = true; - withGnome = false; - - withVM = false; - withContainers = false; - withGames = false; -} diff --git a/flake.lock b/flake.lock index 1d8fac8..de8911d 100644 --- a/flake.lock +++ b/flake.lock @@ -323,21 +323,6 @@ "type": "github" } }, - "nixos-hardware": { - "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1700612854, @@ -465,7 +450,6 @@ "inputs": { "home-manager": "home-manager", "niri": "niri", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nur": "nur" } diff --git a/flake.nix b/flake.nix index cbc14ef..07fba05 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-hardware = { - url = "github:nixos/nixos-hardware"; - }; - nur = { url = "github:nix-community/nur"; }; diff --git a/outputs.nix b/outputs.nix index e0aa32a..c19909d 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,4 +1,4 @@ -{ nixpkgs, home-manager, nixos-hardware, niri, ... }@inputs: { +{ nixpkgs, home-manager, niri, ... }@inputs: { nixosConfigurations = { # AMD Ryzen 5600X # nvidia GeForce GTX 1060 (6GB) @@ -16,22 +16,6 @@ ]; }; - # Surface Pro 7 (i5 128GB) - akarso = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit inputs; - }; - modules = [ - ./devices/akarso - ./modules - ./options.nix - nixos-hardware.nixosModules.microsoft-surface-pro-intel - niri.nixosModules.niri - home-manager.nixosModules.home-manager - ]; - }; - # Zotac Mini pleniscenta = nixpkgs.lib.nixosSystem { system = "x86_64-linux";