Changes Stuff

This commit is contained in:
2026-03-28 18:32:21 +01:00
parent 21bff544f3
commit 3f8b11c058
69 changed files with 121 additions and 111 deletions

View File

@@ -29,7 +29,7 @@
]; ];
catppuccin = { catppuccin = {
enable = true; enable = false;
flavor = "mocha"; flavor = "mocha";
}; };

View File

@@ -1,32 +1,53 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let
theme = pkgs.magnetic-catppuccin-gtk;
theme_name = "Catppuccin-GTK-Dark";
in
{ {
home.packages = with pkgs; [ catppuccin-papirus-folders adwaita-icon-theme]; home = {
packages = with pkgs; [
adwaita-icon-theme
];
pointerCursor = {
gtk.enable = true;
name = "catppuccin-mocha-sapphire-cursors";
package = pkgs.catppuccin-cursors.mochaSapphire;
size = 24;
};
file = {
".config/gtk-4.0/gtk.css".source = "${theme}/share/themes/${theme_name}/gtk-4.0/gtk.css";
".config/gtk-4.0/gtk-dark.css".source = "${theme}/share/themes/${theme_name}/gtk-4.0/gtk-dark.css";
".config/gtk-4.0/assets".source = "${theme}/share/themes/${theme_name}/gtk-4.0/assets";
};
};
gtk = { gtk = {
enable = true; enable = true;
font = { font = {
name = "FiraCode Nerd Font Propo"; name = "FiraCode Nerd Font Propo";
size = 12; size = 12;
}; };
theme = { theme = {
name = "catppuccin-mocha-standard-mauve-dark"; name = theme_name;
package = pkgs.catppuccin-gtk; package = theme;
}; };
iconTheme = { iconTheme = {
name = "Papirus-Dark"; name = "Papirus-Dark";
package = lib.mkForce pkgs.catppuccin-papirus-folders; # deactivate and check package = lib.mkForce (
pkgs.catppuccin-papirus-folders.override {
accent = "sky";
flavor = "mocha";
}
);
}; };
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
cursorTheme = { };
name = "catppuccin-mocha-dark"; dconf = {
package = pkgs.catppuccin-cursors.mochaDark; enable = true;
size = 24; settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
gtk-theme = theme_name;
};
}; };
gtk3.extraConfig.gtk-application-prefer-dark-theme = true;
gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
}; };
} }

View File

@@ -19,6 +19,10 @@ in
./portal.nix ./portal.nix
]; ];
catppuccin.hyprland = {
enable = true;
};
home.packages = with pkgs; [ home.packages = with pkgs; [
catppuccin-cursors.mochaDark catppuccin-cursors.mochaDark
grim grim
@@ -172,14 +176,14 @@ in
name = "usb-optical-mouse-"; name = "usb-optical-mouse-";
sensitivity = 0; sensitivity = 0;
}; };
#deprecated
windowrulev2 = [ # windowrulev2 = [
"suppressevent maximize, class:.*" # "suppressevent maximize, class:.*"
"float, class:^(com.obsproject.Studio)$" # "float, class:^(com.obsproject.Studio)$"
"size 1280 800, class:^(com.obsproject.Studio)$" # "size 1280 800, class:^(com.obsproject.Studio)$"
"float, class:^(xdg-desktop-portal-gtk)$" # "float, class:^(xdg-desktop-portal-gtk)$"
"center, class:^(xdg-desktop-portal-gtk)$" # "center, class:^(xdg-desktop-portal-gtk)$"
]; # ];
# windowrule = [ # windowrule = [
# "opacity 0.0 override, class:^(xwaylandvideobridge)$" # "opacity 0.0 override, class:^(xwaylandvideobridge)$"
@@ -227,7 +231,7 @@ in
# Window Modifiers # Window Modifiers
"${super}, P, pseudo, " # dwindle "${super}, P, pseudo, " # dwindle
"${super}, J, togglesplit, " # dwindle # "${super}, J, togglesplit, " # dwindle doenst exist
"${super}, V, togglefloating, " # dwindle "${super}, V, togglefloating, " # dwindle
"${super}, C, killactive, " "${super}, C, killactive, "

View File

@@ -1,6 +1,9 @@
{ ... }: { ... }:
{ {
catppuccin.hyprlock.enable = false;
# Hyprlock configuration # Hyprlock configuration
programs.hyprlock = { programs.hyprlock = {
enable = true; enable = true;

View File

@@ -150,11 +150,11 @@
format = "{}"; format = "{}";
return-type = "json"; return-type = "json";
exec = '' exec = ''
curl -s -X GET "https://api.openweathermap.org/data/2.5/weather?lat=52.281311&lon=10.527029&appid=$OPENWEATHER_API_KEY&units=metric&lang=en" | jq -c '{text: "\(.name) \(.main.temp)C°"}' curl -s -X GET "https://api.openweathermap.org/data/2.5/weather?lat=52.281311&lon=10.527029&appid=$(cat $OPENWEATHER_API_KEY)&units=metric&lang=en" | jq -c '{text: "\(.name) \(.main.temp)C°"}'
''; '';
interval = 120; interval = 120;
on-click = '' on-click = ''
data=$(curl -s -X GET "https://api.openweathermap.org/data/2.5/weather?lat=52.281311&lon=10.527029&appid=$OPENWEATHER_API_KEY&units=metric&lang=en") data=$(curl -s -X GET "https://api.openweathermap.org/data/2.5/weather?lat=52.281311&lon=10.527029&appid=$(cat $OPENWEATHER_API_KEY)&units=metric&lang=en")
city=$(echo "$data" | jq -r '.name') city=$(echo "$data" | jq -r '.name')
temp=$(echo "$data" | jq -r '.main.temp') temp=$(echo "$data" | jq -r '.main.temp')
feels=$(echo "$data" | jq -r '.main.feels_like') feels=$(echo "$data" | jq -r '.main.feels_like')

View File

@@ -136,7 +136,7 @@ window#waybar.hidden {
} }
#custom-cava { #custom-cava {
color: @green; color: @sky;
} }
#wireplumber, #custom-cava, #mpris { #wireplumber, #custom-cava, #mpris {

View File

@@ -4,8 +4,10 @@
... ...
}: }:
{ {
catppuccin.waybar.mode = "createLink"; catppuccin.waybar = {
enable = true;
mode = "createLink";
};
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = pkgs.waybar; package = pkgs.waybar;

View File

@@ -22,6 +22,9 @@
}; };
lfs.enable = true; lfs.enable = true;
ignores = [ "**/.DS_STORE" ]; ignores = [
"**/.DS_STORE"
"result"
];
}; };
} }

View File

@@ -11,7 +11,7 @@
glow # MD Viewer glow # MD Viewer
# LLM in the Terminal # LLM in the Terminal
llm (pkgs.llm.withPlugins { llm-groq = true; })
# Fun stuff # Fun stuff
zoxide zoxide
@@ -118,6 +118,12 @@
fastfetch fastfetch
end end
''; '';
functions.l = {
body = ''
llm prompt -m groq/llama-3.3-70b-versatile -t std $argv | glow
'';
};
}; };
programs.starship = { programs.starship = {

View File

@@ -5,6 +5,7 @@
useNetworkd = true; useNetworkd = true;
useDHCP = false; useDHCP = false;
firewall.enable = true; firewall.enable = true;
hostName = "cyper-desktop";
}; };
systemd.network = { systemd.network = {

View File

@@ -9,15 +9,34 @@
./fonts.nix ./fonts.nix
./sops.nix ./sops.nix
./regreet.nix ./regreet.nix
./plymouth ./plymouth.nix
./audio.nix ./audio.nix
./ssh.nix ./ssh.nix
./locale.nix ./locale.nix
./tailscale.nix ./tailscale.nix
./virt.nix ./virt.nix
./webcam.nix ./webcam.nix
inputs.catppuccin.nixosModules.catppuccin
]; ];
catppuccin = {
enable = true;
accent = "sky";
flavor = "mocha";
cache.enable = true;
cursors = {
enable = true;
accent = "sapphire";
};
fcitx5.enable = false;
forgejo.enable = false;
gitea.enable = false;
sddm.enable = false;
};
# nix config # nix config
nix = { nix = {
settings = { settings = {
@@ -63,7 +82,7 @@
users.${primaryUser} = { users.${primaryUser} = {
imports = [ ../home ]; imports = [ ../home ];
}; };
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = { inherit inputs primaryUser; }; extraSpecialArgs = { inherit inputs primaryUser; };
}; };
@@ -84,7 +103,12 @@
security = { security = {
pam.services.swaylock = { }; pam.services.swaylock = { };
polkit.enable = true; polkit.enable = true;
apparmor.enable = true; apparmor.enable = false;
};
services.gnome = {
tinysparql.enable = true;
localsearch.enable = true;
}; };
users.users.${primaryUser} = { users.users.${primaryUser} = {

20
nixos/plymouth.nix Normal file
View File

@@ -0,0 +1,20 @@
{ ... }:
{
boot = {
plymouth = {
enable = true;
};
# Enable "Silent boot"
consoleLogLevel = 3;
initrd.verbose = false;
kernelParams = [
"quiet"
"splash"
"boot.shell_on_fail"
"udev.log_priority=3"
"rd.systemd.show_status=auto"
];
loader.timeout = 0;
};
}

View File

@@ -1,36 +0,0 @@
{ pkgs, ... }:
let
mikuTheme = pkgs.stdenv.mkDerivation {
name = "plymouth-theme-miku";
src = ./miku;
installPhase = ''
mkdir -p $out/share/plymouth/themes/miku/frames
cp miku.plymouth $out/share/plymouth/themes/miku/
cp miku.script $out/share/plymouth/themes/miku/
cp images/frames/*.png $out/share/plymouth/themes/miku/frames/
'';
};
in
{
boot = {
plymouth = {
enable = true;
theme = "miku";
themePackages = [
mikuTheme
];
};
# Enable "Silent boot"
consoleLogLevel = 3;
initrd.verbose = false;
kernelParams = [
"quiet"
"splash"
"boot.shell_on_fail"
"udev.log_priority=3"
"rd.systemd.show_status=auto"
];
loader.timeout = 0;
};
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -1,8 +0,0 @@
[Plymouth Theme]
Name=Miku
Description=Hatsune Miku Dancing
ModuleName=Script
[script]
ImageDir=/usr/share/plymouth/themes/miku
ScriptFile=/usr/share/plymouth/themes/miku/miku.script

View File

@@ -1,30 +0,0 @@
# Screen dimensions
screen_width = Window.GetWidth();
screen_height = Window.GetHeight();
# Load frames
frame_count = 53;
frames = [];
for (i = 0; i < frame_count; i++) {
num = String(i);
if (i < 10) num = "000" + num;
else if (i < 100) num = "00" + num;
else num = "0" + num;
frames[i] = Image("frames/frame_" + num + ".png");
}
# Position centered
x = (screen_width - 498) / 2;
y = (screen_height - 498) / 2;
# Animation state
current_frame = 0;
fun refresh_callback() {
sprite = Sprite(frames[current_frame]);
sprite.SetX(x);
sprite.SetY(y);
current_frame = (current_frame + 1) % frame_count;
}
Plymouth.SetRefreshFunction(refresh_callback);

View File

@@ -30,7 +30,7 @@
GTK = { GTK = {
application_prefer_dark_theme = true; application_prefer_dark_theme = true;
cursor_theme_name = lib.mkForce "catppuccin-mocha-dark"; cursor_theme_name = lib.mkForce "catppuccin-mocha-dark-cursors";
font_name = lib.mkForce "FiraCode Nerd Font Propo 12"; font_name = lib.mkForce "FiraCode Nerd Font Propo 12";
icon_theme_name = lib.mkForce "Papirus-Dark"; icon_theme_name = lib.mkForce "Papirus-Dark";
theme_name = lib.mkForce "catppuccin-mocha-standard-mauve-dark"; theme_name = lib.mkForce "catppuccin-mocha-standard-mauve-dark";