diff --git a/hosts/wim/configuration.nix b/hosts/wim/configuration.nix index 63d16688..84acd56b 100644 --- a/hosts/wim/configuration.nix +++ b/hosts/wim/configuration.nix @@ -1,4 +1,4 @@ -{ hyprland, pkgs, ... }: { +{ ... }: { imports = [ ./hardware-configuration.nix @@ -9,6 +9,7 @@ ../../modules/proton-bridge.nix ../../modules/sddm-wayland.nix + ./modules/desktop.nix ./modules/security.nix ]; @@ -16,9 +17,6 @@ isNormalUser = true; extraGroups = [ "wheel" "input" "uinput" "adm" "mlocate" "video" "libvirtd" ]; }; - - programs.dconf.enable = true; - # TODO: use hm for tmux home-manager.users = { matt = { @@ -49,49 +47,6 @@ firewall.enable = false; }; - services = { - xserver = { - displayManager = { - sessionPackages = [ - hyprland.packages.x86_64-linux.default - ]; - defaultSession = "hyprland"; - - autoLogin = { - enable = true; - user = "matt"; - }; - }; - - libinput.enable = true; - }; - dbus.enable = true; - gvfs.enable = true; - flatpak.enable = true; - tlp.enable = true; - }; - - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; - }; - - environment.systemPackages = with pkgs; [ - # for sddm - plasma5Packages.plasma-framework - plasma5Packages.plasma-workspace - - qemu - wl-clipboard - alsa-utils - evtest - plasma5Packages.kio-admin - plasma5Packages.ksshaskpass - ]; - # Set your time zone. time.timeZone = "America/Montreal"; diff --git a/hosts/wim/modules/desktop.nix b/hosts/wim/modules/desktop.nix new file mode 100644 index 00000000..a215929d --- /dev/null +++ b/hosts/wim/modules/desktop.nix @@ -0,0 +1,46 @@ +{ hyprland, pkgs, ... }: { + programs.dconf.enable = true; + + services = { + xserver = { + displayManager = { + sessionPackages = [ + hyprland.packages.x86_64-linux.default + ]; + defaultSession = "hyprland"; + + autoLogin = { + enable = true; + user = "matt"; + }; + }; + + libinput.enable = true; + }; + dbus.enable = true; + gvfs.enable = true; + flatpak.enable = true; + tlp.enable = true; + }; + + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + ]; + }; + + environment.systemPackages = with pkgs; [ + # for sddm + plasma5Packages.plasma-framework + plasma5Packages.plasma-workspace + + qemu + wl-clipboard + alsa-utils + evtest + plasma5Packages.kio-admin + plasma5Packages.ksshaskpass + ]; +}