ncli-refactor #3

Merged
cookiez merged 4 commits from ncli-refactor into main 2026-05-29 20:49:45 +02:00
10 changed files with 892 additions and 762 deletions
Showing only changes of commit d989792774 - Show all commits

21
flake.lock generated
View File

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

View File

@ -57,6 +57,11 @@
inputs.nixpkgs.follows = "nixpkgs"; 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"; nix-flatpak.url = "github:gmodena/nix-flatpak";
grub2-themes.url = "github:vinceliuice/grub2-themes"; grub2-themes.url = "github:vinceliuice/grub2-themes";
@ -66,6 +71,7 @@
nixpkgs, nixpkgs,
alejandra, alejandra,
pam-fprint-grosshack, pam-fprint-grosshack,
cookiez-assets,
home-manager, home-manager,
plasma-manager, plasma-manager,
nixos-hardware, nixos-hardware,
@ -98,6 +104,7 @@
inherit system; inherit system;
inherit project; inherit project;
inherit alejandra; inherit alejandra;
inherit cookiez-assets;
pam-fprint-grosshack-pkg = pam-fprint-grosshack.packages.${system}.default; pam-fprint-grosshack-pkg = pam-fprint-grosshack.packages.${system}.default;
host = hostname; host = hostname;
}; };

View File

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

View File

@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
inputs,
username, username,
project, project,
... ...
@ -19,11 +20,13 @@
noDisplay = true; noDisplay = true;
}; };
dataFile."icons/hicolor/256x256/apps/vencord-custom.png".source = "${inputs.cookiez-assets}/apps/discord.png";
desktopEntries."discord" = { desktopEntries."discord" = {
categories = ["Network" "InstantMessaging" "Chat"]; categories = ["Network" "InstantMessaging" "Chat"];
exec = "vesktop %U"; exec = "vesktop %U";
genericName = "Internet Messenger"; genericName = "Internet Messenger";
icon = "/home/${username}/${project}/other/discord.app.png"; icon = "vencord-custom";
name = "Discord"; name = "Discord";
type = "Application"; type = "Application";
}; };
@ -37,6 +40,8 @@
type = "Application"; type = "Application";
}; };
dataFile."icons/hicolor/256x256/apps/kitty-custom.png".source = "${inputs.cookiez-assets}/apps/kitty.png";
desktopEntries.kitty = { desktopEntries.kitty = {
name = "kitty"; name = "kitty";
genericName = "Terminal emulator"; genericName = "Terminal emulator";
@ -45,7 +50,8 @@
terminal = false; terminal = false;
categories = ["System" "TerminalEmulator"]; 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" = { desktopEntries."org.kde.kinfocenter" = {

View File

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

View File

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,5 +1,6 @@
{ {
config, config,
inputs,
pkgs, pkgs,
username, username,
project, project,
@ -8,13 +9,12 @@
# Define the custom background package with the correct relative path # Define the custom background package with the correct relative path
background-package = pkgs.stdenvNoCC.mkDerivation { background-package = pkgs.stdenvNoCC.mkDerivation {
name = "background-image"; 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; dontUnpack = true;
installPhase = '' installPhase = ''
cp $src $out cp $src $out
''; '';
}; };
plasmaTheme = "desktop"; #Possible values are "laptop" or "desktop" plasmaTheme = "desktop"; #Possible values are "laptop" or "desktop"
powerProfile = "laptop"; #Possible values are "laptop" or "desktop" powerProfile = "laptop"; #Possible values are "laptop" or "desktop"
in { in {
@ -38,8 +38,6 @@ in {
"sddm".serviceConfig.KillMode = "mixed"; "sddm".serviceConfig.KillMode = "mixed";
}; };
programs.gamemode.enable = true;
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
@ -74,7 +72,6 @@ in {
system.activationScripts.script.text = '' system.activationScripts.script.text = ''
source /home/${username}/${project}/other/colors.sh source /home/${username}/${project}/other/colors.sh
source /home/${username}/${project}/other/pfp.sh
''; '';
environment = { environment = {

View File

@ -14,4 +14,7 @@
] ]
++ lib.optionals (plasmaTheme == "laptop") [./settings/laptop.nix] ++ lib.optionals (plasmaTheme == "laptop") [./settings/laptop.nix]
++ lib.optionals (plasmaTheme == "desktop") [./settings/desktop.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";
} }

View File

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