From cc8add034d7343a65fba497fd3fb2e117ead0eb2 Mon Sep 17 00:00:00 2001 From: Nathan Anderson Date: Mon, 2 Sep 2024 14:45:05 -0600 Subject: [PATCH] Update sway config --- jaci/dotfiles/waybar/style.css | 76 ++--- nate/dotfiles/mako/config | 18 +- nate/dotfiles/sway/config.d/default | 2 +- nate/dotfiles/sway/config.d/output | 2 +- nate/dotfiles/sway/config.d/theme | 4 +- nate/dotfiles/sway/scripts/screenshot.sh | 41 ++- .../dotfiles/sway/wallpapers/nix-black-4k.png | Bin 0 -> 70180 bytes nate/dotfiles/waybar/config | 74 +++-- nate/dotfiles/waybar/style.css | 287 ++++++++++++------ nate/modules/home-manager/home.nix | 3 + nate/modules/sway/sway_conf.nix | 10 +- 11 files changed, 335 insertions(+), 182 deletions(-) create mode 100644 nate/dotfiles/sway/wallpapers/nix-black-4k.png diff --git a/jaci/dotfiles/waybar/style.css b/jaci/dotfiles/waybar/style.css index 82e5601..328573f 100644 --- a/jaci/dotfiles/waybar/style.css +++ b/jaci/dotfiles/waybar/style.css @@ -7,49 +7,51 @@ @define-color egg_shell #f8f1dd; * { - border: none; - border-radius: 0; - margin: 0; - padding: 0; - color: @egg_shell; - font-family: "GohuFont 14 Nerd Font"; - font-size: 16px; - font-weight: normal; + border: none; + border-radius: 0; + margin: 0; + padding: 0; + color: @egg_shell; + font-family: "GohuFont 14 Nerd Font"; + font-size: 16px; + font-weight: normal; } /* The whole bar */ #waybar { - background: transparent; - background-color: transparent; + background: transparent; + background-color: transparent; } #taskbar { - background: transparent; - color: @egg_shell; + background: transparent; + color: @egg_shell; } + #taskbar button { - padding-left: 3px; - padding-right: 3px; - margin-left: 3px; - margin-right: 3px; - color: transparent; - border-bottom: 2px solid; + padding-left: 3px; + padding-right: 3px; + margin-left: 3px; + margin-right: 3px; + color: transparent; + border-bottom: 2px solid; } #taskbar button.active { - color: @celeste; + color: @celeste; } .modules-left, .modules-right, .modules-center { - margin: 8px 8px 1px 8px; - background: transparent; - color: @egg_shell; - background-color: @english_violet; - border-radius: 25px; - padding: 0px 10px 0px 10px; + margin: 8px 8px 1px 8px; + background: transparent; + color: @egg_shell; + background-color: @english_violet; + border-radius: 25px; + padding: 0px 10px 0px 10px; } + /* Every modules */ #clock, #cpu, @@ -58,8 +60,8 @@ #network, #pulseaudio, #taskbar { - padding:0.5rem 0.6rem; - margin: 1px 0px; + padding: 0.5rem 0.6rem; + margin: 1px 0px; } /* ----------------------------------------------------------------------------- @@ -67,7 +69,7 @@ * -------------------------------------------------------------------------- */ #clock { - min-width: 140px; + min-width: 140px; } #cpu.warning, @@ -75,24 +77,24 @@ #memory.warning, #memory.critical, #network.disconnected { - color: @indian_red; + color: @indian_red; } #pulseaudio { - padding-top:6px; + padding-top: 6px; } #pulseaudio.muted { - color: @celeste; + color: @celeste; } #custom-spotify { - color: @celadon; + color: @celadon; } #custom-power { - margin-left:15px; - margin-right:15px; - font-size:15px; - color: @indian_red; -} + margin-left: 15px; + margin-right: 15px; + font-size: 15px; + color: @indian_red; +} \ No newline at end of file diff --git a/nate/dotfiles/mako/config b/nate/dotfiles/mako/config index ae4922a..286de2f 100644 --- a/nate/dotfiles/mako/config +++ b/nate/dotfiles/mako/config @@ -1,19 +1,19 @@ -font=UbuntuMono 12.5 +font=Overpass Nerd Font 20 -background-color=#404552 -text-color=#e5e9f0 -width=315 -height=200 +background-color=#24273a +text-color=#cad3f5 +width=630 +height=400 padding=10 -margin=10 +margin=20 progress-color=over #eceff480 icon-path=/usr/share/icons/Arc-X-D -max-icon-size=70 +max-icon-size=140 layer=overlay border-size=5 -border-radius=0 -border-color=#5294e2 +border-radius=8 +border-color=#b7bdf8 default-timeout=5000 diff --git a/nate/dotfiles/sway/config.d/default b/nate/dotfiles/sway/config.d/default index 0e740bb..2d73c74 100644 --- a/nate/dotfiles/sway/config.d/default +++ b/nate/dotfiles/sway/config.d/default @@ -225,7 +225,7 @@ bindsym $mod+r mode "resize" # # Screenshots # - bindsym $mod+Shift+p exec /usr/share/sway/scripts/grimshot --notify save output + bindsym $mod+Shift+p exec ~/.config/sway/scripts/screenshot.sh clipboard bindsym $mod+p exec ~/.config/sway/scripts/screenshot.sh # # Keybindings List diff --git a/nate/dotfiles/sway/config.d/output b/nate/dotfiles/sway/config.d/output index 6cc4419..b8d6e7a 100644 --- a/nate/dotfiles/sway/config.d/output +++ b/nate/dotfiles/sway/config.d/output @@ -9,5 +9,5 @@ # Wacom Tablet - Example # input "1386:884:Wacom_Intuos_S_Pad" map_to_output HDMI-A-1 # input "1386:884:Wacom_Intuos_S_Pen" map_to_output HDMI-A-1 -output DP-3 resolution 2560x1440@164.956Hz position 0,0 +output DP-3 resolution 3840x2160@240.084Hz position 0,0 output * adaptive_sync off diff --git a/nate/dotfiles/sway/config.d/theme b/nate/dotfiles/sway/config.d/theme index 6499a37..d0d114e 100644 --- a/nate/dotfiles/sway/config.d/theme +++ b/nate/dotfiles/sway/config.d/theme @@ -41,8 +41,8 @@ font pango:Overpass Nerd Font 12 smart_borders on # Set wallpaper: -#exec_always swaybg -i /home/nate/.config/sway/wallpapers/ign-0000.png -exec_always /home/nate/.config/sway/scripts/background.sh +exec_always swaybg -i /home/nate/.config/sway/wallpapers/nix-black-4k.png +# exec_always /home/nate/.config/sway/scripts/background.sh # Title format for windows for_window [shell="xdg_shell"] title_format "%title (%app_id)" diff --git a/nate/dotfiles/sway/scripts/screenshot.sh b/nate/dotfiles/sway/scripts/screenshot.sh index 43d5dab..4221889 100755 --- a/nate/dotfiles/sway/scripts/screenshot.sh +++ b/nate/dotfiles/sway/scripts/screenshot.sh @@ -3,16 +3,31 @@ entries="Active Screen Output Area Window" selected=$(printf '%s\n' $entries | wofi --style=$HOME/.config/wofi/style.widgets.css --conf=$HOME/.config/wofi/config.screenshot | awk '{print tolower($1)}') - -case $selected in - active) - grimshot --notify save active;; - screen) - grimshot --notify save screen;; - output) - grimshot --notify save output;; - area) - grimshot --notify save area;; - window) - grimshot --notify save window;; -esac + +if [ "$1" == "clipboard" ]; then + case $selected in + active) + grimshot --notify copy active;; + screen) + grimshot --notify copy screen;; + output) + grimshot --notify copy output;; + area) + grimshot --notify copy area;; + window) + grimshot --notify copy window;; + esac +else + case $selected in + active) + grimshot --notify save active;; + screen) + grimshot --notify save screen;; + output) + grimshot --notify save output;; + area) + grimshot --notify save area;; + window) + grimshot --notify save window;; + esac +fi diff --git a/nate/dotfiles/sway/wallpapers/nix-black-4k.png b/nate/dotfiles/sway/wallpapers/nix-black-4k.png new file mode 100644 index 0000000000000000000000000000000000000000..7b5094e194b900eebb4edbfe1f028dd98f8435d3 GIT binary patch literal 70180 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 literal 0 HcmV?d00001 diff --git a/nate/dotfiles/waybar/config b/nate/dotfiles/waybar/config index b4c0de5..55c702d 100644 --- a/nate/dotfiles/waybar/config +++ b/nate/dotfiles/waybar/config @@ -2,13 +2,13 @@ { "layer": "top", "position": "top", - "margin-top": 8, + "margin-top": 3, "margin-left": 10, "margin-right": 10, - "margin-bottom": 8, + "margin-bottom": 3, // If height property would be not present, it'd be calculated dynamically - "height": 30, + "height": 60, "modules-left": [ "custom/launcher", @@ -17,6 +17,13 @@ ], "modules-center": [ + "custom/signal", + "custom/steam", + "custom/spotify", + "custom/firefox", + "custom/slack", + "custom/files", + "custom/pomo", ], "modules-right": [ @@ -25,12 +32,11 @@ "memory", "cpu", "pulseaudio", - "custom/spotify", "custom/keyboard-layout", "battery", //"custom/PBPbattery", - "backlight#icon", - "backlight#value", + // "backlight#icon", + // "backlight#value", "clock", "tray", //"custom/weather", @@ -173,6 +179,12 @@ "interval": 600, }, + // "custom/temp": { + // "exec": "notify-send \"temp thing\"", + // "interval": "once", + // "signal": 8, + // }, + "tray": { "icon-size": 18, "spacing":10, @@ -191,28 +203,54 @@ "on-scroll-up": "brightnessctl -c backlight set +1%" }, - "custom/firefox": { - "format": " ", - "on-click": "exec firefox", - "tooltip": false + "custom/signal": { + "format": "  ", + "on-click": "exec signal", + "tooltip": false, + }, + + "custom/steam": { + "format": "  ", + "on-click": "exec steam", + "tooltip": false, }, "custom/spotify": { "format": "  ", "on-click": "foot -e 'ncspot'", - "tooltip": false + "tooltip": false, }, - "custom/terminal": { - "format": " ", - "on-click": "exec foot", - "tooltip": false + "custom/firefox": { + "format": "  ", + "on-click": "exec firefox", + "tooltip": false, }, - "custom/files": { - "format": " ", + + "custom/slack": { + "format": "  ", + "on-click": "slack", + "tooltip": false, + "exec if": "pgrep slack" + }, + + + "custom/files": { + "format": " 󰉋 ", "on-click": "exec thunar", - "tooltip": false + "tooltip": false, + }, + + + "custom/pomo": { + "format": " {} ", + "exec": "/home/nate/source/pomozoro/zig-out/bin/pomozoro", + "return-type": "json", + "on-click": "echo 's' > ~/.local/share/pomozoro/pomopipe", + "on-click-right": "echo 'p' > ~/.local/share/pomozoro/pomopipe", + "on-click-middle": "echo 'r' > ~/.local/share/pomozoro/pomopipe", + // "signal": 8, }, "custom/launcher": { diff --git a/nate/dotfiles/waybar/style.css b/nate/dotfiles/waybar/style.css index 12969fa..00aa873 100644 --- a/nate/dotfiles/waybar/style.css +++ b/nate/dotfiles/waybar/style.css @@ -6,67 +6,110 @@ * * =========================================================================== */ +@define-color rosewater #f4dbd6; +@define-color flamingo #f0c6c6; +@define-color pink #f5bde6; +@define-color mauve #c6a0f6; +@define-color red #ed8796; +@define-color maroon #ee99a0; +@define-color peach #f5a97f; +@define-color yellow #eed49f; +@define-color green #a6da95; +@define-color teal #8bd5ca; +@define-color sky #91d7e3; +@define-color sapphire #7dc4e4; +@define-color blue #8aadf4; +@define-color lavender #b7bdf8; +@define-color text #cad3f5; +@define-color subtext1 #b8c0e0; +@define-color subtext0 #a5adcb; +@define-color overlay2 #939ab7; +@define-color overlay1 #8087a2; +@define-color overlay0 #6e738d; +@define-color surface2 #5b6078; +@define-color surface1 #494d64; +@define-color surface0 #363a4f; +@define-color base #24273a; +@define-color mantle #1e2030; +@define-color crust #181926; + + /* ----------------------------------------------------------------------------- * Keyframes * -------------------------------------------------------------------------- */ - -/* -Nordic Color Scheme -*/ -@define-color nord2 #434c5e; -@define-color nord3 #4c566a; -@define-color nord4 #d8dee9; -@define-color nord8 #88c0d0; -@define-color nord9 #81a1c1; -@define-color nord_cyan #8fbcbb; -@define-color nord_orange #d08770; -@define-color nord_red #bf616a; -@define-color nord_green #a3be8c; -@define-color nord_yellow #ebcb8b; - @keyframes blink-warning { - 70% { - color: white; - } + 70% { + color: @overlay0; + } - to { - color: white; - background-color: @nord_orange; - } + to { + color: @overlay0; + background-color: @crust; + } } @keyframes blink-critical { - 70% { - color: white; - } + 70% { + color: @overlay2; + } - to { - color: white; - background-color: @nord_red; - } + to { + color: @overlay2; + background-color: @base; + } } + /* ----------------------------------------------------------------------------- * Base styles * -------------------------------------------------------------------------- */ - /* Reset all styles */ * { - border: none; - border-radius: 0; - min-height: 0; - margin: 1px; - padding: 0; + border: none; + border-radius: 0; + min-height: 0; + margin: 1px; + padding: 0; } /* The whole bar */ #waybar { - background: transparent; - color: @nord4; - background-color: @nord3; - font-family: Overpass Nerd Font; - font-size: 16px; - border-radius: 15px; + background: transparent; + background-color: transparent; + font-family: Overpass Nerd Font; + font-size: 20px; + color: @text; +} + +#taskbar { + background: transparent; +} + +#taskbar button { + padding-left: 3px; + padding-right: 3px; + margin-left: 3px; + margin-right: 3px; + color: transparent; + border-bottom: 2px solid; +} + +#taskbar button.active { + color: @lavender; +} + +.modules-left, +.modules-right, +.modules-center { + /* margin: 8px 8px 1px 8px; */ + background: transparent; + /* color: @; */ + background-color: @base; + border-radius: 25px; + padding: 0px 10px 0px 10px; + border-style: solid; + border-width: 3px; + border-color: @surface0; } /* Every modules */ @@ -84,8 +127,8 @@ Nordic Color Scheme #tray, #idle_inhibitor, #custom-PBPbattery { - padding:0.5rem 0.6rem; - margin: 1px 0px; + padding: 0.5rem 0.6rem; + margin: 1px 0px; } /* ----------------------------------------------------------------------------- @@ -93,127 +136,179 @@ Nordic Color Scheme * -------------------------------------------------------------------------- */ #battery { - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } #battery.warning { - color: @nord_orange; + color: @flamingo; } #battery.critical { - color: @nord_red; + color: @red; } #battery.warning.discharging { - animation-name: blink-warning; - animation-duration: 3s; + animation-name: blink-warning; + animation-duration: 3s; } #battery.critical.discharging { - animation-name: blink-critical; - animation-duration: 2s; + animation-name: blink-critical; + animation-duration: 2s; } #cpu.warning { - color: @nord_orange; + color: @flamingo; } #cpu.critical { - color: @nord_red; + color: @red; } #memory { - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; } #memory.warning { - color: @nord_orange; - } + color: @flamingo; +} #memory.critical { - color: @nord_red; - animation-name: blink-critical; - animation-duration: 2s; - padding-left:5px; - padding-right:5px; + color: @red; + animation-name: blink-critical; + animation-duration: 2s; + padding-left: 5px; + padding-right: 5px; } #mode { - background: @nord8; - border-bottom: 3px transparent; - color:white; - margin-left: 5px; - padding: 7px; + background: @overlay0; + border-bottom: 3px transparent; + color: @text; + margin-left: 5px; + margin-right: 5px; + border-radius: 20px; } #network.disconnected { - color: @nord_orange; + color: @flamingo; } #pulseaudio { - padding-top:6px; + padding-top: 6px; } #pulseaudio.muted { - - color: @nord_cyan; + color: @sky; } #temperature.critical { - color: @nord_red; + color: @red; } #window { - font-weight: bold; + font-weight: bold; } #workspaces { - font-size:13px; + font-size: 13px; } #workspaces button { - border-bottom: 3px solid transparent; - margin-bottom: 0px; - padding:0px; + border-bottom: 3px solid transparent; + margin-bottom: 0px; + padding: 0px; } #custom-launcher { - color: @nord9; + color: @lavenderblush; +} + +/* @define-color rosewater #f4dbd6; */ +/* @define-color flamingo #f0c6c6; */ +/* @define-color pink #f5bde6; */ +/* @define-color mauve #c6a0f6; */ +/* @define-color red #ed8796; */ +/* @define-color maroon #ee99a0; */ +/* @define-color peach #f5a97f; */ +/* @define-color yellow #eed49f; */ +/* @define-color green #a6da95; */ +/* @define-color teal #8bd5ca; */ +/* @define-color sky #91d7e3; */ +/* @define-color sapphire #7dc4e4; */ +/* @define-color blue #8aadf4; */ +/* @define-color lavender #b7bdf8; */ + + +#custom-signal { + color: @lavender; + padding: 0px 5px 0px 5px; +} + +#custom-steam { + color: @teal; + padding: 0px 5px 0px 5px; } #custom-spotify { - color: @nord_green; + color: @green; + padding: 0px 5px 0px 5px; } +#custom-firefox { + color: @yellow; + padding: 0px 5px 0px 5px; +} + +#custom-slack { + color: @peach; + padding: 0px 5px 0px 5px; +} + +#custom-files { + color: @pink; + padding: 0px 5px 0px 5px; +} + +#custom-pomo { + color: @red; + padding: 0px 5px 0px 5px; +} + +#wiggle { + animation-name: blink-warning; +} + + #workspaces button.focused { - border-bottom: 3px solid @nord_green; - margin-bottom: 1px; - padding-left:0; + border-bottom: 3px solid @green; + margin-bottom: 1px; + padding-left: 0; } #workspaces button.urgent { - border-color: @nord2; - color: @nord_yellow; + border-color: @lavender; + color: @yellow; } #custom-power { - margin-left:15px; - margin-right:15px; - font-size:15px; - color: @nord_orange; + margin-left: 15px; + margin-right: 15px; + font-size: 15px; + color: @flamingo; } #custom-launcher { - font-size:15px; - margin-left:15px; - margin-right:10px; + font-size: 15px; + margin-left: 15px; + margin-right: 10px; } #backlight.icon { - padding-right:1px; - font-size: 13px; -} + padding-right: 1px; + font-size: 13px; +} \ No newline at end of file diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix index 4e076f3..b12f4e8 100644 --- a/nate/modules/home-manager/home.nix +++ b/nate/modules/home-manager/home.nix @@ -107,6 +107,8 @@ neofetch # Normies unzip + llpp + nmap # # Photo / Video @@ -144,6 +146,7 @@ libsForQt5.qtstyleplugin-kvantum libsForQt5.qt5ct # Install fonts + lato (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; }) recursive ]; diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix index 1343991..cddb93b 100644 --- a/nate/modules/sway/sway_conf.nix +++ b/nate/modules/sway/sway_conf.nix @@ -75,7 +75,8 @@ syncthingtray swaylock swayidle - swww + swaybg + # swww tailscale-systray wl-clipboard waybar @@ -165,7 +166,7 @@ }; }; - services.xserver.videoDrivers = [ "amdgpu" ]; + # services.xserver.videoDrivers = [ "amdgpu" ]; # Enable HIP systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" @@ -174,13 +175,12 @@ hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot hardware.opengl = { # Mesa - enable = true; + # enable = true; # Vulkan - driSupport = true; + # driSupport = true; # Rocm support and vulkan drivers extraPackages = with pkgs; [ rocmPackages.clr.icd - amdvlk ]; }; };