From 93b7000b39bd75bad57b1dce3ca2eec361d98bb9 Mon Sep 17 00:00:00 2001 From: Andreas Schaafsma Date: Tue, 8 Oct 2024 05:58:59 +0200 Subject: [PATCH] added th0nkpad config --- configuration.nix.bak | 43 ------ flake.nix | 21 ++- .../configuration.nix | 0 systems/th0nkpad-nixos/configuration.nix | 137 ++++++++++++++++++ .../th0nkpad-nixos/hardware-configuration.nix | 39 +++++ 5 files changed, 196 insertions(+), 44 deletions(-) delete mode 100644 configuration.nix.bak rename configuration.nix => systems/drivebystation-nixos-wsl/configuration.nix (100%) create mode 100644 systems/th0nkpad-nixos/configuration.nix create mode 100644 systems/th0nkpad-nixos/hardware-configuration.nix diff --git a/configuration.nix.bak b/configuration.nix.bak deleted file mode 100644 index 28f010b..0000000 --- a/configuration.nix.bak +++ /dev/null @@ -1,43 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -# NixOS-WSL specific options are documented on the NixOS-WSL repository: -# https://github.com/nix-community/NixOS-WSL - -{ config, lib, pkgs, ... }: - -{ - imports = [ - # include NixOS-WSL modules - - ]; - - wsl.enable = true; - wsl.defaultUser = "nixos"; - - environment.systemPackages = with pkgs; [ - wget - git - vim - wget - curl - haxe - ]; - programs.nix-ld = { - enable = true; - package = pkgs.nix-ld-rs; - }; - - - # Enable Experimental Features - nix.settings.experimental-features = [ "nix-command" "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 = "24.05"; # Did you read the comment? -} diff --git a/flake.nix b/flake.nix index 88d0ae0..a4aa800 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ inherit system; modules = [ nixos-wsl.nixosModules.default - ./configuration.nix + ./systems/drivebystation-nixos-wsl/configuration.nix { system.stateVersion = "24.05"; wsl.enable = true; @@ -37,6 +37,25 @@ ]; specialArgs = { inherit inputs; }; }; + th0nkpad-nixos = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + ./systems/th0nkpad-nixos/configuration.nix + { + system.stateVersion = "24.05"; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + environment.systemPackages = [ + + ] + ++ installedPackages.mkPackages.packages; + programs.nix-ld = { + enable = true; + package = pkgs.nix-ld-rs; + }; + } + ]; + specialArgs = { inherit inputs; }; + }; }; }; } diff --git a/configuration.nix b/systems/drivebystation-nixos-wsl/configuration.nix similarity index 100% rename from configuration.nix rename to systems/drivebystation-nixos-wsl/configuration.nix diff --git a/systems/th0nkpad-nixos/configuration.nix b/systems/th0nkpad-nixos/configuration.nix new file mode 100644 index 0000000..bd5bb35 --- /dev/null +++ b/systems/th0nkpad-nixos/configuration.nix @@ -0,0 +1,137 @@ +# 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, lib, inputs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Enable Flakes and the accompanying new nix command-line tool + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "th0nkpad-nixos"; # 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 = "nl_NL.UTF-8"; + LC_IDENTIFICATION = "nl_NL.UTF-8"; + LC_MEASUREMENT = "nl_NL.UTF-8"; + LC_MONETARY = "nl_NL.UTF-8"; + LC_NAME = "nl_NL.UTF-8"; + LC_NUMERIC = "nl_NL.UTF-8"; + LC_PAPER = "nl_NL.UTF-8"; + LC_TELEPHONE = "nl_NL.UTF-8"; + LC_TIME = "nl_NL.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = "intl"; + }; + + # Configure console keymap + console.keyMap = "us-acentos"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + 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.andreas = { + isNormalUser = true; + description = "Andreas"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + # thunderbird + ]; + }; + + # Install firefox. + programs.firefox.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + git + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + ]; + + # 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 = "24.05"; # Did you read the comment? + +} diff --git a/systems/th0nkpad-nixos/hardware-configuration.nix b/systems/th0nkpad-nixos/hardware-configuration.nix new file mode 100644 index 0000000..8d25b20 --- /dev/null +++ b/systems/th0nkpad-nixos/hardware-configuration.nix @@ -0,0 +1,39 @@ +# 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" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/c086e859-700c-4b0d-bf3e-c69123ae796b"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3F16-845B"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + # 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.enp0s25.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}