From 64f9379194337797403fe41e749af89ca1eb182b Mon Sep 17 00:00:00 2001 From: Varris Date: Sun, 7 Aug 2022 17:11:24 +0200 Subject: [PATCH] update --- system/configuration.nix | 166 ++++++++++++++++++++++++++++++ system/hardware-configuration.nix | 62 +++++++++++ 2 files changed, 228 insertions(+) create mode 100644 system/configuration.nix create mode 100644 system/hardware-configuration.nix diff --git a/system/configuration.nix b/system/configuration.nix new file mode 100644 index 0000000..16b6a4e --- /dev/null +++ b/system/configuration.nix @@ -0,0 +1,166 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + nixpkgs.config.allowUnfree = true; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot = { + enable = true; + configurationLimit = 10; + }; + + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.availableKernelModules = [ "amdgpu" ]; + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelModules = [ "i2c-dev" "i2c-piix4" ]; + + networking.hostName = "terra"; # Define your hostname. + + # Set your time zone. + time.timeZone = "Europe/Vienna"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminus16"; + #keyMap = "us-intl"; + useXkbConfig = true; # use xkbOptions in tty. + }; + + hardware.opengl = { + enable = true; + extraPackages = [ + pkgs.libvdpau-va-gl + ]; + + driSupport = true; + driSupport32Bit = true; + }; + + hardware.steam-hardware.enable = true; + + hardware.bluetooth.enable = true; + + # Enable sound. + sound.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + security.doas.enable = true; + security.sudo.enable = false; + + security.doas.extraRules = [{ + users = [ "manuel" ]; + keepEnv = true; + persist = true; + }]; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.manuel = { + isNormalUser = true; + extraGroups = [ "wheel" "audio" "video" "games" "input" "geoclue" ]; # Enable ‘sudo’ for the user. + shell = pkgs.fish; + packages = with pkgs; [ + ]; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + links2 + ripgrep + fd + htop + openrgb + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + services.udev.packages = [ pkgs.openrgb ]; + + programs.dconf.enable = true; + + services.geoclue2 = { + enable = true; + appConfig."gammastep".isAllowed = true; + appConfig."gammastep".isSystem = false; + }; + + services.gnome.gnome-keyring.enable = true; + xdg.portal = { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-wlr + ]; + }; + + services.openssh = { + enable = true; + }; + + + nixpkgs.config.packageOverrides = pkgs: { + nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { + inherit pkgs; + }; + }; + + nix.gc = { + persistent = true; + automatic = true; + }; + nix.extraOptions = "experimental-features = nix-command flakes"; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; #broken with flakes + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.05"; # Did you read the comment? + +} + diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix new file mode 100644 index 0000000..f4f2e08 --- /dev/null +++ b/system/hardware-configuration.nix @@ -0,0 +1,62 @@ +# 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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85"; + fsType = "btrfs"; + options = [ "subvol=@nixos-root" "compress-force=zstd" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1AC9-E1AD"; + fsType = "vfat"; + }; + + fileSystems."/mnt/btrfs" = + { device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85"; + fsType = "btrfs"; + options = [ "subvol=@nixos-root" ]; + }; + + fileSystems."/mnt/hdd" = + { device = "/dev/disk/by-uuid/beccaf7e-9c7e-4c04-959b-52f1e0375491"; + fsType = "ext4"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/d94babc9-ef09-43bb-949d-ed477ff4f4c2"; + fsType = "ext4"; + }; + + fileSystems."/opt/games" = + { device = "/dev/disk/by-uuid/0981f787-9cb2-495e-95d5-611e0de24d85"; + fsType = "btrfs"; + options = [ "subvol=@steamgames" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/b7ec8c05-2a36-4b35-99fc-866e97c6330b"; } + ]; + + # 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.enp8s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}