diff --git a/home/modules/firefox/config/themes/config/userChrome.css b/home/modules/firefox/config/themes/config/userChrome.css index 2b7b1af..a337c32 100755 --- a/home/modules/firefox/config/themes/config/userChrome.css +++ b/home/modules/firefox/config/themes/config/userChrome.css @@ -1,3 +1,7 @@ +* { + font-size: 13px !important; +} + /* Title bar */ .titlebar-spacer { display: none !important; @@ -100,4 +104,4 @@ } .tabbrowser-tab:hover .tab-close-button { visibility: visible !important; -} \ No newline at end of file +} diff --git a/home/modules/gtk/config/homeCursor.nix b/home/modules/gtk/config/homeCursor.nix index 867e0fb..5016797 100755 --- a/home/modules/gtk/config/homeCursor.nix +++ b/home/modules/gtk/config/homeCursor.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { gtk.enable = true; - x11.enable = true; + # x11.enable = true; name = "catppuccin-mocha-dark-cursors"; package = pkgs.catppuccin-cursors.macchiatoDark; - size = 14; + size = 18; } diff --git a/home/modules/gtk/config/theme.nix b/home/modules/gtk/config/theme.nix index 926ed4c..4ac6418 100755 --- a/home/modules/gtk/config/theme.nix +++ b/home/modules/gtk/config/theme.nix @@ -3,7 +3,7 @@ size = "compact"; variant = "macchiato"; accents = [ - "lavender" + "mauve" ]; }; name = "catppuccin-macchiato-mauve-compact"; diff --git a/home/modules/hypr/land/config/exec-once.nix b/home/modules/hypr/land/config/exec-once.nix index 2181501..66b3204 100755 --- a/home/modules/hypr/land/config/exec-once.nix +++ b/home/modules/hypr/land/config/exec-once.nix @@ -12,6 +12,6 @@ "pkill easyeffects" "emote" "flameshot" - "sgsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" + "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" "gsettings set org.gnome.desktop.interface cursor-size 18" ] diff --git a/home/modules/hypr/land/config/misc.nix b/home/modules/hypr/land/config/misc.nix index 0c661bb..444225f 100755 --- a/home/modules/hypr/land/config/misc.nix +++ b/home/modules/hypr/land/config/misc.nix @@ -1,7 +1,7 @@ { focus_on_activate = 1; force_default_wallpaper = 0; - disable_hyprland_logo = true; - disable_splash_rendering = true; - disable_hyprland_qtutils_check = true; + # disable_hyprland_logo = true; + # disable_splash_rendering = true; + # disable_hyprland_qtutils_check = true; } diff --git a/home/modules/hypr/land/config/windowrulev2.nix b/home/modules/hypr/land/config/windowrulev2.nix index 9d552c0..e74d0c1 100755 --- a/home/modules/hypr/land/config/windowrulev2.nix +++ b/home/modules/hypr/land/config/windowrulev2.nix @@ -16,11 +16,14 @@ let feishin = "(feishin)"; steam = "(steam)"; kdenlive = "(org.kde.kdenlive)"; + shotcut = "(shotcut)"; + scrcpy = "(.scrcpy-wrapped)"; maxsizeWindows = [ "maxsize 720 400, class:^${blueman}$" "maxsize 360 500, class:^${calculator}$" "maxsize 720 400, class:^${easyeffects}$" + "maxsize 720 400, class:^${scrcpy}$" "maxsize 720 400, class:^${mpv}$" "maxsize 720 400, class:^${vlc}$" "maxsize 640 360, class:^${nomacs}$" @@ -37,6 +40,7 @@ let "class:^${vlc}$" "class:^${nomacs}$" "class:^${flameshot}$" + "class:^${scrcpy}$" "title:^(${picture})$" "title:^${bitwarden}$" ]; @@ -62,10 +66,12 @@ let workspaceInit3 = builtins.map (x: "workspace 3 silent, " + x) [ "class:^${steam}$" + "class:^${shotcut}$" ]; workspaceInit4 = builtins.map (x: "workspace 4 silent, " + x) [ "class:^${feishin}$" + "class:^${scrcpy}$" ]; centerWindows = builtins.map (x: "center, " + x) [ @@ -78,7 +84,7 @@ let "class:^${firefox}$" "class:^${kdenlive}$" "class:^(krita)$" - "class:^(shotcut)$" + "class:^${shotcut}$" "class:^${mpv}$" "class:^(Brave-browser)$" "class:^(Gimp-2.10)$" diff --git a/home/modules/misc/hyprland.nix b/home/modules/misc/hyprland.nix index 0b73612..6ca2d26 100755 --- a/home/modules/misc/hyprland.nix +++ b/home/modules/misc/hyprland.nix @@ -7,6 +7,7 @@ swaylock playerctl brightnessctl + glib ; }; } diff --git a/home/modules/waybar/config/scripts/get_weather.sh b/home/modules/waybar/config/scripts/get_weather.sh new file mode 100755 index 0000000..2aee731 --- /dev/null +++ b/home/modules/waybar/config/scripts/get_weather.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +for i in {1..5} +do + text=$(curl -s "https://wttr.in/$1?format=1") + if [[ $? == 0 ]] + then + text=$(echo "$text" | sed -E "s/\s+/ /g") + tooltip=$(curl -s "https://wttr.in/$1?format=4") + if [[ $? == 0 ]] + then + tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g") + echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}" + exit + fi + fi + sleep 2 +done +echo "{\"text\":\"error\", \"tooltip\":\"error\"}" \ No newline at end of file diff --git a/home/modules/waybar/config/settings.nix b/home/modules/waybar/config/settings.nix index 503c555..7dbf8d0 100755 --- a/home/modules/waybar/config/settings.nix +++ b/home/modules/waybar/config/settings.nix @@ -1,4 +1,9 @@ -{ +{flake, ...}: let + inherit + (flake.config.people) + user0 + ; +in { mainBar = { position = "bottom"; layer = "top"; @@ -11,10 +16,14 @@ "custom/launcher" "hyprland/workspaces" ]; + modules-center = [ + "custom/weather" ]; + modules-right = [ "tray" + "privacy" "cpu" "memory" "disk" @@ -22,6 +31,7 @@ # "network" "clock" ]; + clock = { calendar = { format = {today = "{}";}; @@ -31,6 +41,7 @@ tooltip-format = "{:%Y %B}\n{calendar}"; format-alt = " {:%d/%m}"; }; + "hyprland/workspaces" = { active-only = false; disable-scroll = true; @@ -52,21 +63,25 @@ "4" = []; }; }; + memory = { format = "󰟜 {}%"; format-alt = "󰟜 {used} GiB"; #  interval = 2; }; + cpu = { format = " {usage}%"; format-alt = " {avg_frequency} GHz"; interval = 2; }; + disk = { # path = "/"; format = "󰋊 {percentage_used}%"; interval = 60; }; + # network = { # format-wifi = " {signalStrength}%"; # format-ethernet = "󰀂 "; @@ -74,10 +89,12 @@ # format-linked = "{ifname} (No IP)"; # format-disconnected = "󰖪 "; # }; + tray = { - icon-size = 18; + icon-size = 12; spacing = 8; }; + pulseaudio = { format = "{icon} {volume}%"; tooltip = false; @@ -102,6 +119,37 @@ # on-click-right = "pkill tofi || wallpaper-picker"; tooltip = false; }; + + privacy = { + icon-spacing = 8; + icon-size = 12; + transition-duration = 250; + modules = { + screenshare = { + type = "screenshare"; + tooltip = true; + tooltip-icon-size = 12; + }; + audio-out = { + type = "audio-out"; + tooltip = true; + tooltip-icon-size = 12; + }; + audio-in = { + type = "audio-in"; + tooltip = true; + tooltip-icon-size = 12; + }; + }; + }; + + "custom/weather" = { + exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/waybar/config/scripts/get_weather.sh Winnipeg"; + return-type = "json"; + format = "{}"; + tooltip = true; + interval = 3600; + }; }; } # https://unicodes.jessetane.com/ diff --git a/home/modules/waybar/config/style.nix b/home/modules/waybar/config/style.nix index fa69b0c..c8a78d8 100755 --- a/home/modules/waybar/config/style.nix +++ b/home/modules/waybar/config/style.nix @@ -6,7 +6,7 @@ ; custom = { font = font; - font_size = "14px"; + font_size = "12px"; font_weight = "bold"; text_color = colors.mauve; secondary_accent = colors.lavender; @@ -50,12 +50,15 @@ in '' color: #${colors.mauve}; } - #tray, #pulseaudio, #cpu, #memory, #disk, #clock { + #tray, #pulseaudio, #privacy, #cpu, #memory, #disk, #clock { font-size: ${custom.font_size}; color: #${colors.mauve}; padding-right: 10px; } + #privacy { + } + #cpu { } @@ -80,4 +83,10 @@ in '' font-weight: ${custom.font_weight}; padding-left: 10px; } + + #custom-weather { + font-size: 14px; + color: #${colors.mauve}; + font-weight: ${custom.font_weight}; + } '' diff --git a/home/modules/waybar/default.nix b/home/modules/waybar/default.nix index 435c9f9..e8ce787 100755 --- a/home/modules/waybar/default.nix +++ b/home/modules/waybar/default.nix @@ -4,7 +4,7 @@ ... }: let configPath = ./config; - settingsPath = import (configPath + /settings.nix); + settingsPath = import (configPath + /settings.nix) {inherit flake;}; stylePath = import (configPath + /style.nix) { inherit flake diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index 1773dec..4d04546 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -111,4 +111,14 @@ in { "Videos" ]); }; + # system.activationScripts.zoxide = '' + # z /home/nick/Files/Projects/dotfiles + # z /home/nick/Files/Projects/website + # z /home/nick/Files/Projects/website/frontend + # z /home/nick/Downloads + # z /mnt/media/server/jellyfin/media + # z /mnt/media/storage + # z /mnt/media/synology/nick/Multimedia/Images/Assorted/Stuff + # z /mnt/media/synology/nick/Syncthing/Pixel + # ''; }