diff --git a/modules/configuration.nix b/modules/configuration.nix index 10f4746..0c18d80 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -14,7 +14,6 @@ version, system, pam-fprint-grosshack-pkg, - cookiez-assets, ... }: { #Assign Swap to the PC @@ -111,7 +110,7 @@ useUserPackages = true; users.${username} = ./home.nix; backupFileExtension = "backup"; # Automatically backs up conflicting files during activation - extraSpecialArgs = {inherit inputs username project version system host cookiez-assets;}; + extraSpecialArgs = {inherit inputs username project version system host;}; sharedModules = [inputs.plasma-manager.homeModules.plasma-manager]; }; diff --git a/modules/desktop-entries.nix b/modules/desktop-entries.nix index 2960dd9..53f2ac5 100644 --- a/modules/desktop-entries.nix +++ b/modules/desktop-entries.nix @@ -1,8 +1,8 @@ { pkgs, + inputs, username, project, - cookiez-assets, ... }: { xdg = { @@ -20,11 +20,13 @@ noDisplay = true; }; + dataFile."icons/hicolor/256x256/apps/vencord-custom.png".source = "${inputs.cookiez-assets}/apps/discord.png"; + desktopEntries."discord" = { categories = ["Network" "InstantMessaging" "Chat"]; exec = "vesktop %U"; genericName = "Internet Messenger"; - icon = "${cookiez-assets}/apps/discord.png"; + icon = "vencord-custom"; name = "Discord"; type = "Application"; }; @@ -38,6 +40,8 @@ type = "Application"; }; + dataFile."icons/hicolor/256x256/apps/kitty-custom.png".source = "${inputs.cookiez-assets}/apps/kitty.png"; + desktopEntries.kitty = { name = "kitty"; genericName = "Terminal emulator"; @@ -46,7 +50,8 @@ terminal = false; categories = ["System" "TerminalEmulator"]; - icon = "${cookiez-assets}/apps/kitty.png"; + #icon = "${inputs.cookiez-assets}/apps/kitty.png"; + icon = "kitty-custom"; }; desktopEntries."org.kde.kinfocenter" = { diff --git a/modules/hyprpaper/home.nix b/modules/hyprpaper/home.nix index 115a46d..f5cadfc 100644 --- a/modules/hyprpaper/home.nix +++ b/modules/hyprpaper/home.nix @@ -3,7 +3,6 @@ inputs, username, project, - cookiez-assets, ... }: { imports = [ @@ -14,18 +13,12 @@ enable = false; settings = { - preload = [ - #"/home/${username}/${project}/other/wallpaper1.png" - #"/home/${username}/${project}/other/wallpaper2.png" - #"/home/${username}/${project}/other/wallpaper3.png" - "${cookiez-assets}/wallpapers/pixel-desert.png" - ]; - wallpaper = [ - #"eDP-1,/home/${username}/${project}/other/wallpaper1.png" - #"eDP-1,/home/${username}/${project}/other/wallpaper2.png" - #"eDP-1,/home/${username}/${project}/other/wallpaper3.png" - "eDP-1,${cookiez-assets}/wallpapers/pixel-desert.png" + { + monitor = "eDP-1"; + path = "${inputs.cookiez-assets}/wallpapers/pixel-desert.png"; + fit_mode = "cover"; # optional, defaults to cover + } ]; }; }; diff --git a/plasma/default.nix b/plasma/default.nix index 89a599a..8846b2e 100644 --- a/plasma/default.nix +++ b/plasma/default.nix @@ -1,20 +1,20 @@ { config, + inputs, pkgs, username, project, - cookiez-assets, ... }: let # Define the custom background package with the correct relative path - # background-package = pkgs.stdenvNoCC.mkDerivation { - # name = "background-image"; - # src = ../other/wallpaper4.png; # Place wallpaper.jpg in the same directory as this config file - # dontUnpack = true; - # installPhase = '' - # cp $src $out - # ''; - # }; + background-package = pkgs.stdenvNoCC.mkDerivation { + name = "background-image"; + src = "${inputs.cookiez-assets}/wallpapers/forest-cat.png"; # Place wallpaper.jpg in the same directory as this config file + dontUnpack = true; + installPhase = '' + cp $src $out + ''; + }; plasmaTheme = "desktop"; #Possible values are "laptop" or "desktop" powerProfile = "laptop"; #Possible values are "laptop" or "desktop" in { @@ -25,7 +25,7 @@ in { # Pass the variable to home-manager home-manager.extraSpecialArgs = { - inherit plasmaTheme powerProfile cookiez-assets; + inherit plasmaTheme powerProfile; }; home-manager.sharedModules = [ @@ -80,10 +80,10 @@ in { ]; systemPackages = with pkgs; [ - #(pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' - # [General] - # background = "${background-package}" - #'') #Custom SDDM theme with background image + (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' + [General] + background = "${background-package}" + '') #Custom SDDM theme with background image kdePackages.plymouth-kcm xdg-desktop-portal kdePackages.xdg-desktop-portal-kde diff --git a/plasma/settings/desktop.nix b/plasma/settings/desktop.nix index 8449c38..f135b08 100644 --- a/plasma/settings/desktop.nix +++ b/plasma/settings/desktop.nix @@ -4,7 +4,6 @@ username, project, plasmaTheme, - cookiez-assets, ... }: { programs = { @@ -124,7 +123,7 @@ }; }; configFile = { - plasmarc.Wallpapers.usersWallpapers = "${cookiez-assets}/wallpapers/pixel-desert.png"; + plasmarc.Wallpapers.usersWallpapers = "${inputs.cookiez-assets}/wallpapers/pixel-desert.png"; }; }; };