From 32a0cd1df3e9de8cc52193663d051af0f6149d93 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 16 Dec 2023 02:30:55 -0700 Subject: khad is a new computer whoo! old khad lasted 9 years --- machines/khad/configuration.nix | 98 +++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 52 deletions(-) (limited to 'machines/khad/configuration.nix') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index 7527c7d..bf0e94f 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -10,16 +10,22 @@ ./hardware-configuration.nix ]; - # Use the systemd-boot EFI boot loader. - # boot.loader.grub.enable = true; - # boot.loader.grub.efiSupport = true; - # boot.loader.grub.devices = [ - # "/dev/sda" - # ]; - # boot.loader.grub.theme = pkgs.nixos-grub2-theme; + # Bootloader. boot.loader.systemd-boot.enable = true; - # boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.graceful = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = true; + + # Setup keyfile + boot.initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; + + # Enable swap on luks + boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".device = "/dev/disk/by-uuid/12daadca-e9a9-413b-9286-017b3038e5ba"; + boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".keyFile = "/crypto_keyfile.bin"; + + boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".keyFile = "/crypto_keyfile.bin"; + networking.hostName = "khad"; # Define your hostname. # Pick only one of the below networking options. @@ -32,7 +38,7 @@ config.allowUnfree = true; }; - services.xserver.videoDrivers = [ "nvidia" ]; + # services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.displayManager.sddm.autoNumlock = true; hardware.opengl = { enable = true; @@ -41,31 +47,31 @@ # needed by nvidia-docker driSupport32Bit = true; }; - hardware.nvidia = { - # Optionally, you may need to select the appropriate driver version for your specific GPU. - # packge = config.boot.kernelPackages.nvidiaPackages.stable; - - # Modesetting is needed for most Wayland compositors - modesetting.enable = true; - # Use the open source version of the kernel module - # Only available on driver 515.53.04+ - open = false; - - # powerManagement.enable = true; - }; - # virtualization.docker.enableNvidia = true; # for nvidia-docker environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/khad/configuration.nix"''; # Set your time zone. - time.timeZone = "US/Mountain"; + time.timeZone = "America/Denver"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; + 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"; + }; + # console = { # font = "Lat2-Terminus16"; # keyMap = "us"; @@ -73,49 +79,37 @@ # }; # # Enable the X11 windowing system. - # services.xserver.enable = true; + services.xserver.enable = true; # # Enable the Plasma 5 Desktop Environment. - # services.xserver.displayManager.sddm.enable = true; - # services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; # Configure keymap in X11 - # services.xserver.layout = "us"; + services.xserver.layout = "us"; # services.xserver.xkbOptions = "eurosign:e,caps:escape"; # Enable CUPS to print documents. - # services.printing.enable = true; + services.printing.enable = true; # Enable sound. sound.enable = true; - # hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = true; + security.rtkit.enable = true; #not sure what this does + 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; + }; # 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.defin= { - # isNormalUser = true; - # description = "Devin finlinson"; - # extraGroups = [ "wheel" "builders" "video" "input"]; # Enable ‘sudo’ for the user. - # shell = pkgs.nushell; - # hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0"; - # packages = with pkgs; [ - # firefox - # nushell - # tree - # ]; - # }; - - # 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. - # helix - # wget - # ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. -- cgit v1.2.3 From 2fe81747b1cf4fca99680bb54a12976844a148de Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 16 Dec 2023 02:32:53 -0700 Subject: duplicate line --- machines/khad/configuration.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'machines/khad/configuration.nix') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index bf0e94f..e5edc90 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -13,7 +13,6 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.enable = true; # Setup keyfile boot.initrd.secrets = { -- cgit v1.2.3 From def103b0b5761edd1ee31da295e1944f2b6fa822 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 16 Dec 2023 02:33:56 -0700 Subject: pipewire conflicts with pulseaudio --- machines/khad/configuration.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'machines/khad/configuration.nix') diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index e5edc90..b0f8490 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -95,7 +95,6 @@ # Enable sound. sound.enable = true; - hardware.pulseaudio.enable = true; security.rtkit.enable = true; #not sure what this does services.pipewire = { enable = true; -- cgit v1.2.3