diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 8761f7a..c8ca357 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -10,6 +10,7 @@ ./hardware-configuration.nix ../../modules/games/steam.nix ../../modules/websites + ../../modules/plasma ]; boot = { @@ -184,7 +185,6 @@ hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; - portalPackage = pkgs.xdg-desktop-portal-hyprland; }; nix-ld.enable = true; @@ -195,6 +195,7 @@ modules = { games.steam.enable = true; + plasma.enable = true; websites = { enable = true; certMail = "acme@voorwaarts.nl"; @@ -234,7 +235,7 @@ jack.enable = true; }; greetd = { - enable = true; + enable = false; settings = rec { initial_session = { command = "${pkgs.hyprland}/bin/Hyprland"; @@ -262,6 +263,10 @@ }; videoDrivers = [ "nvidia" ]; }; + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; flatpak.enable = true; }; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 41546b8..74af342 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -85,8 +85,8 @@ # # You can also set the file content immediately. # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 # ''; }; @@ -95,15 +95,15 @@ # Manager then you have to manually source 'hm-session-vars.sh' located at # either # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh # # or # - # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh + # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh # # or # - # /etc/profiles/per-user/noa/etc/profile.d/hm-session-vars.sh + # /etc/profiles/per-user/noa/etc/profile.d/hm-session-vars.sh # @@ -125,10 +125,6 @@ enable = true; createDirectories = true; }; - portal = { - enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; - }; }; @@ -163,12 +159,12 @@ size = 32; package = pkgs.runCommand "moveUp" { } '' - mkdir -p $out/share/icons - ln -s ${pkgs.fetchzip { - url = url; - hash = hash; - }} $out/share/icons/${name} - ''; + mkdir -p $out/share/icons + ln -s ${pkgs.fetchzip { + url = url; + hash = hash; + }} $out/share/icons/${name} + ''; }; in getFrom diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..d60d951 --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,6 @@ +{...}: +{ + imports = [ + ./hyprland.nix + ]; +} diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix new file mode 100644 index 0000000..cad526b --- /dev/null +++ b/modules/plasma/default.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, inputs, ... }: +let + cfg = config.modules.plasma; +in +{ + options.modules.plasma = { + enable = lib.mkEnableOption "enable kde plasma 6"; + }; + + + config = lib.mkIf cfg.enable { + services.desktopManager.plasma6.enable = true; + + xdg.portal.config.common.default = "*"; + }; +}