Merge remote-tracking branch 'origin/main' into ncli-refactor

flake.lock

@@ -113,6 +113,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": [
@@ -598,6 +618,7 @@
       "inputs": {
         "aagl": "aagl",
         "alejandra": "alejandra",
+        "cookiez-assets": "cookiez-assets",
         "grub2-themes": "grub2-themes",
         "home-manager": "home-manager",
         "niri": "niri",

flake.nix

@@ -57,6 +57,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";
@@ -66,6 +71,7 @@
     nixpkgs,
     alejandra,
     pam-fprint-grosshack,
+    cookiez-assets,
     home-manager,
     plasma-manager,
     nixos-hardware,
@@ -98,6 +104,7 @@
           inherit system;
           inherit project;
           inherit alejandra;
+          inherit cookiez-assets;
           pam-fprint-grosshack-pkg = pam-fprint-grosshack.packages.${system}.default;
           host = hostname;
         };

modules/configuration.nix

@@ -218,6 +218,10 @@
   programs = {
     steam.enable = true;
 
+    gamemode.enable = true;
+
+    gamescope.enable = true;
+
     nix-index-database.comma.enable = true;
 
     direnv = {
@@ -300,7 +304,7 @@
   users.users.${username} = {
     isNormalUser = true;
     description = "Cookiez";
-    extraGroups = ["networkmanager" "wheel" "docker"];
+    extraGroups = ["networkmanager" "wheel" "docker" "gamemode"];
     packages = with pkgs; [
       #User Packages Here
     ];

modules/desktop-entries.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  inputs,
   username,
   project,
   ...
@@ -19,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 = "/home/${username}/${project}/other/discord.app.png";
+      icon = "vencord-custom";
       name = "Discord";
       type = "Application";
     };
@@ -37,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";
@@ -45,7 +50,8 @@
       terminal = false;
       categories = ["System" "TerminalEmulator"];
 
-      icon = "/home/${username}/${project}/other/kitty.app.png";
+      #icon = "${inputs.cookiez-assets}/apps/kitty.png";
+      icon = "kitty-custom";
     };
 
     desktopEntries."org.kde.kinfocenter" = {

modules/home.nix

@@ -7,6 +7,7 @@
   project,
   host,
   version,
+  cookiez-assets,
   ...
 }: {
   # Home Manager needs a bit of information about you and the

modules/hyprpaper/home.nix

@@ -13,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"
-          "/home/${username}/${project}/other/wallpaper4.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"
+          {
+            monitor = "eDP-1";
+            path = "${inputs.cookiez-assets}/wallpapers/pixel-desert.png";
+            fit_mode = "cover"; # optional, defaults to cover
+          }
         ];
       };
     };

other/pfp.sh

@@ -1,9 +0,0 @@
-mkdir -p /var/lib/AccountsService/{icons,users}
-cp /home/cookiez/NixOS/other/pfp.png /var/lib/AccountsService/icons/cookiez
-echo -e "[User]\nIcon=/var/lib/AccountsService/icons/cookiez\n" > /var/lib/AccountsService/users/cookiez
-
-chown root:root /var/lib/AccountsService/users/cookiez
-chmod 0600 /var/lib/AccountsService/users/cookiez
-
-chown root:root /var/lib/AccountsService/icons/cookiez
-chmod 0444 /var/lib/AccountsService/icons/cookiez

plasma/default.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   pkgs,
   username,
   project,
@@ -8,13 +9,12 @@
   # 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
+    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 {
@@ -38,8 +38,6 @@ in {
     "sddm".serviceConfig.KillMode = "mixed";
   };
 
-  programs.gamemode.enable = true;
-
   services = {
     xserver = {
       enable = true;
@@ -74,7 +72,6 @@ in {
 
   system.activationScripts.script.text = ''
     source /home/${username}/${project}/other/colors.sh
-    source /home/${username}/${project}/other/pfp.sh
   '';
 
   environment = {

plasma/home.nix

@@ -14,4 +14,7 @@
     ]
     ++ lib.optionals (plasmaTheme == "laptop") [./settings/laptop.nix]
     ++ lib.optionals (plasmaTheme == "desktop") [./settings/desktop.nix];
+
+  #Add the wallpapers to be available to KDE wallpaper settings page
+  xdg.dataFile."wallpapers/cookiez".source = "${inputs.cookiez-assets}/wallpapers";
 }

plasma/settings/desktop.nix

@@ -123,7 +123,7 @@
         };
       };
       configFile = {
-        plasmarc.Wallpapers.usersWallpapers = "/home/cookiez/NixOS/other/wallpaper1.png";
+        plasmarc.Wallpapers.usersWallpapers = "${inputs.cookiez-assets}/wallpapers/pixel-desert.png";
       };
     };
   };