From a4112e11fd03d342875f55f2707c609842d41b4a Mon Sep 17 00:00:00 2001 From: twoneis Date: Thu, 2 Nov 2023 05:16:00 +0100 Subject: [PATCH] starte modularizing configuration for use with surface --- .../{configuration.nix => desktop-config.nix} | 27 +--- ...ration.nix => desktop-hardware-config.nix} | 0 base-system/flake.nix | 9 +- base-system/surface-config.nix | 143 ++++++++++++++++++ base-system/surface-hardware-config.nix | 40 +++++ base-system/system-packages.nix | 10 ++ base-system/user-core-packages.nix | 9 ++ base-system/user-game-packages.nix | 3 + 8 files changed, 217 insertions(+), 24 deletions(-) rename base-system/{configuration.nix => desktop-config.nix} (89%) rename base-system/{hardware-configuration.nix => desktop-hardware-config.nix} (100%) create mode 100644 base-system/surface-config.nix create mode 100644 base-system/surface-hardware-config.nix create mode 100644 base-system/system-packages.nix create mode 100644 base-system/user-core-packages.nix create mode 100644 base-system/user-game-packages.nix diff --git a/base-system/configuration.nix b/base-system/desktop-config.nix similarity index 89% rename from base-system/configuration.nix rename to base-system/desktop-config.nix index 6fb2afb..5a27d42 100644 --- a/base-system/configuration.nix +++ b/base-system/desktop-config.nix @@ -7,7 +7,7 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./desktop-hardware-config.nix ]; # Enable nix flakes @@ -87,7 +87,7 @@ }; # Enable CUPS to print documents. - services.printing.enable = true; + services.printing.enable = false; # Enable sound with pipewire. sound.enable = true; @@ -114,17 +114,7 @@ isNormalUser = true; description = "twoneis"; extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - gnome.nautilus - firefox - thunderbird - helix - gnomeExtensions.paperwm - armcord - signal-desktop - steam - spotify - ]; + packages = import ./user-core-packages.nix pkgs ++ import ./user-game-packages.nix pkgs; }; # Allow unfree packages @@ -132,16 +122,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ - alacritty - git - gh - man-pages - man-pages-posix - xorg.xeyes - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - ]; + environment.systemPackages = import ./system-packages.nix pkgs; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/base-system/hardware-configuration.nix b/base-system/desktop-hardware-config.nix similarity index 100% rename from base-system/hardware-configuration.nix rename to base-system/desktop-hardware-config.nix diff --git a/base-system/flake.nix b/base-system/flake.nix index 5941de1..816c7e2 100644 --- a/base-system/flake.nix +++ b/base-system/flake.nix @@ -22,9 +22,16 @@ specialArgs = { inherit system; }; modules = [ - ./configuration.nix + ./desktop-config.nix ]; }; + nixsurface = nixpkgs.lib.nixosSystem { + specialArgs = { inherit system; }; + + modules = [ + ./surface-config.nix + ]; + } }; }; } diff --git a/base-system/surface-config.nix b/base-system/surface-config.nix new file mode 100644 index 0000000..7446c1d --- /dev/null +++ b/base-system/surface-config.nix @@ -0,0 +1,143 @@ +# 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. + ./surface-hardware-config.nix + ]; + + # Enable nix flakes + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Disable documentation + documentation.nixos.enable = false; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "nixsurface"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Enable OpenGL + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Remove XTerm + services.xserver.excludePackages = [ pkgs.xterm ]; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + # Don't pull unnecessary packages + services.gnome.core-utilities.enable = false; + environment.gnome.excludePackages = [ pkgs.gnome-tour ]; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.twoneis = { + isNormalUser = true; + description = "twoneis"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = import ./user-core-packages.nix pkgs; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = import ./system-packages.nix pkgs; + + # 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; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # 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 = "23.05"; # Did you read the comment? + +} + diff --git a/base-system/surface-hardware-config.nix b/base-system/surface-hardware-config.nix new file mode 100644 index 0000000..87e44a6 --- /dev/null +++ b/base-system/surface-hardware-config.nix @@ -0,0 +1,40 @@ +# 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/95b15244-c97c-42a5-9be1-ed5df6872dcb"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BF87-B3DE"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/b6445ced-1cc2-461f-a81f-6e8409c10f48"; } + ]; + + # 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.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/base-system/system-packages.nix b/base-system/system-packages.nix new file mode 100644 index 0000000..3e7d9b1 --- /dev/null +++ b/base-system/system-packages.nix @@ -0,0 +1,10 @@ +pkgs: with pkgs: [ + alacritty + git + man-pages + man-pages-posix + firefox + gnome.nautilus + vlc + image-roll +] diff --git a/base-system/user-core-packages.nix b/base-system/user-core-packages.nix new file mode 100644 index 0000000..6db8bec --- /dev/null +++ b/base-system/user-core-packages.nix @@ -0,0 +1,9 @@ +pkgs: with pkgs: [ + gnomeExtensions.paperwm + thunderbird + helix + gh + discord + signal-desktop + spotify +] diff --git a/base-system/user-game-packages.nix b/base-system/user-game-packages.nix new file mode 100644 index 0000000..0401d49 --- /dev/null +++ b/base-system/user-game-packages.nix @@ -0,0 +1,3 @@ +pkgs: with pkgs: [ + steam +]