From 032439e4dc681d36524dba841db5f116d0cc4b85 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Thu, 5 Dec 2024 03:59:12 -0500 Subject: [PATCH] Add privacy module to waybar, fix pcmanfm against a config --- .../home/programs/gui/librewolf/default.nix | 1 - modules/home/programs/gui/pcmanfm/default.nix | 47 ++++++++++++++++++- modules/home/wms/niri/rules/default.nix | 7 +++ modules/home/wms/niri/theme/default.nix | 2 +- modules/home/wms/programs/waybar/default.nix | 29 +++++++++--- .../system/accounts/users/jimbo/default.nix | 15 +----- modules/system/programs/default.nix | 2 +- .../system/programs/home-manager/default.nix | 14 ++++++ modules/system/services/general/default.nix | 1 + .../general}/greetd/default.nix | 0 10 files changed, 94 insertions(+), 24 deletions(-) create mode 100644 modules/system/programs/home-manager/default.nix rename modules/system/{programs => services/general}/greetd/default.nix (100%) diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix index cc0bb52..c234895 100644 --- a/modules/home/programs/gui/librewolf/default.nix +++ b/modules/home/programs/gui/librewolf/default.nix @@ -238,7 +238,6 @@ in { "datareporting.healthreport.uploadEnabled" = false; "svg.context-properties.content.enabled" = true; "services.sync.engine.addresses.available" = false; - "full-screen-api.ignore-widgets" = true; "device.sensors.motion.enabled" = false; "security.OCSP.require" = true; "gnomeTheme.hideSingleTab" = true; diff --git a/modules/home/programs/gui/pcmanfm/default.nix b/modules/home/programs/gui/pcmanfm/default.nix index 2adddc3..3bfe2ef 100644 --- a/modules/home/programs/gui/pcmanfm/default.nix +++ b/modules/home/programs/gui/pcmanfm/default.nix @@ -29,11 +29,56 @@ side_pane_mode=places view_mode=icon show_hidden=1 - sort=name;ascending; + sort=mtime;descending; toolbar=newtab;navigation;home; show_statusbar=1 pathbar_mode_buttons=0 ''; + + ".config/libfm/libfm.conf".text = '' + [config] + single_click=0 + use_trash=0 + confirm_del=1 + confirm_trash=0 + 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=1 + + [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 + ''; }; }; } diff --git a/modules/home/wms/niri/rules/default.nix b/modules/home/wms/niri/rules/default.nix index db8ffcc..1f824c9 100644 --- a/modules/home/wms/niri/rules/default.nix +++ b/modules/home/wms/niri/rules/default.nix @@ -39,6 +39,13 @@ open-on-workspace "${config.ws.w4a}" } + //// Layer rules (Uncomment after 0.1.11) + //layer-rule { + // match namespace="^notifications$" + // block-out-from "screencast" + //} + + // Everything else screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" hotkey-overlay { diff --git a/modules/home/wms/niri/theme/default.nix b/modules/home/wms/niri/theme/default.nix index 7b56873..eb68d83 100644 --- a/modules/home/wms/niri/theme/default.nix +++ b/modules/home/wms/niri/theme/default.nix @@ -2,7 +2,7 @@ { config.home.niri.settings.theme = pkgs.writeText "theme" '' prefer-no-csd - + layout { gaps 7 center-focused-column "never" diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix index 620aab1..7441c46 100644 --- a/modules/home/wms/programs/waybar/default.nix +++ b/modules/home/wms/programs/waybar/default.nix @@ -3,6 +3,7 @@ programs.waybar = let swayWorkspaceModule = { format = "{name}"; + sort-by-number = true; enable-bar-scroll = true; warp-on-scroll = false; disable-scroll-wraparound = true; @@ -38,16 +39,18 @@ ]; }; - # CPU, Ram and Vram + # Monitoring cpuModule = { format = " {usage}%"; interval = 3; }; + ramModule = { format = " {used}G"; tooltip = false; interval = 3; }; + vramModule = { exec = pkgs.writeScript "vramScript" '' # Don't run the script if running on integrated graphics @@ -94,6 +97,7 @@ interval = 1; tooltip = true; }; + shortClockModule = { exec = "echo ' '$(date +'%l:%M%p' | sed 's/^ //')"; on-click = ''wl-copy $(date "+%Y-%m-%d-%H%M%S"); notify-send "Date copied."''; @@ -101,8 +105,9 @@ tooltip = false; }; - # Tray, gamemode, bluetooth, and network tray modules + # Misc trayModule.spacing = 5; + networkModule = { format-ethernet = "󰈀"; format-wifi = ""; @@ -112,6 +117,7 @@ tooltip-format-wifi = "{ipaddr}\n{essid} ({signalStrength}%)"; tooltip-format-disconnected = "Disconnected"; }; + bluetoothModule = { format = ""; format-disabled = ""; @@ -122,24 +128,30 @@ tooltip-format-enumerate-connected-battery = "{device_alias} {device_battery_percentage}%"; on-click = "rofi-bluetooth"; }; + scratchpadModule = { format = " {count}"; show-empty = false; tooltip = true; tooltip-format = "{title}"; }; + gamemodeModule = { format = "{glyph}"; glyph = "󰖺"; hide-not-running = true; use-icon = true; - icon-spacing = 3; icon-size = 19; + icon-spacing = 3; tooltip = true; tooltip-format = "Gamemode On"; }; - # Special per-bar modules + privacyModule = { + icon-spacing = 5; + icon-size = 15; + }; + mediaModule = { format = " {title}"; format-paused = " {artist}"; @@ -170,6 +182,7 @@ interval = 2; on-click = "makotoggle"; }; + weatherModule = { exec = "${pkgs.wttrbar}/bin/wttrbar --ampm"; format = "{}°"; @@ -199,7 +212,7 @@ display1 = { name = "bar1"; position = "top"; - layer = "bottom"; + layer = "top"; output = [ config.displays.d1 "VGA-1" @@ -218,6 +231,7 @@ "custom/clock-long" "gamemode" "sway/scratchpad" + "privacy" "tray" "bluetooth" "network" @@ -231,6 +245,7 @@ "custom/vram" = vramModule; "custom/clock-long" = longClockModule; "gamemode" = gamemodeModule; + "privacy" = privacyModule; "sway/scratchpad" = scratchpadModule; "tray" = trayModule; "bluetooth" = bluetoothModule; @@ -239,7 +254,7 @@ display2 = { name = "bar2"; position = "top"; - layer = "bottom"; + layer = "top"; output = [ config.displays.d2 ]; modules-left = [ "sway/workspaces" @@ -270,7 +285,7 @@ display3 = { name = "bar3"; position = "top"; - layer = "bottom"; + layer = "top"; output = [ config.displays.d3 ]; modules-left = [ "sway/workspaces" diff --git a/modules/system/accounts/users/jimbo/default.nix b/modules/system/accounts/users/jimbo/default.nix index 8f9ffe3..50c5527 100644 --- a/modules/system/accounts/users/jimbo/default.nix +++ b/modules/system/accounts/users/jimbo/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, unstable, nur, blender, ... }: +{ pkgs, config, ... }: { users.users = { jimbo = { @@ -38,16 +38,5 @@ }; }; - home-manager = { - useUserPackages = true; - backupFileExtension = "backup"; - extraSpecialArgs = { - inherit - unstable - nur - blender - ; - }; - users.jimbo = import ../../../../home; - }; + home-manager.users.jimbo = import ../../../../home; } diff --git a/modules/system/programs/default.nix b/modules/system/programs/default.nix index 69edce1..dc6f83b 100644 --- a/modules/system/programs/default.nix +++ b/modules/system/programs/default.nix @@ -6,7 +6,7 @@ ./desktops ./gaming ./git - ./greetd + ./home-manager ./nh ./security ./shells diff --git a/modules/system/programs/home-manager/default.nix b/modules/system/programs/home-manager/default.nix new file mode 100644 index 0000000..e3aaf5e --- /dev/null +++ b/modules/system/programs/home-manager/default.nix @@ -0,0 +1,14 @@ +{ unstable, nur, blender, ... }: +{ + home-manager = { + useUserPackages = true; + backupFileExtension = "bak"; + extraSpecialArgs = { + inherit + unstable + nur + blender + ; + }; + }; +} diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix index 66b999b..165a34a 100644 --- a/modules/system/services/general/default.nix +++ b/modules/system/services/general/default.nix @@ -2,6 +2,7 @@ { imports = [ ./gnome-keyring + ./greetd ./gvfs ./keyd ./libvirtd diff --git a/modules/system/programs/greetd/default.nix b/modules/system/services/general/greetd/default.nix similarity index 100% rename from modules/system/programs/greetd/default.nix rename to modules/system/services/general/greetd/default.nix