Bun/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Massively simplify Waybar, remove unused remote desktop profile, other things I'm sure

Browse source
This commit is contained in:
Bun 2025-05-06 03:13:03 -04:00
parent 532a1e280f
commit 26b81cf5ed
13 changed files with 153 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hosts/jupiter/user/default.nix
View file

@ -4,7 +4,6 @@
desktop.enable = true; desktop.enable = true;
gaming.enable = true; gaming.enable = true;
production.enable = true; production.enable = true;
remote-desktop.enable = true;
school.enable = true; school.enable = true;
enableNixpkgsReleaseCheck = false; enableNixpkgsReleaseCheck = false;
stateVersion = lib.mkForce config.system.stateVersion; stateVersion = lib.mkForce config.system.stateVersion;

1
hosts/redmond/user/default.nix
View file

@ -2,7 +2,6 @@
{ {
home-manager.users."${config.sysusers.main}".home = { home-manager.users."${config.sysusers.main}".home = {
desktop.enable = true; desktop.enable = true;
remote-desktop.enable = true;
stateVersion = lib.mkForce config.system.stateVersion; stateVersion = lib.mkForce config.system.stateVersion;
}; };
} }

1
modules/home/default.nix
View file

@ -14,7 +14,6 @@
desktop.enable = mkEnableOption "Desktop programs and services"; desktop.enable = mkEnableOption "Desktop programs and services";
gaming.enable = mkEnableOption "Gaming apps and programs"; gaming.enable = mkEnableOption "Gaming apps and programs";
production.enable = mkEnableOption "Apps for visual productivity"; production.enable = mkEnableOption "Apps for visual productivity";
remote-desktop.enable = mkEnableOption "Apps for remote desktop";
school.enable = mkEnableOption "Apps for school and college"; school.enable = mkEnableOption "Apps for school and college";
}; };

1
modules/home/programs/gui/default.nix
View file

@ -9,7 +9,6 @@
./mpv ./mpv
./obs ./obs
./pcmanfm ./pcmanfm
./rofi
./thunderbird ./thunderbird
]; ];
} }

2
modules/home/programs/gui/mpv/default.nix
View file

@ -8,9 +8,9 @@
thumbnail thumbnail
]; ];
config = { config = {
volume = 60;
loop-playlist = "inf"; loop-playlist = "inf";
osc = "no"; osc = "no";
volume = 60;
}; };
}; };
} }

150
modules/home/programs/gui/pcmanfm/default.nix
View file

@ -6,79 +6,85 @@
file-roller file-roller
]; ];
xdg.configFile = { xdg.configFile = {
"pcmanfm/default/pcmanfm.conf".text = '' "pcmanfm/default/pcmanfm.conf" = {
[config] text = ''
bm_open_method=0 [config]
bm_open_method=0
[volume]
mount_on_startup=0 [volume]
mount_removable=1 mount_on_startup=0
autorun=0 mount_removable=1
autorun=0
[ui]
always_show_tabs=0 [ui]
max_tab_chars=32 always_show_tabs=0
win_width=943 max_tab_chars=32
win_height=1039 win_width=943
splitter_pos=150 win_height=1039
media_in_new_tab=0 splitter_pos=150
desktop_folder_new_win=0 media_in_new_tab=0
change_tab_on_drop=1 desktop_folder_new_win=0
close_on_unmount=1 change_tab_on_drop=1
focus_previous=0 close_on_unmount=1
side_pane_mode=places focus_previous=0
view_mode=icon side_pane_mode=places
show_hidden=1 view_mode=icon
sort=mtime;descending; show_hidden=1
toolbar=newtab;navigation;home; sort=mtime;descending;
show_statusbar=1 toolbar=newtab;navigation;home;
pathbar_mode_buttons=0 show_statusbar=1
''; pathbar_mode_buttons=0
'';
force = true;
};
"libfm/libfm.conf".text = '' "libfm/libfm.conf" = {
[config] text = ''
single_click=0 [config]
use_trash=1 single_click=0
confirm_del=1 use_trash=1
confirm_trash=1 confirm_del=1
advanced_mode=1 confirm_trash=1
si_unit=0 advanced_mode=1
force_startup_notify=1 si_unit=0
backup_as_hidden=1 force_startup_notify=1
no_usb_trash=1 backup_as_hidden=1
no_child_non_expandable=0 no_usb_trash=1
show_full_names=0 no_child_non_expandable=0
only_user_templates=0 show_full_names=0
template_run_app=0 only_user_templates=0
template_type_once=0 template_run_app=0
auto_selection_delay=600 template_type_once=0
drop_default_action=auto auto_selection_delay=600
defer_content_test=0 drop_default_action=auto
quick_exec=0 defer_content_test=0
terminal=foot quick_exec=0
archiver=file-roller terminal=foot
thumbnail_local=1 archiver=file-roller
thumbnail_max=2048 thumbnail_local=1
smart_desktop_autodrop=1 thumbnail_max=2048
smart_desktop_autodrop=1
[ui]
big_icon_size=48 [ui]
small_icon_size=16 big_icon_size=48
pane_icon_size=16 small_icon_size=16
thumbnail_size=128 pane_icon_size=16
show_thumbnail=1 thumbnail_size=128
shadow_hidden=0 show_thumbnail=1
shadow_hidden=0
[places]
places_home=1 [places]
places_desktop=1 places_home=1
places_root=0 places_desktop=1
places_computer=0 places_root=0
places_trash=1 places_computer=0
places_applications=1 places_trash=1
places_network=0 places_applications=1
places_unmounted=1 places_network=0
''; places_unmounted=1
'';
force = true;
};
}; };
}; };
} }

1
modules/home/programs/misc/default.nix
View file

@ -6,7 +6,6 @@
./general ./general
./headless ./headless
./production ./production
./remote-desktop
./school ./school
]; ];
} }

7
modules/home/programs/misc/remote-desktop/default.nix
View file

@ -1,7 +0,0 @@
{ config, lib, pkgs, ... }:
{
home.packages = with pkgs; lib.mkIf config.home.remote-desktop.enable [
moonlight-qt
rustdesk-flutter
];
}

1
modules/home/variables/displays/default.nix
View file

@ -9,6 +9,5 @@
d2 = "DP-2"; d2 = "DP-2";
d3 = "DP-3"; d3 = "DP-3";
d4 = "HDMI-A-1"; d4 = "HDMI-A-1";
dI = "eDP-1";
}; };
} }

1
modules/home/wms/programs/default.nix
View file

@ -3,6 +3,7 @@
imports = [ imports = [
./kanshi ./kanshi
./mako ./mako
./rofi
./swaylock ./swaylock
./waybar ./waybar
./wlpicker ./wlpicker

0
modules/home/programs/gui/rofi/default.nix → modules/home/wms/programs/rofi/default.nix
View file

0
modules/home/programs/gui/rofi/scripts/default.nix → modules/home/wms/programs/rofi/scripts/default.nix
View file

196
modules/home/wms/programs/waybar/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
programs.waybar = let programs.waybar = let
swayWorkspaceModule = { swayWorkspaceModule = {
@ -28,7 +28,10 @@
format-icons = { format-icons = {
headphone = "󰋋 "; headphone = "󰋋 ";
headset = "󰋋 "; headset = "󰋋 ";
default = [ " " " " ]; default = [
" "
" "
];
}; };
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
on-click-middle = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 100%"; on-click-middle = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 100%";
@ -111,8 +114,14 @@
format-wifi = ""; format-wifi = "";
format-disconnected = "󰖪"; format-disconnected = "󰖪";
format-linked = ""; format-linked = "";
tooltip-format-ethernet = "{ipaddr}\n{ifname} "; tooltip-format-ethernet = lib.concatStrings [
tooltip-format-wifi = "{ipaddr}\n{essid} ({signalStrength}%)"; "{ipaddr}\n"
"{ifname} "
];
tooltip-format-wifi = lib.concatStrings [
"{ipaddr}\n"
"{essid} ({signalStrength}%)"
];
tooltip-format-disconnected = "Disconnected"; tooltip-format-disconnected = "Disconnected";
}; };
@ -121,7 +130,10 @@
format-disabled = ""; format-disabled = "";
format-no-controller = ""; format-no-controller = "";
tooltip-format-on = "No devices connected."; tooltip-format-on = "No devices connected.";
tooltip-format-connected = "{num_connections} connected\n{device_enumerate}"; tooltip-format-connected = lib.concatStrings [
"{num_connections} connected\n"
"{device_enumerate}"
];
tooltip-format-enumerate-connected = "{device_alias}"; tooltip-format-enumerate-connected = "{device_alias}";
tooltip-format-enumerate-connected-battery = "{device_alias} {device_battery_percentage}%"; tooltip-format-enumerate-connected-battery = "{device_alias} {device_battery_percentage}%";
}; };
@ -190,7 +202,10 @@
# Laptop modules # Laptop modules
backlightModule = { backlightModule = {
format = "{icon} {percent}%"; format = "{icon} {percent}%";
format-icons = [ "" "󰖨" ]; format-icons = [
""
"󰖨"
];
tooltip = false; tooltip = false;
}; };
@ -201,133 +216,27 @@
critical = 15; critical = 15;
}; };
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-icons = [ "" "" "" "" "" ]; format-icons = [
""
""
""
""
""
];
}; };
in { in {
enable = config.home.desktop.enable; enable = config.home.desktop.enable;
settings = { settings = {
display1 = { displayPrimary = {
name = "bar1"; name = "bar1";
position = "top"; position = "top";
layer = "top"; layer = "top";
output = [ output = [
config.displays.d1
"VGA-1"
];
modules-left = [
"sway/workspaces"
"sway/window"
"niri/workspaces"
"niri/window"
"hyprland/workspaces"
"hyprland/window"
];
modules-right = [
"pulseaudio"
"cpu"
"memory"
"custom/vram"
"custom/clock-long"
"gamemode"
"sway/scratchpad"
"privacy"
"tray"
"bluetooth"
"network"
];
"sway/workspaces" = swayWorkspaceModule;
"sway/window" = windowModule;
"niri/window" = windowModule;
"hyprland/window" = windowModule;
"pulseaudio" = pulseModule;
"cpu" = cpuModule;
"memory" = ramModule;
"custom/vram" = vramModule;
"custom/clock-long" = longClockModule;
"gamemode" = gamemodeModule;
"privacy" = privacyModule;
"sway/scratchpad" = scratchpadModule;
"tray" = trayModule;
"bluetooth" = bluetoothModule;
"network" = networkModule;
};
display2 = {
name = "bar2";
position = "top";
layer = "top";
output = [ config.displays.d2 ];
modules-left = [
"sway/workspaces"
"sway/window"
"niri/workspaces"
"niri/window"
"hyprland/workspaces"
"hyprland/window"
];
modules-right = [
"pulseaudio"
"mpd"
"custom/notifs"
"cpu"
"memory"
"custom/vram"
"custom/clock-long"
];
"sway/workspaces" = swayWorkspaceModule;
"sway/window" = windowModule;
"niri/window" = windowModule;
"hyprland/window" = windowModule;
"pulseaudio" = pulseModule;
"mpd" = mpdModule;
"custom/notifs" = notificationModule;
"cpu" = cpuModule;
"memory" = ramModule;
"custom/vram" = vramModule;
"custom/clock-long" = longClockModule;
};
display3 = {
name = "bar3";
position = "top";
layer = "top";
output = [ config.displays.d3 ];
modules-left = [
"sway/workspaces"
"sway/window"
"niri/workspaces"
"niri/window"
"hyprland/workspaces"
"hyprland/window"
];
modules-right = [
"pulseaudio"
"custom/weather"
"cpu"
"memory"
"custom/vram"
"custom/clock-short"
];
"sway/workspaces" = swayWorkspaceModule;
"sway/window" = windowModule;
"niri/window" = windowModule;
"hyprland/window" = windowModule;
"pulseaudio" = pulseModule;
"custom/weather" = weatherModule;
"cpu" = cpuModule;
"memory" = ramModule;
"custom/vram" = vramModule;
"custom/clock-short" = shortClockModule;
};
displayLap = {
name = "laptop";
position = "top";
layer = "top";
output = [
"eDP-1"
"LVDS-1"
"DSI-1" "DSI-1"
"HDMI-A-1" "HDMI-A-1"
"LVDS-1"
"eDP-1"
"DP-1"
]; ];
modules-left = [ modules-left = [
"sway/workspaces" "sway/workspaces"
@ -350,6 +259,7 @@
"custom/clock-long" "custom/clock-long"
"gamemode" "gamemode"
"sway/scratchpad" "sway/scratchpad"
"privacy"
"tray" "tray"
"bluetooth" "bluetooth"
"network" "network"
@ -369,10 +279,50 @@
"battery" = batteryModule; "battery" = batteryModule;
"custom/clock-long" = longClockModule; "custom/clock-long" = longClockModule;
"sway/scratchpad" = scratchpadModule; "sway/scratchpad" = scratchpadModule;
"privacy" = privacyModule;
"tray" = trayModule; "tray" = trayModule;
"bluetooth" = bluetoothModule; "bluetooth" = bluetoothModule;
"network" = networkModule; "network" = networkModule;
}; };
displaySecondary = {
name = "bar2";
position = "top";
layer = "top";
output = [
"!DSI-1"
"!HDMI-A-1"
"!LVDS-1"
"!eDP-1"
"!DP-1"
];
modules-left = [
"sway/workspaces"
"sway/window"
"niri/workspaces"
"niri/window"
"hyprland/workspaces"
"hyprland/window"
];
modules-right = [
"pulseaudio"
"cpu"
"memory"
"custom/vram"
"custom/clock-long"
];
"sway/workspaces" = swayWorkspaceModule;
"sway/window" = windowModule;
"niri/window" = windowModule;
"hyprland/window" = windowModule;
"pulseaudio" = pulseModule;
"mpd" = mpdModule;
"custom/notifs" = notificationModule;
"cpu" = cpuModule;
"memory" = ramModule;
"custom/vram" = vramModule;
"custom/clock-long" = longClockModule;
};
}; };
style = '' style = ''