diff options
| -rw-r--r-- | configuration.nix | 35 | ||||
| -rw-r--r-- | desktop.nix | 30 | ||||
| -rw-r--r-- | hardware-configuration.nix | 32 | ||||
| -rw-r--r-- | pc_t14.nix | 44 |
4 files changed, 70 insertions, 71 deletions
diff --git a/configuration.nix b/configuration.nix index e410470..7bd3fde 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,20 +5,19 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./pc_t14.nix - ./desktop.nix - ]; - - boot = { - tmpOnTmpfs = true; - supportedFilesystems = [ "ntfs" ]; - kernel.sysctl = { + imports = [ + ./hardware-configuration.nix + ./pc_t14.nix + ./desktop.nix + ]; + + boot = { + tmpOnTmpfs = true; + supportedFilesystems = [ "ntfs" ]; + kernel.sysctl = { "kernel.sysrq"=1; }; - }; + }; # Enable sound. sound.enable = true; @@ -58,8 +57,8 @@ # services.openssh.enable = true; programs = { - ssh.startAgent = false; - gnupg.agent = { + ssh.startAgent = false; + gnupg.agent = { enable = true; enableSSHSupport = true; pinentryFlavor = "gtk2"; @@ -68,7 +67,7 @@ programs.dconf.enable = true; services = { - udev.packages = [ pkgs.yubikey-personalization ]; + udev.packages = [ pkgs.yubikey-personalization ]; }; # Define a user account. Don't forget to set a password with ‘passwd’. @@ -78,7 +77,7 @@ extraGroups = [ "wheel" "video" "vboxusers" "cdrom" ]; }; - virtualisation.docker.enable = false; + virtualisation.docker.enable = false; # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database @@ -97,8 +96,8 @@ aspell aspellDicts.da aspellDicts.en pv acpi jq killall netcat-gnu perl gopass cowsay gdb man-pages sox gcc binutils python3 python - # Nixos stuff - nox + # Nixos stuff + nox # Network stuff networkmanagerapplet networkmanager-openconnect iw batctl diff --git a/desktop.nix b/desktop.nix index 2da180f..136b35c 100644 --- a/desktop.nix +++ b/desktop.nix @@ -1,14 +1,14 @@ { config, pkgs, ... }: { - hardware.pulseaudio = { - enable = true; - # Stupid but need it to control sound from acpid - # systemWide = true; + hardware.pulseaudio = { + enable = true; + # Stupid but need it to control sound from acpid + # systemWide = true; - # Enable bluetooth audio - package = pkgs.pulseaudioFull; - }; + # Enable bluetooth audio + package = pkgs.pulseaudioFull; + }; services = { xserver = { @@ -58,20 +58,20 @@ GRANT ALL PRIVILEGES ON DATABASE julian TO julian; ''; }; - }; + }; - virtualisation.virtualbox.host.enable = true; + virtualisation.virtualbox.host.enable = true; fonts.fonts = with pkgs; [ noto-fonts noto-fonts-emoji liberation_ttf ubuntu_font_family cozette ]; - environment.systemPackages = with pkgs; [ - gopass + environment.systemPackages = with pkgs; [ + gopass - # Developing - rustup gcc go clang-tools + # Developing + rustup gcc go clang-tools # X stuff feh rofi xorg.xmodmap xss-lock xclip xorg.xkill @@ -90,5 +90,5 @@ # Other stuff texlive.combined.scheme-medium biber youtube-dl sshpass python38Packages.pynvim - ]; -} + ]; + } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index e38eebc..5f08e39 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -4,30 +4,30 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/stuff/root"; - fsType = "ext4"; + fileSystems."/" = + { device = "/dev/stuff/root"; + fsType = "ext4"; }; - fileSystems."/home" = - { device = "/dev/stuff/home"; - fsType = "ext4"; + fileSystems."/home" = + { device = "/dev/stuff/home"; + fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/7178-78A1"; - fsType = "vfat"; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/7178-78A1"; + fsType = "vfat"; }; - swapDevices = [ ]; + swapDevices = [ ]; } @@ -1,36 +1,36 @@ { config, pkgs, ... }: { - networking = { - hostName = "nixT14s"; + networking = { + hostName = "nixT14s"; interfaces.enp2s0f0.useDHCP = true; interfaces.wlp3s0.useDHCP = true; - }; - - boot = { - kernelPackages = pkgs.linuxPackages_latest; - loader = { - systemd-boot.enable = true; - - efi.canTouchEfiVariables = true; - efi.efiSysMountPoint = "/boot"; - }; - initrd.luks.devices = { - lvmroot = { - device = "/dev/disk/by-uuid/3aa2923c-928d-4050-82dc-21be53b2af8e"; - preLVM = true; - }; - }; + }; + + boot = { + kernelPackages = pkgs.linuxPackages_latest; + loader = { + systemd-boot.enable = true; + + efi.canTouchEfiVariables = true; + efi.efiSysMountPoint = "/boot"; + }; + initrd.luks.devices = { + lvmroot = { + device = "/dev/disk/by-uuid/3aa2923c-928d-4050-82dc-21be53b2af8e"; + preLVM = true; + }; + }; }; hardware.acpilight.enable = true; - services.tlp.enable = true; + services.tlp.enable = true; - environment.systemPackages = with pkgs; [ - linuxPackages.acpi_call - ]; + environment.systemPackages = with pkgs; [ + linuxPackages.acpi_call + ]; } |