Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:69ad5319786c9c014463b655324ef5ba0c400f4d
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:933b4fb9bb7459cffe704a91ec1a4075ce948e9c
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "69ad5319786c9c014463b655324ef5ba0c400f4d" and "933b4fb9bb7459cffe704a91ec1a4075ce948e9c" have entirely different histories.
69ad531978 ... 933b4fb9bb

2 changed files with 5 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

9
roles/kde/plasma.nix
View file

@ -19,12 +19,8 @@ let
in
{
services.xserver = {
# Enable the Plasma 5 Desktop Environment
desktopManager.plasma5.enable = true;
displayManager.defaultSession = "plasmawayland";
};
# Enable the Plasma 5 Desktop Environment.
services.xserver.desktopManager.plasma5.enable = true;
# GTK apps need dconf to grab the correct theme on Wayland
programs.dconf.enable = true;
@ -61,4 +57,5 @@ in
"xdg/gtkrc-2.0".text = gtk1and2settings;
"xdg/gtkrc".text = gtk1and2settings;
};
environment.systemPackages = [pkgs.yaru-theme];
}

46
roles/kde/sddm.nix
View file

@ -1,57 +1,15 @@
{ config, pkgs, ... }:
let
currentTheme = config.services.xserver.displayManager.sddm.theme;
sddm-sugar-candy = pkgs.stdenv.mkDerivation {
pname = "sddm-sugar-candy";
version = "master";
src = pkgs.fetchgit {
url = "https://framagit.org/MarianArlt/sddm-sugar-candy.git";
hash = "sha256-XggFVsEXLYklrfy1ElkIp9fkTw4wvXbyVkaVCZq4ZLU=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/sddm/themes/sugar-candy
cp -r /build/sddm-sugar-candy/* $out/share/sddm/themes/sugar-candy
runHook postInstall
'';
};
/*
Adds a theme.conf.user file to the current sddm theme's folder,
allowing you to change it's configuration without needing to
repackage it
*/
customcfg = pkgs.stdenv.mkDerivation {
name = "sddm-theme-customizer";
dontUnpack = true;
# TODO: generate theme.conf.user outside of installPhase
installPhase = ''
runHook preInstall
mkdir -p $out/share/sddm/themes/${currentTheme}/
echo "[General]
background = ${pkgs.plasma-workspace-wallpapers}/share/wallpapers/MilkyWay/contents/images/5120x2880.png" >> $out/share/sddm/themes/${currentTheme}/theme.conf.user
runHook postInstall
'';
};
in
{ config, ... }:
{
# Enable SDDM.
services.xserver.displayManager.sddm = {
enable = true;
theme = "sugar-candy";
settings = {
General = { Numlock = "on"; };
};
};
environment.systemPackages = [ sddm-sugar-candy customcfg ];
/*
Sddm has a very annoying bug where it sometimes hangs at shutdown
if you use Plasma's wayland session. The bug is already fixed upstream,