From 9845c5f79e75f48bfe2ea972ba17eed706fc6c77 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 17 Apr 2017 14:02:04 +0200 Subject: Refactor --- bragi-hw.nix | 34 ---------------------------------- bragi.nix | 2 +- bragi/hw.nix | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 bragi-hw.nix create mode 100644 bragi/hw.nix diff --git a/bragi-hw.nix b/bragi-hw.nix deleted file mode 100644 index f355ffa0..00000000 --- a/bragi-hw.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = - [ - ]; - - boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "usb_storage" ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - boot.loader.grub.device = "/dev/disk/by-id/ata-Crucial_CT256M550SSD3_15010E5F81A6"; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/15fc072d-5fdf-4ec7-b029-50d09b4dc5ea"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/c76d9b7c-ba84-49d3-a7c9-b53e201b76c6"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/2b13b997-59e8-4f59-bc84-554eb0df7482"; } - ]; - - nix.maxJobs = 2; - - boot.loader.grub.extraConfig = "serial; terminal_output.serial"; - boot.kernelParams = [ "console=ttyS0,115200" - ]; - - nixpkgs.system = "i686-linux"; -} diff --git a/bragi.nix b/bragi.nix index a79428cc..10d4b65d 100644 --- a/bragi.nix +++ b/bragi.nix @@ -7,7 +7,7 @@ let in rec { imports = [ ./musnix - ./bragi-hw.nix + ./bragi/hw.nix ./custom/zsh.nix ./users.nix ]; diff --git a/bragi/hw.nix b/bragi/hw.nix new file mode 100644 index 00000000..f355ffa0 --- /dev/null +++ b/bragi/hw.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "usb_storage" ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + boot.loader.grub.device = "/dev/disk/by-id/ata-Crucial_CT256M550SSD3_15010E5F81A6"; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/15fc072d-5fdf-4ec7-b029-50d09b4dc5ea"; + fsType = "ext4"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/c76d9b7c-ba84-49d3-a7c9-b53e201b76c6"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/2b13b997-59e8-4f59-bc84-554eb0df7482"; } + ]; + + nix.maxJobs = 2; + + boot.loader.grub.extraConfig = "serial; terminal_output.serial"; + boot.kernelParams = [ "console=ttyS0,115200" + ]; + + nixpkgs.system = "i686-linux"; +} -- cgit v1.2.3