diff --git a/hosts/jupiter/user/default.nix b/hosts/jupiter/user/default.nix index 1daf3f0f..e4b30d0b 100644 --- a/hosts/jupiter/user/default.nix +++ b/hosts/jupiter/user/default.nix @@ -4,7 +4,6 @@ desktop.enable = true; gaming.enable = true; production.enable = true; - remote-desktop.enable = true; school.enable = true; enableNixpkgsReleaseCheck = false; stateVersion = lib.mkForce config.system.stateVersion; diff --git a/hosts/redmond/user/default.nix b/hosts/redmond/user/default.nix index 26b7a3ad..fed1d317 100644 --- a/hosts/redmond/user/default.nix +++ b/hosts/redmond/user/default.nix @@ -2,7 +2,6 @@ { home-manager.users."${config.sysusers.main}".home = { desktop.enable = true; - remote-desktop.enable = true; stateVersion = lib.mkForce config.system.stateVersion; }; } diff --git a/modules/home/default.nix b/modules/home/default.nix index e3d6ae91..343ad79b 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -14,7 +14,6 @@ desktop.enable = mkEnableOption "Desktop programs and services"; gaming.enable = mkEnableOption "Gaming apps and programs"; production.enable = mkEnableOption "Apps for visual productivity"; - remote-desktop.enable = mkEnableOption "Apps for remote desktop"; school.enable = mkEnableOption "Apps for school and college"; }; diff --git a/modules/home/programs/gui/default.nix b/modules/home/programs/gui/default.nix index c2d24981..0251d552 100644 --- a/modules/home/programs/gui/default.nix +++ b/modules/home/programs/gui/default.nix @@ -9,7 +9,6 @@ ./mpv ./obs ./pcmanfm - ./rofi ./thunderbird ]; } diff --git a/modules/home/programs/gui/mpv/default.nix b/modules/home/programs/gui/mpv/default.nix index c3a719f8..bb76683f 100644 --- a/modules/home/programs/gui/mpv/default.nix +++ b/modules/home/programs/gui/mpv/default.nix @@ -8,9 +8,9 @@ thumbnail ]; config = { - volume = 60; loop-playlist = "inf"; osc = "no"; + volume = 60; }; }; } diff --git a/modules/home/programs/gui/pcmanfm/default.nix b/modules/home/programs/gui/pcmanfm/default.nix index d2f621bd..6560a279 100644 --- a/modules/home/programs/gui/pcmanfm/default.nix +++ b/modules/home/programs/gui/pcmanfm/default.nix @@ -6,79 +6,85 @@ file-roller ]; xdg.configFile = { - "pcmanfm/default/pcmanfm.conf".text = '' - [config] - bm_open_method=0 - - [volume] - mount_on_startup=0 - mount_removable=1 - autorun=0 - - [ui] - always_show_tabs=0 - max_tab_chars=32 - win_width=943 - win_height=1039 - splitter_pos=150 - media_in_new_tab=0 - desktop_folder_new_win=0 - change_tab_on_drop=1 - close_on_unmount=1 - focus_previous=0 - side_pane_mode=places - view_mode=icon - show_hidden=1 - sort=mtime;descending; - toolbar=newtab;navigation;home; - show_statusbar=1 - pathbar_mode_buttons=0 - ''; + "pcmanfm/default/pcmanfm.conf" = { + text = '' + [config] + bm_open_method=0 + + [volume] + mount_on_startup=0 + mount_removable=1 + autorun=0 + + [ui] + always_show_tabs=0 + max_tab_chars=32 + win_width=943 + win_height=1039 + splitter_pos=150 + media_in_new_tab=0 + desktop_folder_new_win=0 + change_tab_on_drop=1 + close_on_unmount=1 + focus_previous=0 + side_pane_mode=places + view_mode=icon + show_hidden=1 + sort=mtime;descending; + toolbar=newtab;navigation;home; + show_statusbar=1 + pathbar_mode_buttons=0 + ''; + force = true; + }; - "libfm/libfm.conf".text = '' - [config] - single_click=0 - use_trash=1 - confirm_del=1 - confirm_trash=1 - advanced_mode=1 - si_unit=0 - force_startup_notify=1 - backup_as_hidden=1 - no_usb_trash=1 - no_child_non_expandable=0 - show_full_names=0 - only_user_templates=0 - template_run_app=0 - template_type_once=0 - auto_selection_delay=600 - drop_default_action=auto - defer_content_test=0 - quick_exec=0 - terminal=foot - archiver=file-roller - thumbnail_local=1 - thumbnail_max=2048 - smart_desktop_autodrop=1 - - [ui] - big_icon_size=48 - small_icon_size=16 - pane_icon_size=16 - thumbnail_size=128 - show_thumbnail=1 - shadow_hidden=0 - - [places] - places_home=1 - places_desktop=1 - places_root=0 - places_computer=0 - places_trash=1 - places_applications=1 - places_network=0 - places_unmounted=1 - ''; + "libfm/libfm.conf" = { + text = '' + [config] + single_click=0 + use_trash=1 + confirm_del=1 + confirm_trash=1 + advanced_mode=1 + si_unit=0 + force_startup_notify=1 + backup_as_hidden=1 + no_usb_trash=1 + no_child_non_expandable=0 + show_full_names=0 + only_user_templates=0 + template_run_app=0 + template_type_once=0 + auto_selection_delay=600 + drop_default_action=auto + defer_content_test=0 + quick_exec=0 + terminal=foot + archiver=file-roller + thumbnail_local=1 + thumbnail_max=2048 + smart_desktop_autodrop=1 + + [ui] + big_icon_size=48 + small_icon_size=16 + pane_icon_size=16 + thumbnail_size=128 + show_thumbnail=1 + shadow_hidden=0 + + [places] + places_home=1 + places_desktop=1 + places_root=0 + places_computer=0 + places_trash=1 + places_applications=1 + places_network=0 + places_unmounted=1 + ''; + force = true; + }; }; }; } diff --git a/modules/home/programs/misc/default.nix b/modules/home/programs/misc/default.nix index a6e5a776..f22a58fd 100644 --- a/modules/home/programs/misc/default.nix +++ b/modules/home/programs/misc/default.nix @@ -6,7 +6,6 @@ ./general ./headless ./production - ./remote-desktop ./school ]; } diff --git a/modules/home/programs/misc/remote-desktop/default.nix b/modules/home/programs/misc/remote-desktop/default.nix deleted file mode 100644 index 0d20fcc0..00000000 --- a/modules/home/programs/misc/remote-desktop/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - home.packages = with pkgs; lib.mkIf config.home.remote-desktop.enable [ - moonlight-qt - rustdesk-flutter - ]; -} diff --git a/modules/home/variables/displays/default.nix b/modules/home/variables/displays/default.nix index 25df0537..1d141c53 100644 --- a/modules/home/variables/displays/default.nix +++ b/modules/home/variables/displays/default.nix @@ -9,6 +9,5 @@ d2 = "DP-2"; d3 = "DP-3"; d4 = "HDMI-A-1"; - dI = "eDP-1"; }; } diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix index d1ffa6d8..48aa47e2 100644 --- a/modules/home/wms/programs/default.nix +++ b/modules/home/wms/programs/default.nix @@ -3,6 +3,7 @@ imports = [ ./kanshi ./mako + ./rofi ./swaylock ./waybar ./wlpicker diff --git a/modules/home/programs/gui/rofi/default.nix b/modules/home/wms/programs/rofi/default.nix similarity index 100% rename from modules/home/programs/gui/rofi/default.nix rename to modules/home/wms/programs/rofi/default.nix diff --git a/modules/home/programs/gui/rofi/scripts/default.nix b/modules/home/wms/programs/rofi/scripts/default.nix similarity index 100% rename from modules/home/programs/gui/rofi/scripts/default.nix rename to modules/home/wms/programs/rofi/scripts/default.nix diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix index cfd1644c..ce6398fe 100644 --- a/modules/home/wms/programs/waybar/default.nix +++ b/modules/home/wms/programs/waybar/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { programs.waybar = let swayWorkspaceModule = { @@ -28,7 +28,10 @@ format-icons = { headphone = "󰋋 "; headset = "󰋋 "; - default = [ " " " " ]; + default = [ + " " + " " + ]; }; on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; on-click-middle = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 100%"; @@ -111,8 +114,14 @@ format-wifi = ""; format-disconnected = "󰖪"; format-linked = ""; - tooltip-format-ethernet = "{ipaddr}\n{ifname} "; - tooltip-format-wifi = "{ipaddr}\n{essid} ({signalStrength}%)"; + tooltip-format-ethernet = lib.concatStrings [ + "{ipaddr}\n" + "{ifname} " + ]; + tooltip-format-wifi = lib.concatStrings [ + "{ipaddr}\n" + "{essid} ({signalStrength}%)" + ]; tooltip-format-disconnected = "Disconnected"; }; @@ -121,7 +130,10 @@ format-disabled = ""; format-no-controller = ""; 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-battery = "{device_alias} {device_battery_percentage}%"; }; @@ -190,7 +202,10 @@ # Laptop modules backlightModule = { format = "{icon} {percent}%"; - format-icons = [ "" "󰖨" ]; + format-icons = [ + "" + "󰖨" + ]; tooltip = false; }; @@ -201,133 +216,27 @@ critical = 15; }; format = "{icon} {capacity}%"; - format-icons = [ "" "" "" "" "" ]; + format-icons = [ + "" + "" + "" + "" + "" + ]; }; in { enable = config.home.desktop.enable; settings = { - display1 = { + displayPrimary = { name = "bar1"; position = "top"; layer = "top"; 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" "HDMI-A-1" + "LVDS-1" + "eDP-1" + "DP-1" ]; modules-left = [ "sway/workspaces" @@ -350,6 +259,7 @@ "custom/clock-long" "gamemode" "sway/scratchpad" + "privacy" "tray" "bluetooth" "network" @@ -369,10 +279,50 @@ "battery" = batteryModule; "custom/clock-long" = longClockModule; "sway/scratchpad" = scratchpadModule; + "privacy" = privacyModule; "tray" = trayModule; "bluetooth" = bluetoothModule; "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 = ''