diff --git a/README.md b/README.md index 26cf673..f79a90c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ # Nix-configuration +## Installing on a system: + +* create a new folder in machine for the system configuration +* create a symlink in the machine folder to the actual machine, called current + > e.g. $/etc/nixos/machine/> ln -s nucturne/ current + ## Steps to fully finish home-setup: * add home-manager channel to private channel-list (nix-channel add https://github.com/nix-community/home-manager/archive/release-21.05.tar.gz home-manager) diff --git a/configuration.nix b/configuration.nix index 49abf79..a73d045 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,7 +7,7 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./machine/current/hardware-configuration.nix ./programs/emacs ./programs/aspell.nix ]; diff --git a/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index 43d6e91..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,38 +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" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/da267a3c-34e3-4218-933f-10738ee61eb6"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/9ebd7aff-629b-449b-83d8-6381a04eb708"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/DE6D-C383"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e"; } - ]; - - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; -}