From 79a372de03dd67754034967004ce3e436b4ae6f9 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:12:06 -0500 Subject: [PATCH 1/8] Run latest kernel instead of LTS --- oscar/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/oscar/hardware-configuration.nix b/oscar/hardware-configuration.nix index 4fa05a6..ed7c834 100644 --- a/oscar/hardware-configuration.nix +++ b/oscar/hardware-configuration.nix @@ -11,6 +11,7 @@ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.extraModulePackages = [ ]; fileSystems."/" = From 45b51d92d0fbdd897dabd68fecba43dc260758bd Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:13:44 -0500 Subject: [PATCH 2/8] Add nixos-hardware import --- oscar/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 29e058b..4e64556 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -6,7 +6,8 @@ { imports = - [ # Include the results of the hardware scan. + [ + ./hardware-configuration.nix ]; From 774c1136596388d8e1bc7449b0ae0cb4f3ea5db1 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:14:35 -0500 Subject: [PATCH 3/8] Add home-manager --- oscar/configuration.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 4e64556..e94dfd4 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -9,6 +9,7 @@ [ ./hardware-configuration.nix + ]; # https://discourse.nixos.org/t/github-strategies-for-configuration-nix/1983/14 @@ -90,16 +91,28 @@ # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.chandler = { - isNormalUser = true; - description = "Chandler Swift"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ + users.users.chandler.isNormalUser = true; + users.users.chandler.description = "Chandler Swift"; + users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" ]; + home-manager.users.chandler = { pkgs, ... }: { + home.packages = with pkgs; [ firefox kate git # thunderbird ]; + + programs.bash.enable = true; + programs.emacs.enable = { + enable = true; + extraPackages = epkgs: [ + epkgs.nix-mode + epkgs.magit + epkgs.rust-mode + ]; + }; + + home.stateVersion = "23.11"; }; # List packages installed in system profile. To search, run: From b6a8a32a38f06bb06678d5785e6c7486487d1b2f Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:15:49 -0500 Subject: [PATCH 4/8] Fix warnings about moved configuration options --- oscar/configuration.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index e94dfd4..060e5bc 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -52,14 +52,10 @@ LC_TIME = "en_US.UTF-8"; }; - # Enable the X11 windowing system. - services.xserver.enable = true; - # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.sddm.wayland.enable = true; - services.xserver.desktopManager.plasma6.enable = true; - #services.xserver.desktopManager.plasma5.enable = false; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.desktopManager.plasma6.enable = true; # Configure keymap in X11 services.xserver.xkb = { From 350aec12ef3e941fe5f0e49f3feac8fb7ff08129 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:20:07 -0500 Subject: [PATCH 5/8] Enable some services --- oscar/configuration.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 060e5bc..d1a684e 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -63,9 +63,17 @@ variant = ""; }; + services.fwupd.enable = true; + # Enable CUPS to print documents. services.printing.enable = true; + services.hardware.bolt.enable = true; + + virtualisation.docker.enable = true; + + hardware.bluetooth.enable = true; + # Enable sound with pipewire. sound.enable = true; hardware.pulseaudio.enable = false; From b9a28d4115b8e3f7e73ddff0717afbb994ff95fc Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:20:15 -0500 Subject: [PATCH 6/8] Disable the firewall --- oscar/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index d1a684e..4fb2087 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -147,7 +147,7 @@ # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. - # networking.firewall.enable = false; + networking.firewall.enable = false; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions From bb8d2762b35beac3160df0610c7478ef80c18cac Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:20:30 -0500 Subject: [PATCH 7/8] Add prismlauncher and libreoffice-qt --- oscar/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 4fb2087..e008d51 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -103,6 +103,9 @@ firefox kate git + prismlauncher + libreoffice-qt + # thunderbird ]; From 8ed77d3964101a715b3b4746d88e0e7d2e1c23df Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Thu, 23 May 2024 23:57:13 -0500 Subject: [PATCH 8/8] Fix messed up emacs option --- oscar/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscar/configuration.nix b/oscar/configuration.nix index e008d51..84b712a 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -110,7 +110,7 @@ ]; programs.bash.enable = true; - programs.emacs.enable = { + programs.emacs = { enable = true; extraPackages = epkgs: [ epkgs.nix-mode