Merge pull request #1 from itepastra/plasma6

Plasma6
This commit is contained in:
Noa Aarts 2024-06-19 12:57:12 +02:00 committed by GitHub
commit 89fdd00365
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 40 additions and 17 deletions

View file

@ -10,6 +10,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/games/steam.nix ../../modules/games/steam.nix
../../modules/websites ../../modules/websites
../../modules/plasma
]; ];
boot = { boot = {
@ -184,7 +185,6 @@
hyprland = { hyprland = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland; package = inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
}; };
nix-ld.enable = true; nix-ld.enable = true;
@ -195,6 +195,7 @@
modules = { modules = {
games.steam.enable = true; games.steam.enable = true;
plasma.enable = true;
websites = { websites = {
enable = true; enable = true;
certMail = "acme@voorwaarts.nl"; certMail = "acme@voorwaarts.nl";
@ -234,7 +235,7 @@
jack.enable = true; jack.enable = true;
}; };
greetd = { greetd = {
enable = true; enable = false;
settings = rec { settings = rec {
initial_session = { initial_session = {
command = "${pkgs.hyprland}/bin/Hyprland"; command = "${pkgs.hyprland}/bin/Hyprland";
@ -262,6 +263,10 @@
}; };
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
}; };
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
flatpak.enable = true; flatpak.enable = true;
}; };

View file

@ -85,8 +85,8 @@
# # You can also set the file content immediately. # # You can also set the file content immediately.
# ".gradle/gradle.properties".text = '' # ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose # org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000 # org.gradle.daemon.idletimeout=3600000
# ''; # '';
}; };
@ -95,15 +95,15 @@
# Manager then you have to manually source 'hm-session-vars.sh' located at # Manager then you have to manually source 'hm-session-vars.sh' located at
# either # either
# #
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh # ~/.nix-profile/etc/profile.d/hm-session-vars.sh
# #
# or # 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 # 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; enable = true;
createDirectories = true; createDirectories = true;
}; };
portal = {
enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
};
}; };
@ -163,12 +159,12 @@
size = 32; size = 32;
package = package =
pkgs.runCommand "moveUp" { } '' pkgs.runCommand "moveUp" { } ''
mkdir -p $out/share/icons mkdir -p $out/share/icons
ln -s ${pkgs.fetchzip { ln -s ${pkgs.fetchzip {
url = url; url = url;
hash = hash; hash = hash;
}} $out/share/icons/${name} }} $out/share/icons/${name}
''; '';
}; };
in in
getFrom getFrom

6
modules/default.nix Normal file
View file

@ -0,0 +1,6 @@
{...}:
{
imports = [
./hyprland.nix
];
}

View file

@ -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 = "*";
};
}