From aba48fe096d67d0fbe43ac795c5b79441641db58 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Fri, 29 Aug 2025 16:00:10 -0400 Subject: [PATCH] vixen: refresh --- configurations/nixos/vixen/README.md | 3 - configurations/nixos/vixen/configuration.nix | 78 ++++++++----------- configurations/nixos/vixen/default.nix | 11 +++ .../nixos/vixen/hardware-configuration.nix | 8 +- 4 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 configurations/nixos/vixen/README.md diff --git a/configurations/nixos/vixen/README.md b/configurations/nixos/vixen/README.md deleted file mode 100644 index a89b085..0000000 --- a/configurations/nixos/vixen/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## Thinkpad P14s NixOS configuration - -I currently don't use this. The P14s is running Windows for occasional gaming. diff --git a/configurations/nixos/vixen/configuration.nix b/configurations/nixos/vixen/configuration.nix index eeaa42d..99d3808 100644 --- a/configurations/nixos/vixen/configuration.nix +++ b/configurations/nixos/vixen/configuration.nix @@ -25,66 +25,56 @@ # Enable networking networking.networkmanager.enable = true; - # Set your time zone. - time.timeZone = "America/New_York"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + i18n.defaultLocale = "en_CA.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 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 = ""; }; # 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; + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.srid = { isNormalUser = true; - description = "srid"; + description = "Sridhar Ratnakumar"; extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - # thunderbird - ]; }; - # Allow unfree packages nixpkgs.config.allowUnfree = 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; + services.openssh.enable = true; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions @@ -92,6 +82,6 @@ # 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.11"; # Did you read the comment? + system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix index 9d4bcea..b1ecaca 100644 --- a/configurations/nixos/vixen/default.nix +++ b/configurations/nixos/vixen/default.nix @@ -5,6 +5,8 @@ let inherit (inputs) self; in { + nixos-unified.sshTarget = "srid@192.168.2.40"; + imports = [ self.nixosModules.default inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen4 @@ -12,6 +14,15 @@ in ./configuration.nix ]; + # https://nixos.wiki/wiki/Steam + boot.kernelPackages = pkgs.linuxPackages_latest; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; + boot.initrd.kernelModules = [ "amdgpu" ]; services.tailscale.enable = true; } diff --git a/configurations/nixos/vixen/hardware-configuration.nix b/configurations/nixos/vixen/hardware-configuration.nix index 25811ae..a65d323 100644 --- a/configurations/nixos/vixen/hardware-configuration.nix +++ b/configurations/nixos/vixen/hardware-configuration.nix @@ -9,20 +9,22 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/3741a848-da2c-4d57-8087-54a3134d19b8"; + device = "/dev/disk/by-uuid/e835307c-249c-4413-ab9c-6fe2e8f5306e"; fsType = "ext4"; }; + boot.initrd.luks.devices."luks-81fcafb1-5995-4981-bf68-3c70968b6d53".device = "/dev/disk/by-uuid/81fcafb1-5995-4981-bf68-3c70968b6d53"; + fileSystems."/boot" = { - device = "/dev/disk/by-uuid/E1A4-419A"; + device = "/dev/disk/by-uuid/B2E1-63B3"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; };