before git push

This commit is contained in:
maxstrb 2025-09-23 18:11:57 +02:00
parent d18110a018
commit 07d51c404c
10 changed files with 145 additions and 368 deletions

View file

@ -26,7 +26,7 @@
sensitivity = 0;
touchpad = {
natural_scroll = true;
natural_scroll = false;
};
};
@ -177,15 +177,6 @@
"$mainMod CTRL, k, resizeactive, 0 -80"
"$mainMod CTRL, l, resizeactive, 80 0"
"$mainMod ALT, left, moveactive, -80 0"
"$mainMod ALT, right, moveactive, 80 0"
"$mainMod ALT, up, moveactive, 0 -80"
"$mainMod ALT, down, moveactive, 0 80"
"$mainMod ALT, h, moveactive, -80 0"
"$mainMod ALT, j, moveactive, 0 80"
"$mainMod ALT, k, moveactive, 0 -80"
"$mainMod ALT, l, moveactive, 80 0"
# media and volume controls
# ",XF86AudioMute,exec, pamixer -t"
",XF86AudioPlay,exec, playerctl play-pause"
@ -203,21 +194,7 @@
windowrule = [
# "float,class:^(mpv)$"
];
workspace = [
"1, monitor:DP-1"
"2, monitor:DP-2"
];
};
extraConfig = "
monitor=DP-1,2560x1440@120,0x0,1
monitor=DP-2,1920x1080@60,-1920x300,1
xwayland {
force_zero_scaling = true
}
";
};
programs.hyprpanel = {
@ -230,22 +207,6 @@
clock.format = "%d %b %H:%M";
workspaces.show_numbered = true;
layouts = {
"*" = {
left = [
"dashboard"
"workspaces"
];
middle = [];
right = [
"volume"
"clock"
"systray"
"notifications"
];
};
};
};
menus.clock = {
@ -279,6 +240,14 @@
theme.bar.menus.menu.clock.calendar.paginator = "#88B1F7";
theme.bar.menus.menu.clock.calendar.currentday = "#88B1F7";
theme.bar.buttons.notifications.icon = "#88B1F7";
theme.bar.battery.icon = "#88B1F7";
theme.bar.buttons.battery.text = "#88B1F7";
theme.bar.buttons.battery.icon = "#88B1F7";
theme.bar.menus.menu.battery.label.color = "#88B1F7";
theme.bar.menus.menu.battery.slider.primary = "#88B1F7";
theme.bar.menus.menu.battery.listitems.active = "#88B1F7";
theme.bar.menus.menu.battery.icons.active = "#88B1F7";
theme.bar.menus.menu.volume = {
label.color = "#88B1F7";
@ -308,5 +277,6 @@
slurp
grim
wl-clipboard
playerctl
];
}

View file

@ -18,7 +18,9 @@
name = "catppuccin";
style = "mocha";
};
lsp = {
null-ls.enable = false;
enable = true;
inlayHints.enable = true;
@ -60,15 +62,19 @@
nix.enable = true;
markdown.enable = true;
nu.enable = true;
bash.enable = true;
css.enable = true;
html.enable = true;
sql.enable = true;
ts.enable = true;
zig.enable = true;
csharp.enable = true;
rust = {
enable = true;
crates.enable = true;
crates.enable = false; #null-ls was making me angry
};
};

View file

@ -1,6 +1,6 @@
{
pkgs,
name,
device-name,
...
}: {
home.packages = with pkgs; [
@ -17,59 +17,72 @@
nushell = {
enable = true;
extraConfig = ''
if "ZELLIJ" in $env == false {
zellij
exit
} else {
if "IN_NIX_SHELL" in $env == false {
extraConfig =
/*
nu
*/
''
if "ZELLIJ" in $env == false {
zellij
exit
} else {
if "IN_NIX_SHELL" in $env == false {
fastfetch
}
}
def garbage [] {
sudo nix-collect-garbage --delete-old
sudo nixos-rebuild switch --flake /home/maxag/.nix-config
}
def c [] {
clear
fastfetch
}
}
def garbage [] {
sudo nix-collect-garbage --delete-old
sudo nixos-rebuild switch --flake /home/maxag/.nix-config
}
def c [] {
clear
fastfetch
}
def flake [
shell?: string
--edit (-e)
--command (-c): string
] {
if $edit {
nvim ~/.nix-config/flakes/flake.nix
} else {
match $command {
null => {nix develop $"/home/maxag/.nix-config/flakes/#($shell)"}
_ => {nix develop $"/home/maxag/.nix-config/flakes/#($shell)" --command bash -c $"($command)"}
def flake [
shell?: string
--edit (-e)
--command (-c): string
] {
if $edit {
nvim ~/.nix-config/flakes/flake.nix
} else {
match $command {
null => {nix develop $"/home/maxag/.nix-config/flakes/#($shell)"}
_ => {nix develop $"/home/maxag/.nix-config/flakes/#($shell)" --command bash -c $"($command)"}
}
}
}
}
def edit [file: path] {
match ($file | path parse | get extension) {
"rs" => {
flake rust -c $"nvim ($file)"
def edit [file: path] {
match ($file | path parse | get extension) {
"rs" => {
flake rust -c $"nvim ($file)"
}
"zig" => {
flake zig -c $"nvim ($file)"
}
"c" | "cpp" => {
flake c -c $"nvim ($file)"
}
"cs" => {
flake c-sharp -c $"nvim ($file)"
}
_ => {nvim $file}
}
"zig" => {
flake zig -c $"nvim ($file)"
}
"c" | "cpp" => {
flake c -c $"nvim ($file)"
}
"cs" => {
flake c-sharp -c $"nvim ($file)"
}
_ => {nvim $file}
}
}
'';
def rebuild [message?: string] {
cd /home/maxag/.nix-config
let commit_message = if $message != null {$message} else {"non important commit"}
git add .
git commit -m $commit_message
sudo nixos-rebuild switch --flake .
}
'';
settings = {
show_banner = false;
@ -77,10 +90,9 @@
shellAliases = {
zel = "zellij";
rebuild = "sudo nixos-rebuild switch --flake /home/maxag/.nix-config";
system = "nvim /home/maxag/.nix-config/flake.nix";
home = "nvim /home/maxag/.nix-config/home/${name}/home.nix";
config = "nvim /home/maxag/.nix-config/configuration/${name}/configuration.nix";
home = "nvim /home/maxag/.nix-config/home/${device-name}/home.nix";
config = "nvim /home/maxag/.nix-config/configuration/${device-name}/configuration.nix";
cat = "bat -p -P";
nvim = "edit";
nix-shell = "nix-shell --run nu";