chore: merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Ahwx 2025-07-01 16:30:29 +02:00
commit 7d6257ddd5
18 changed files with 489 additions and 445 deletions

6
flake.lock generated
View file

@ -1076,11 +1076,11 @@
"nixvim": "nixvim_2" "nixvim": "nixvim_2"
}, },
"locked": { "locked": {
"lastModified": 1748338979, "lastModified": 1749898168,
"narHash": "sha256-cu/DVvQZRKVmI9rqEygXPW0xjR0BEqSgzH2Ay9ZYHVw=", "narHash": "sha256-aOUvfBcLdrNzI1BL+jhPh0y0cFkgjne2tstDb8k1vI0=",
"owner": "ahwxorg", "owner": "ahwxorg",
"repo": "nixvim-config", "repo": "nixvim-config",
"rev": "fc0d965d9bbd98047f777cb31e5b0708cd958956", "rev": "546d385ec71b0ed34abc3f32100e3d0792c349c8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -41,6 +41,9 @@
laptop13.audioEnhancement.enable = true; laptop13.audioEnhancement.enable = true;
}; };
# Disable light sensors and accelerometers as they are not used and consume extra battery
hardware.sensor.iio.enable = lib.mkForce false;
networking.hostName = "sakura"; networking.hostName = "sakura";
powerManagement = { powerManagement = {

View file

@ -30,7 +30,8 @@
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-root".device = "/dev/nvme0n1p3"; boot.initrd.luks.devices."luks-156453ac-bbad-452c-ad92-4fc569db9347".device =
"/dev/disk/by-uuid/156453ac-bbad-452c-ad92-4fc569db9347";
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0EFD-4B3F"; device = "/dev/disk/by-uuid/0EFD-4B3F";

View file

@ -5,6 +5,7 @@
nssmdns4 = true; nssmdns4 = true;
openFirewall = true; openFirewall = true;
}; };
services.printing.enable = true;
# environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [
# ]; # ];
} }

View file

@ -13,6 +13,8 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
git git
dig
traceroute
# agenix.packages.x86_64-linux.default # agenix.packages.x86_64-linux.default
]; ];
} }

View file

@ -38,6 +38,8 @@
}; };
}; };
fonts.fontconfig.antialias = false;
users.groups.gay = { }; users.groups.gay = { };
users.users.${username} = { users.users.${username} = {

View file

@ -7,13 +7,14 @@
pkgs.twemoji-color-font pkgs.twemoji-color-font
pkgs.noto-fonts-emoji pkgs.noto-fonts-emoji
pkgs.swww pkgs.swww
pkgs.swaylock
]; ];
gtk = { gtk = {
enable = true; enable = true;
font = { font = {
name = "CaskaydiaCove Nerd Font"; name = "GohuFont 14 Nerd Font Mono";
size = 12; size = 14;
}; };
theme = { theme = {
name = "Gruvbox-Green-Dark"; name = "Gruvbox-Green-Dark";
@ -95,11 +96,20 @@
gaps_in = 5; gaps_in = 5;
gaps_out = 10; gaps_out = 10;
border_size = 2; border_size = 2;
# "col.active_border" = "rgb(cda5ef) rgb(cda5ef) 45deg";
"col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg"; "col.active_border" = "rgb(ffffff) rgb(ffffff) 45deg";
"col.inactive_border" = "0x00000000"; "col.inactive_border" = "0x00000000";
no_border_on_floating = false; no_border_on_floating = false;
}; };
group = {
"col.border_active" = "rgb(ffffff) rgb(ffffff) 45deg";
"col.border_inactive" = "0x00000000";
groupbar = {
font_family = "GohuFont 11 Nerd Font Mono";
font_size = 11;
"col.active" = "rgb(efa8a5) rgb(efa8a5) 45deg";
"col.inactive" = "rgb(a5ecef) rgb(a5ecef) 45deg";
};
};
misc = { misc = {
disable_autoreload = true; disable_autoreload = true;
@ -109,6 +119,12 @@
animate_manual_resizes = false; animate_manual_resizes = false;
enable_swallow = true; enable_swallow = true;
focus_on_activate = true; focus_on_activate = true;
enable_anr_dialog = false;
};
ecosystem = {
no_update_news = true;
no_donation_nag = true;
}; };
dwindle = { dwindle = {

View file

@ -1,3 +1,4 @@
# monitor=HDMI-A-1,1920x1080@165,0x0,1,transform,0 # monitor=HDMI-A-1,1920x1080@165,0x0,1,transform,0
# monitor=DP-1, 3440x1440@144,0x0,1,transform,0 monitor=DP-1, 3440x1440@144,0x0,1,transform,0
monitor=CMT GM34-CWQ CMI231700118,3440x1440@144,0x0,1,transform,0 monitor=DP-2, 3440x1440@144,1504x0,1,transform,0
monitor=CMT GM34-CWQ CMI231700118,3440x1440@144,1504x0,1,transform,0

View file

@ -51,7 +51,8 @@
rounding = 32 rounding = 32
fail_color = rgba(191, 97, 106, 0.75) fail_color = rgba(191, 97, 106, 0.75)
check_color = rgba(235, 203, 139, 0.75) check_color = rgba(235, 203, 139, 0.75)
placeholder_text = <span foreground="##cdd6f4"></span> placeholder_text = <span foreground="##cdd6f4">Password</span>
font_family = GohuFont 14 Nerd Font Mono
hide_input = false hide_input = false
position = 0, -400 position = 0, -400
halign = center halign = center
@ -63,7 +64,7 @@
text = cmd[update:1000] echo "$(date +"%A, %B %d")" text = cmd[update:1000] echo "$(date +"%A, %B %d")"
color = rgba(209, 207, 207, 0.75) color = rgba(209, 207, 207, 0.75)
font_size = 22 font_size = 22
font_family = JetBrains Mono font_family = GohuFont 14 Nerd Font Mono
position = 0, 300 position = 0, 300
halign = center halign = center
valign = center valign = center
@ -74,7 +75,7 @@
text = cmd[update:1000] echo "$(date +"%-H:%M")" text = cmd[update:1000] echo "$(date +"%-H:%M")"
color = rgba(209, 207, 207, 0.75) color = rgba(209, 207, 207, 0.75)
font_size = 95 font_size = 95
font_family = JetBrains Mono Extrabold font_family = GohuFont 14 Nerd Font Mono
position = 0, 200 position = 0, 200
halign = center halign = center
valign = center valign = center
@ -126,11 +127,11 @@
label { label {
monitor = monitor =
text = cmd[update:1000] echo "$(waybar-music | jq .text | cut -d\" -f2)" text = cmd[update:1000] echo "$(waybar-music | jq .text --raw-output)"
color = rgba(209, 207, 207, 0.75) color = rgba(209, 207, 207, 0.75)
#color = rgba(255, 255, 255, 0.6) #color = rgba(255, 255, 255, 0.6)
font_size = 17 font_size = 17
font_family = JetBrains Mono Nerd Font Mono ExtraBold font_family = GohuFont 14 Nerd Font Mono
position = 0, -200 position = 0, -200
halign = center halign = center
valign = center valign = center
@ -141,7 +142,7 @@
text = cmd[update:6000000] echo "$(bash /home/liv/.local/bin/weather.sh)" text = cmd[update:6000000] echo "$(bash /home/liv/.local/bin/weather.sh)"
color = rgba(255, 255, 255, 1) color = rgba(255, 255, 255, 1)
font_size = 10 font_size = 10
font_family = JetBrains Mono Nerd Font Mono ExtraBold font_family = GohuFont 14 Nerd Font Mono
position = 0, 50 position = 0, 50
halign = center halign = center
valign = top valign = top
@ -152,7 +153,7 @@
text = cmd[update:1000] echo -e "$(/home/liv/.local/bin/hyprlock-battery.sh)" text = cmd[update:1000] echo -e "$(/home/liv/.local/bin/hyprlock-battery.sh)"
color = rgba(255, 255, 255, 1) color = rgba(255, 255, 255, 1)
font_size = 12 font_size = 12
font_family = JetBrains Mono Nerd Font Mono ExtraBold font_family = GohuFont 14 Nerd Font Mono
position = 0, 0 position = 0, 0
halign = right halign = right
valign = bottom valign = bottom

View file

@ -6,7 +6,7 @@
theme = "3024 Night"; theme = "3024 Night";
font = { font = {
name = "JetBrainsMono Nerd Font"; name = "GohuFont 14 Nerd Font Mono";
size = 9; size = 9;
}; };

View file

@ -73,12 +73,15 @@
thunderbird thunderbird
lxqt.pavucontrol-qt lxqt.pavucontrol-qt
mpv mpv
plasma5Packages.kdeconnect-kde
# Gaming # Gaming
lunar-client lunar-client
inputs.alejandra.defaultPackage.${system} inputs.alejandra.defaultPackage.${system}
inputs.nixvim.packages.${pkgs.system}.default inputs.nixvim.packages.${pkgs.system}.default
mermaid-cli
gnuplot
# Email/calendar/etc # Email/calendar/etc
neomutt neomutt

View file

@ -36,8 +36,8 @@ in
settings = { settings = {
fonts = { fonts = {
default_family = "FiraCode Nerd Font"; default_family = "GohuFont 14 Nerd Font Mono";
default_size = "10pt"; default_size = "14pt";
}; };
tabs = { tabs = {

View file

@ -6,6 +6,7 @@ let
notes = pkgs.writeShellScriptBin "notes" (builtins.readFile ./scripts/notes.sh); notes = pkgs.writeShellScriptBin "notes" (builtins.readFile ./scripts/notes.sh);
grabtext = pkgs.writeShellScriptBin "grabtext" (builtins.readFile ./scripts/grabtext.sh); grabtext = pkgs.writeShellScriptBin "grabtext" (builtins.readFile ./scripts/grabtext.sh);
unfuck = pkgs.writeShellScriptBin "unfuck" (builtins.readFile ./scripts/unfuck.sh); unfuck = pkgs.writeShellScriptBin "unfuck" (builtins.readFile ./scripts/unfuck.sh);
hidname = pkgs.writeShellScriptBin "hidname" (builtins.readFile ./scripts/hidname.sh);
toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh); toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh);
toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" ( toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (
builtins.readFile ./scripts/toggle_oppacity.sh builtins.readFile ./scripts/toggle_oppacity.sh
@ -20,6 +21,7 @@ in
notes notes
grabtext grabtext
unfuck unfuck
hidname
toggle_blur toggle_blur
toggle_oppacity toggle_oppacity
ascii ascii

View file

@ -0,0 +1,8 @@
#!/usr/bin/env bash
FILES=/dev/hidraw*
for f in $FILES; do
FILE=${f##*/}
DEVICE="$(cat /sys/class/hidraw/${FILE}/device/uevent | grep HID_NAME | cut -d '=' -f2)"
printf "%s \t %s\n" $FILE "$DEVICE"
done

View file

@ -22,6 +22,7 @@ usage() {
unfuck_wallpaper() { unfuck_wallpaper() {
pkill swww-daemon pkill swww-daemon
setsid swww-daemon & setsid swww-daemon &
swww img ~/.local/share/bg.png
} }
unfuck_bar() { unfuck_bar() {

View file

@ -41,7 +41,7 @@
"button-text": " Clear all " "button-text": " Clear all "
}, },
"dnd": { "dnd": {
"text": " Do Not Disturb" "text": " Do not disturb"
}, },
} }
} }
@ -51,7 +51,7 @@
* { * {
all: unset; all: unset;
font-size: 14px; font-size: 14px;
font-family: "Ubuntu Nerd Font"; font-family: "GohuFont 14 Nerd Font Mono";
transition: 200ms; transition: 200ms;
} }

View file

@ -113,6 +113,7 @@
"custom/devices": { "custom/devices": {
"interval": 60, "interval": 60,
"font-size": 14,
// "return-type": "json", // "return-type": "json",
"exec": "~/.local/bin/waybar-devices", "exec": "~/.local/bin/waybar-devices",
}, },
@ -369,7 +370,7 @@
* { * {
border: none; border: none;
border-radius: 0; border-radius: 0;
font-family: 'CommitMono Nerd Font'; font-family: 'GohuFont 11 Nerd Font Mono';
font-weight: 400; font-weight: 400;
font-size: 11px; font-size: 11px;
min-height: 26px; min-height: 26px;

View file

@ -174,6 +174,8 @@
vim = "nvim"; vim = "nvim";
doas = "sudo"; doas = "sudo";
sxiv = "nsxiv"; sxiv = "nsxiv";
enby = "man";
woman = "man";
# NixOS # NixOS
ns = "nix-shell --run zsh"; ns = "nix-shell --run zsh";