diff --git a/oscar/configuration.nix b/oscar/configuration.nix index 29e058b..84b712a 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -6,8 +6,10 @@ { imports = - [ # Include the results of the hardware scan. + [ + ./hardware-configuration.nix + ]; # https://discourse.nixos.org/t/github-strategies-for-configuration-nix/1983/14 @@ -50,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 = { @@ -65,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; @@ -89,16 +95,31 @@ # 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 + prismlauncher + libreoffice-qt + # thunderbird ]; + + programs.bash.enable = true; + programs.emacs = { + 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: @@ -129,7 +150,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 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."/" =