From 861b93dadab50c1f8ac04ccbc2b77067dae53424 Mon Sep 17 00:00:00 2001 From: larstvei Date: Sat, 23 Aug 2025 17:03:38 +0200 Subject: [PATCH] First attempt at a nixos config for the thinkpad --- flake.nix | 10 ++ hosts/thinkpad/configuration.nix | 143 ++++++++++++++++++++++ hosts/thinkpad/hardware-configuration.nix | 56 +++++++++ hosts/thinkpad/variables.nix | 5 + system/nixos/default.nix | 1 + 5 files changed, 215 insertions(+) create mode 100644 hosts/thinkpad/configuration.nix create mode 100644 hosts/thinkpad/hardware-configuration.nix create mode 100644 hosts/thinkpad/variables.nix create mode 100644 system/nixos/default.nix diff --git a/flake.nix b/flake.nix index 324ec06..f829c4d 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ outputs = { darwin, + nixpkgs, home-manager, nix-rosetta-builder, emacs-larstvei, @@ -43,5 +44,14 @@ ]; }; }; + + nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit emacs-larstvei; }; + modules = [ + home-manager.nixosModules.default + ./hosts/thinkpad/configuration.nix + ]; + }; }; } diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix new file mode 100644 index 0000000..68fb6f7 --- /dev/null +++ b/hosts/thinkpad/configuration.nix @@ -0,0 +1,143 @@ +{ + config, + pkgs, + emacs-larstvei, + ... +}: +let + v = import ./variables.nix; +in +{ + imports = [ + ../../system + ../../system/nixos + ./hardware-configuration.nix + ]; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit emacs-larstvei; }; + users.${v.username}.imports = [ ../../home ]; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.${v.username} = { + isNormalUser = true; + description = "Lars Tveito"; + home = v.userHome; + extraGroups = [ + "networkmanager" + "wheel" + ]; + packages = with pkgs; [ ]; # keep empty; HM will provide user packages + }; + + networking.hostName = v.hostName; + + # Everything below is part of the default configuration. + + # Keep your user—just point to variables if you want + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # 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/Oslo"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.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 = "no"; + variant = ""; + }; + + # Configure console keymap + console.keyMap = "no"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + services.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; + + # Enable automatic login for the user. + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "larstvei"; + + # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 + systemd.services."getty@tty1".enable = false; + systemd.services."autovt@tty1".enable = false; + + # Install firefox. + programs.firefox.enable = true; + + # 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 + ]; + + # 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 = "25.05"; # Did you read the comment? + +} diff --git a/hosts/thinkpad/hardware-configuration.nix b/hosts/thinkpad/hardware-configuration.nix new file mode 100644 index 0000000..fa80fa5 --- /dev/null +++ b/hosts/thinkpad/hardware-configuration.nix @@ -0,0 +1,56 @@ +# 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" + "thunderbolt" + "nvme" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/731c3f4a-8d5a-4329-adf8-78cae3946f58"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7B4D-CA7D"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/35e15cf2-4657-4fc4-9bbd-9911031baa53"; } + ]; + + # 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.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/thinkpad/variables.nix b/hosts/thinkpad/variables.nix new file mode 100644 index 0000000..c686a53 --- /dev/null +++ b/hosts/thinkpad/variables.nix @@ -0,0 +1,5 @@ +{ + username = "larstvei"; + userHome = "/home/larstvei"; + hostName = "larstvei-think"; +} diff --git a/system/nixos/default.nix b/system/nixos/default.nix new file mode 100644 index 0000000..ffcd441 --- /dev/null +++ b/system/nixos/default.nix @@ -0,0 +1 @@ +{ }