satr14/nix-flake
1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: satr14:0b4bc2569aea4e145cba9b1079b8e2344e895faa
Branches Tags
satr14:main
satr14:renovate/lock-file-maintenance
satr14:mc-backup
satr14:sops-implementation
..
compare: satr14:a7781200a0e01c1dd8b528e582464d0f6a5f82f3
Branches Tags
satr14:renovate/lock-file-maintenance
satr14:main
satr14:mc-backup
satr14:sops-implementation

No commits in common. "0b4bc2569aea4e145cba9b1079b8e2344e895faa" and "a7781200a0e01c1dd8b528e582464d0f6a5f82f3" have entirely different histories.
0b4bc2569a ... a7781200a0

5 changed files with 33 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

48
modules/home/rice/bar.nix
View file

@ -12,14 +12,15 @@
modules-left = [
"custom/start"
"niri/workspaces"
"niri/window"
"hyprland/workspaces"
"hyprland/window"
"mpris"
];
modules-center = if rice.bar.minimal then [] else [
"custom/dunst"
"clock"
"tray"
"hyprland/submap"
];
modules-right = if rice.bar.minimal then [
"tray"
@ -53,7 +54,7 @@
};
interval = 1;
format = " {used:0.1f}GiB";
on-click = "kitty btop";
on-click = "hyprctl dispatch exec '[float; size 75%]' kitty btop";
};
"disk" = {
states = {
@ -61,7 +62,7 @@
};
interval = 5;
format = " {used}";
on-click = "kitty btop";
on-click = "hyprctl dispatch exec '[float; size 75%]' kitty btop";
on-click-right = "kitty sh -c 'sudo nix-collect-garbage -d; nix-collect-garbage -d; nix store optimise; sudo journalctl --rotate --vacuum-time=1s --vacuum-files=1; read'";
};
"network" = {
@ -80,7 +81,7 @@
critical-threshold = 80;
format = " {temperatureC}°C";
interval = 1;
on-click = "kitty btop";
on-click = "hyprctl dispatch exec '[float; size 75%]' kitty btop";
};
"power-profiles-daemon" = {
format = "{icon} {profile}";
@ -90,10 +91,15 @@
balanced = "";
};
};
"niri/workspaces" = {
format = "{value}";
on-scroll-down = "niri msg action focus-workspace-down";
on-scroll-up = "niri msg action focus-workspace-up";
"hyprland/workspaces" = {
format = "{name}";
format-icons = {
default = " ";
active = " ";
urgent = " ";
};
on-scroll-down = "hyprctl dispatch workspace e+1";
on-scroll-up = "hyprctl dispatch workspace e-1";
};
"custom/dunst" = {
format = "{}";
@ -113,7 +119,7 @@
on-click-right = "playerctl next";
on-click = "playerctl previous";
};
"niri/window" = {
"hyprland/window" = {
icon = true;
max-length = 35;
separate-outputs = false;
@ -122,9 +128,15 @@
"~" = "${username}@${hostname}";
"btop" = "${username}@${hostname}";
};
on-click-right = "niri msg action fullscreen-window";
on-click-middle = "niri msg action close-window";
on-click = "niri msg action maximize-column";
on-click-right = "hyprctl dispatch fullscreen 0";
on-click-middle = "hyprctl dispatch killactive";
on-click = "hyprctl dispatch fullscreen 1";
on-scroll-up = "hyprctl dispatch cyclenext";
on-scroll-down = "hyprctl dispatch cyclenext prev";
};
"hyprland/submap" = {
format = " {}";
on-click = "hyprctl dispatch submap reset";
};
"clock" = {
format = "{:%b %d, %I:%M:%S %p}";
@ -172,7 +184,8 @@
};
"custom/start" = {
format = "";
on-click-right = "wlogout";
on-click-middle = "wlogout";
on-click-right = "hyprctl dispatch togglespecialworkspace hidden";
on-click = "rofi -show drun -show-icons -display-drun '' -run-command \"uwsm app -- {cmd}\"";
};
}
@ -215,13 +228,12 @@
border: ${toString rice.borders.size}px solid transparent;
}
#window { padding: 0px 5px; }
#workspaces, #cpu, #memory, #disk, #clock, #window, #tray, #pulseaudio, #battery, #network, #temperature, #power-profiles-daemon, #custom-exit, #custom-start, #custom-dunst, #mpris { padding: 0px 5px; margin: 0px 5px; }
#window, #submap { padding: 0px 5px; }
#submap, #workspaces, #cpu, #memory, #disk, #clock, #window, #tray, #pulseaudio, #battery, #network, #temperature, #power-profiles-daemon, #custom-exit, #custom-start, #custom-dunst, #mpris { padding: 0px 5px; margin: 0px 5px; }
#workspaces button {
border-radius: 0px;
margin: 0px;
padding: 4px;
background: none;
border: none;
}
@ -235,7 +247,7 @@
background: @base;
}
#workspaces button.active {
#workspaces button.active, #submap {
background: @surface0;
}

21
modules/home/rice/compositor.nix
View file

@ -3,8 +3,6 @@
./keybinds.nix
];
# TODO: https://github.com/sodiboo/niri-flake/issues/1393 for nwg-displays monitor dynamic config
programs.niri = {
settings = {
outputs."eDP-1" = {
@ -12,14 +10,6 @@
position = { x=0; y=0; };
scale = 1.0;
};
input = {
warp-mouse-to-focus.enable = true;
focus-follows-mouse = {
max-scroll-amount = "5%";
enable = true;
};
};
environment = {
XCURSOR_SIZE = "24";
XCURSOR_THEME = "catppuccin-${ctp-opt.flavor}-light-cursors";
@ -41,17 +31,6 @@
"nm-applet &"
"tailscale systray &"
];
prefer-no-csd = true;
layout = {
tab-indicator.enable = false;
gaps = rice.gap.outer;
border = {
enable = true;
width = rice.borders.size;
};
};
};
};

25
modules/home/rice/keybinds.nix
View file

@ -29,7 +29,6 @@
"Mod+Q".action.close-window = {};
"Mod+W".action.maximize-column = {};
"Mod+S".action.fullscreen-window = {};
"Print".action.screenshot-screen = {};
"Mod+Up".action.focus-workspace-up = {};
@ -37,35 +36,11 @@
"Mod+Left".action.focus-column-left = {};
"Mod+Right".action.focus-column-right = {};
"Mod+Space" = { action.spawn = [ "playerctl" "play-pause" ]; allow-when-locked = true; };
"Mod+R".action.spawn = [ "rofi" "-show" "drun" "-show-icons" "-display-drun" ":" "-run-command" "uwsm app -- {cmd}" ];
"Mod+E".action.spawn = [ "pcmanfm-qt" ];
"Mod+T".action.spawn = [ "kitty" ];
"Mod+Y".action.spawn = [ "brave" "--restore-last-session" ];
"Mod+Return".action.spawn-sh = "ls ~/Projects | rofi -dmenu -p \"Open Project\" | xargs -I {} sh -c 'mkdir -p ~/Projects/\"{}\" && zeditor ~/Projects/\"{}\"'";
"Mod+M".action.spawn = [ "wlogout" ];
"Mod+Tab".action.spawn = [ "pkill" "-SIGUSR1" "waybar" ];
"XF86Bluetooth".action.spawn = [ "blueman-manager" ];
"XF86Display".action.spawn = [ "nwg-displays" ];
"Ctrl+Alt+Delete".action.spawn = [ "wlogout" ];
"Ctrl+Shift+Escape".action.spawn = [ "kitty" "btop" ];
"Mod+Grave".action.spawn = [ "dunstctl" "set-paused" "toggle" ];
"Mod+N".action.spawn = [ "rofi-network-manager" ];
"Mod+J".action.spawn-sh = "notify-send -u critical ${hostname} 'Caffein Mode' && notify-send '(SUPER+X to reset)' && systemctl --user stop hypridle";
"Mod+Z".action.spawn = [ "dunstctl" "close-all" ];
"Mod+V".action.spawn = [ "rofi" "-modi" "clipboard:cliphist-rofi-img" "-show" "clipboard" "-show-icons" ];
"Mod+A".action.spawn = [ "zeditor" ];
"Mod+C".action.spawn = [ "kitty" "btop" ];
"Mod+Shift+C".action.spawn = [ "kitty" "zsh" "-c" "fastfetch; exec zsh -i" ];
"Mod+D".action.spawn = [ "steam" "steam://open/bigpicture" ];
"Mod+Shift+D".action.spawn = [ "steam" ];
"Mod+L".action.spawn = [ "loginctl" "lock-session" ];
};
wayland.windowManager.hyprland = {

5
modules/system/desktop.nix
View file

@ -11,10 +11,7 @@
];
programs = {
niri = {
enable = true;
package = pkgs.niri-unstable;
};
niri.enable = true;
hyprland = {
enable = true;
withUWSM = true;

4
modules/system/homelab/mc/mc0-vanilla-plus.nix
View file

@ -5,10 +5,10 @@
rcon-pass = "howdy";
modpack = let
useLatest = false;
commit = "86bf13316ed1352a676d9056d284448ea5e5a079";
commit = "bf95d65e758963899f9d5a4eba6b589c50faffc9";
path = if !useLatest then "commit/${commit}" else "branch/main";
in pkgs.fetchPackwizModpack {
packHash = "";
packHash = "sha256-4AbpwvbzndeQC18sCKbWkIo8npQRHTftOJ69au3AjXc=";
url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml";
};
in {