diff --git a/flake.lock b/flake.lock index 7e93802..01417c6 100644 --- a/flake.lock +++ b/flake.lock @@ -91,6 +91,26 @@ "type": "github" } }, + "cookiez-assets": { + "flake": false, + "locked": { + "lastModified": 1776155298, + "lfs": true, + "narHash": "sha256-cOiaPp5vRLc6LglqgMoXXBHLCqixVM5YuJsI1Zj+kv4=", + "ref": "main", + "rev": "10e02d22a16707548897047323fe78ccf5d58dc1", + "shallow": true, + "type": "git", + "url": "https://gitea.cookiee.org/cookiez/Nix-Assets.git" + }, + "original": { + "lfs": true, + "ref": "main", + "shallow": true, + "type": "git", + "url": "https://gitea.cookiee.org/cookiez/Nix-Assets.git" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -527,6 +547,7 @@ "root": { "inputs": { "alejandra": "alejandra", + "cookiez-assets": "cookiez-assets", "grub2-themes": "grub2-themes", "home-manager": "home-manager", "niri": "niri", diff --git a/flake.nix b/flake.nix index 9861608..022a550 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + cookiez-assets = { + url = "git+https://gitea.cookiee.org/cookiez/Nix-Assets.git?ref=main&lfs=1&shallow=1"; + flake = false; + }; + nix-flatpak.url = "github:gmodena/nix-flatpak"; grub2-themes.url = "github:vinceliuice/grub2-themes"; @@ -53,6 +58,7 @@ nixpkgs, alejandra, pam-fprint-grosshack, + cookiez-assets, home-manager, plasma-manager, nixos-hardware, @@ -83,6 +89,7 @@ inherit system; inherit project; inherit alejandra; + inherit cookiez-assets; pam-fprint-grosshack-pkg = pam-fprint-grosshack.packages.${system}.default; host = hostname; }; diff --git a/modules/configuration.nix b/modules/configuration.nix index 5c3c52b..38d0ae5 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -14,6 +14,7 @@ version, system, pam-fprint-grosshack-pkg, + cookiez-assets, ... }: { #Assign Swap to the PC @@ -99,7 +100,7 @@ useUserPackages = true; users.${username} = ./home.nix; backupFileExtension = "backup"; # Automatically backs up conflicting files during activation - extraSpecialArgs = {inherit inputs username project version system host;}; + extraSpecialArgs = {inherit inputs username project version system host cookiez-assets;}; sharedModules = [inputs.plasma-manager.homeModules.plasma-manager]; }; diff --git a/modules/desktop-entries.nix b/modules/desktop-entries.nix index 77758f2..25649f3 100644 --- a/modules/desktop-entries.nix +++ b/modules/desktop-entries.nix @@ -2,6 +2,7 @@ pkgs, username, project, + cookiez-assets, ... }: { xdg = { @@ -23,7 +24,7 @@ categories = ["Network" "InstantMessaging" "Chat"]; exec = "vesktop %U"; genericName = "Internet Messenger"; - icon = "/home/${username}/${project}/other/discord.app.png"; + icon = "${cookiez-assets}/apps/discord.png"; name = "Discord"; type = "Application"; }; @@ -45,7 +46,7 @@ terminal = false; categories = ["System" "TerminalEmulator"]; - icon = "/home/${username}/${project}/other/kitty.app.png"; + icon = "${cookiez-assets}/apps/kitty.png"; }; desktopEntries."org.kde.kinfocenter" = { diff --git a/modules/home.nix b/modules/home.nix index 045432a..cc2a0a1 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -7,6 +7,7 @@ project, host, version, + cookiez-assets, ... }: { # Home Manager needs a bit of information about you and the diff --git a/modules/hyprpaper/home.nix b/modules/hyprpaper/home.nix index 70bb58f..115a46d 100644 --- a/modules/hyprpaper/home.nix +++ b/modules/hyprpaper/home.nix @@ -3,6 +3,7 @@ inputs, username, project, + cookiez-assets, ... }: { imports = [ @@ -17,14 +18,14 @@ #"/home/${username}/${project}/other/wallpaper1.png" #"/home/${username}/${project}/other/wallpaper2.png" #"/home/${username}/${project}/other/wallpaper3.png" - "/home/${username}/${project}/other/wallpaper4.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,/home/${username}/${project}/other/wallpaper4.png" + "eDP-1,${cookiez-assets}/wallpapers/pixel-desert.png" ]; }; }; diff --git a/plasma/default.nix b/plasma/default.nix index e5f764d..2fb8ab2 100644 --- a/plasma/default.nix +++ b/plasma/default.nix @@ -3,18 +3,18 @@ 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 = ../other/wallpaper4.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; + inherit plasmaTheme powerProfile cookiez-assets; }; home-manager.sharedModules = [ @@ -74,7 +74,6 @@ in { system.activationScripts.script.text = '' source /home/${username}/${project}/other/colors.sh - source /home/${username}/${project}/other/pfp.sh ''; environment = { @@ -83,10 +82,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 600fead..8449c38 100644 --- a/plasma/settings/desktop.nix +++ b/plasma/settings/desktop.nix @@ -4,6 +4,7 @@ username, project, plasmaTheme, + cookiez-assets, ... }: { programs = { @@ -123,7 +124,7 @@ }; }; configFile = { - plasmarc.Wallpapers.usersWallpapers = "/home/cookiez/NixOS/other/wallpaper1.png"; + plasmarc.Wallpapers.usersWallpapers = "${cookiez-assets}/wallpapers/pixel-desert.png"; }; }; };