diff --git a/configurations/hp500281.nix b/configurations/hp500281.nix index 2b3607cf..fb403b80 100644 --- a/configurations/hp500281.nix +++ b/configurations/hp500281.nix @@ -4,7 +4,7 @@ let in { imports = [ - ../users/nrd.nix + ../users/nrd ../profiles/graphical ../profiles/misc ]; diff --git a/pkgs/applications/display-managers/sddm/themes/chili/default.nix b/pkgs/applications/display-managers/sddm/themes/chili/default.nix new file mode 100644 index 00000000..539f0e7a --- /dev/null +++ b/pkgs/applications/display-managers/sddm/themes/chili/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchFromGitHub, ... }: +stdenv.mkDerivation rec { + name = "sddm-chili"; + version = "0.5.5"; + src = fetchFromGitHub { + owner = "MarianArlt"; + repo = "kde-plasma-chili"; + rev = "${version}"; + hash = "sha256-fWRf96CPRQ2FRkSDtD+N/baZv+HZPO48CfU5Subt854="; + }; + + installPhase = '' + mkdir -p $out/share/sddm/themes/chili + + cp -r * $out/share/sddm/themes/chili + ''; +} diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix index 88134918..ca0081fc 100644 --- a/profiles/graphical/default.nix +++ b/profiles/graphical/default.nix @@ -43,8 +43,6 @@ in # Theme settings QT_QPA_PLATFORMTHEME = "gtk2"; - GDK_PIXBUF_MODULE_FILE = - "$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)"; GTK2_RC_FILES = let gtk = '' gtk-icon-theme-name="Papirus-Adapta" @@ -75,11 +73,23 @@ in papirus-icon-theme qute qutebrowser + sddm-chili youtubeDL zathura ]; }; + services.xserver = { + enable = true; + + desktopManager.plasma5.enable = true; + + displayManager.sddm = { + enable = true; + theme = "chili"; + }; + }; + nixpkgs.overlays = let overlay = self: super: { qute = super.writeShellScriptBin "qute" '' @@ -90,6 +100,8 @@ in [icon theme] Inherits=Adwaita ''; + + sddm-chili = super.callPackage ../../pkgs/applications/display-managers/sddm/themes/chili {}; }; in [ overlay ]; diff --git a/users/nrd.nix b/users/nrd/default.nix similarity index 85% rename from users/nrd.nix rename to users/nrd/default.nix index d4606798..48fc1b30 100644 --- a/users/nrd.nix +++ b/users/nrd/default.nix @@ -15,7 +15,7 @@ let in { imports = [ - ../profiles/develop + ../../profiles/develop ]; programs.gnupg.agent = { @@ -24,6 +24,7 @@ in }; environment.systemPackages = with pkgs; [ + nrd-logo pinentry_gnome ]; @@ -32,8 +33,8 @@ in packages = mkForce []; file = { - ".ec2-keys".source = ../secrets/ec2; - ".cargo/credentials".source = ../secrets/cargo; + ".ec2-keys".source = ../../secrets/ec2; + ".cargo/credentials".source = ../../secrets/cargo; ".zshrc".text = "#"; }; }; @@ -135,10 +136,10 @@ in matchBlocks = let githubKey = toFile "github" - (readFile ../secrets/github); + (readFile ../../secrets/github); gitlabKey = toFile "gitlab" - (readFile ../secrets/gitlab); + (readFile ../../secrets/gitlab); in { github = { @@ -170,7 +171,7 @@ in uid = 1000; description = name; isNormalUser = true; - hashedPassword = fileContents ../secrets/nrd; + hashedPassword = fileContents ../../secrets/nrd; extraGroups = [ "wheel" "input" @@ -178,4 +179,19 @@ in "adbusers" ]; }; + + nixpkgs.overlays = let + overlay = self: super: { + nrd-logo = super.stdenv.mkDerivation { + name = "nrdxp-logo"; + src = ./logo.png; + dontUnpack = true; + installPhase = '' + mkdir -p $out/share/sddm/faces + cp $src $out/share/sddm/faces/nrd.face.icon + ''; + }; + }; + in + [ overlay ]; } diff --git a/users/nrd/logo.png b/users/nrd/logo.png new file mode 100644 index 00000000..efae7134 Binary files /dev/null and b/users/nrd/logo.png differ