diff --git a/README.md b/README.md index a093a86..861d640 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,11 @@ ### For sway - wl-root +- grim +- slurp +- wl-clipboard - sway +- swaybg - waybar ### Others (notifications and icons) @@ -51,4 +55,4 @@ curl -sL install-node.vercel.app/lts | bash ### coc.vimtex ``` :CocInstall coc-vimtex -``` \ No newline at end of file +``` diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index d19fa0a..956baf2 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -1,20 +1,20 @@ font: normal: - family: MesloLGS NF + family: 0xProto Nerd Font #style: Regular bold: - family: MesloLGS NF + family: 0xProto Nerd Font #style: Bold # Italic font face italic: # value specified for the normal font. - family: MesloLGS NF + family: 0xProto Nerd Font #style: Italic bold_italic: - family: MesloLGS NF + family: 0xProto Nerd Font #style: Bold Italic # Point size size: 13.0 diff --git a/i3/config b/i3/config index 998f9c9..464995b 100644 --- a/i3/config +++ b/i3/config @@ -25,10 +25,9 @@ exec --no-startup-id dex --autostart --environment i3 # The combination of xss-lock, nm-applet and pactl is a popular choice, so # they are included here as an example. Modify as you see fit. -exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh +#exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the # screen before suspend. Use loginctl lock-session to lock your screen. -exec --no-startup-id xss-lock --transfer-sleep-lock --i3lock --nofork --ignore-empty-password -i $wallpaper exec --no-startup-id xrand --output HDMI-0 --mode 1920x1080 --rate 120 bindsym $mod+l exec i3lock --ignore-empty-password -i $wallpaper diff --git a/polybar/config.ini b/polybar/config.ini index d4e6141..2ea6420 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -119,20 +119,18 @@ label-foreground = ${colors.altprime} [module/battery] type = internal/battery full-at = 99 -low-at = 15 +low-at = 5 ; Use the following command to list batteries and adapters: ; $ ls -1 /sys/class/power_supply/ battery = BAT0 adapter = AC time-format = %H:%M -label-charging = %percentage%% -label-discharging = %percentage%% -format-charging = +label-charging = Charging %percentage%% +label-discharging = Discharging %percentage%% +format-charging = format-discharging = -;label-full = Fully charged -label-full =  - +label-full = Fully charged label-low = BATTERY LOW ; Only applies if is used diff --git a/polybar/scripts/polytiramisu.sh b/polybar/scripts/polytiramisu.sh index 6d3270d..fffc1a7 100755 --- a/polybar/scripts/polytiramisu.sh +++ b/polybar/scripts/polytiramisu.sh @@ -5,7 +5,7 @@ display_duration=7.0 # Maximum number of characters: -char_limit=150 +char_limit=120 # Stop old tiramisu processes if any: pgrep -x tiramisu >/dev/null && killall tiramisu diff --git a/sway/config b/sway/config index b422fa0..016553b 100644 --- a/sway/config +++ b/sway/config @@ -23,14 +23,15 @@ set $menu wofi --show drun ### Output configuration # # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -#output * bg /data/sync/images/wallpapers/stonebeach.jpg fill -output * bg /usr/share/wallpapers/openSUSEdefault/contents/images/default-dark.png fill - +set $bg /data/sync/images/wallpapers/0002.png set $screenlock 'swaylock --config /etc/swaylock/openSUSEway.conf' +set $images $(xdg-user-dir PICTURES)/$(date +'%s_grim.png') # + +exec --no-startup-id swaybg -m fill -i $bg # Example configuration: # -output HDMI-A-1 resolution 1920x1080@120hz position 1920,0 +#output HDMI-A-1 resolution 1920x1080@120hz position 1920,0 # # You can get the names of your outputs by running: swaymsg -t get_outputs @@ -69,26 +70,31 @@ input "2:7:SynPS/2_Synaptics_TouchPad" { events disabled_on_external_mouse } +#exec --no-startup-id /usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh +exec --no-startup-id kwalletd6 exec --no-startup-id fcitx5 -exec --no-startup-id blueman-applet -#exec --no-startup-id feh --bg-fill '/data/sync/images/wallpapers/stonebeach.jpg' +#exec --no-startup-id blueman-applet exec --no-startup-id owncloud exec --no-startup-id waybar exec --no-startup-id nm-applet --indicator -#exec --no-startup-id nohup gentoo-pipewire-launcher restart >/dev/null 2>&1 & +exec --no-startup-id nohup gentoo-pipewire-launcher restart >/dev/null 2>&1 & exec --no-startup-id xset m 1/1 0 +exec --no-startup-id /usr/lib/pam_kwallet_init -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status -bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status -bindcode $mod+60 exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status -bindcode $mod+59 exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status -bindcode $mod+61 exec playerctl play-pause +# Use pactl to adjust volume in PulseAudio. +bindsym XF86AudioRaiseVolume exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 0.02+ --limit 1 && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 0.02- --limit 0 && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id wpctl set-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id wpctl set-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status +bindsym $mod+slash exec --no-startup-id wpctl set-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym $mod+period exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 0.02+ --limit 1 && $refresh_i3status +bindsym $mod+comma exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 0.02- --limit 0 && $refresh_i3status -bindsym $mod+Shift+comma exec playerctl previous -bindsym $mod+Shift+period exec playerctl next + +# Brightness key bindings +bindsym XF86MonBrightnessUp exec brightnessctl set +5% +bindsym XF86MonBrightnessDown exec brightnessctl set 5%- # Media player key bindings (need media-sound/playerctl for playerctl.) bindsym XF86AudioPlay exec playerctl play @@ -96,9 +102,12 @@ bindsym XF86AudioPause exec playerctl pause bindsym XF86AudioNext exec playerctl next bindsym XF86AudioPrev exec playerctl previous -# Brightness key bindings -bindsym XF86MonBrightnessUp exec brightnessctl set +5% -bindsym XF86MonBrightnessDown exec brightnessctl set 5%- +bindsym $mod+Shift+comma exec playerctl previous +bindsym $mod+Shift+period exec playerctl next +bindsym $mod+Shift+slash exec playerctl play-pause + +bindsym Print exec grim -g "$(slurp)" - | wl-copy +bindsym $mod+Print exec grim -o $images ### Key bindings # # Basics: @@ -126,7 +135,7 @@ bindsym $mod+Shift+c reload # Exit sway (logs you out of your Wayland session) #bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' bindsym $mod+Shift+p exec systemctl poweroff -bindsym $mod+Shift+e exec swaymsg exit +bindsym $mod+Shift+l exec swaymsg exit # # Moving around: # @@ -137,10 +146,10 @@ bindsym $mod+Up focus up bindsym $mod+Right focus right # move focused window -bindsym $mod+Shift+j move left -bindsym $mod+Shift+k move down -bindsym $mod+Shift+l move up -bindsym $mod+Shift+semicolon move right +#bindsym $mod+Shift+j move left +#bindsym $mod+Shift+k move down +#bindsym $mod+Shift+l move up +#bindsym $mod+Shift+semicolon move right # alternatively, you can use the cursor keys: bindsym $mod+Shift+Left move left @@ -188,10 +197,10 @@ bindsym $mod+w layout tabbed bindsym $mod+e layout toggle split # Make the current focus fullscreen -bindsym $mod+f fullscreen +bindsym $mod+Shift+space fullscreen # Toggle the current focus between tiling and floating mode -bindsym $mod+Shift+space floating toggle +bindsym $mod+f floating toggle # Swap focus between the tiling area and the floating area bindsym $mod+space focus mode_toggle @@ -249,8 +258,14 @@ bar { for_window [class="^.*"] border pixel 1 #floating -for_window [class="Signal"] floating enable -for_window [class="Gajim"] floating enable +for_window [app_id="signal"] floating enable +for_window [app_id="fluffychat"] floating enable +for_window [app_id="im.dino.Dino"] floating enable +for_window [app_id="desktopclient.owncloud.com.owncloud"] floating enable +for_window [app_id="firefox-bin"] move to workspace 1 +for_window [app_id="thunderbird"] move container to workspace 4 +for_window [app_id="thunar"] move container to workspace 3 +for_window [title="wtui"] floating enable include ~./config/sway/* #include /etc/sway/config.d/* diff --git a/waybar/config b/waybar/config index b91fc61..d800255 100644 --- a/waybar/config +++ b/waybar/config @@ -4,8 +4,8 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/window"], "modules-center": ["clock"], - "modules-right": ["custom/tiramisu","battery", "wireplumber", "tray"], - //"modules-right": ["custom/tiramisu", "network", "wireplumber", "tray"], + "modules-right": ["custom/tiramisu","battery", "bluetooth", "network", "wireplumber", "tray"], + //"modules-right": ["custom/tiramisu", "bluetooth",network", "wireplumber", "tray"], // Modules configuration // "hyprland/workspaces": { // "disable-scroll": true, @@ -17,7 +17,7 @@ "format": "{icon}", }, "tray": { - "icon-size": 21, + "icon-size": 18, "spacing": 10 }, "clock": { @@ -25,18 +25,32 @@ "tooltip-format": "{:%Y %B}\n{calendar}", "format-alt": "{:%Y-%m-%d %H:%M}" }, + "bluetooth": { + //"format": "{status}  ", + "format-on": "", + "format-off": "󰂲", + "format-connected": "{device_alias} 󰂱", + // "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device + "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}", + "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%", + "on-click": "~/.local/bin/rofi-bluetooth" + //"on-click": "blueman-manager" + }, "network": { - "format-wifi": " {icon}", - "format-ethernet": "  ", - "format-disconnected": "󰌙", - "format-icons": [ - "󰤯 ", - "󰤟 ", - "󰤢 ", - "󰤢 ", - "󰤨 " - ], - "on-click": "alacritty -e nmtui" + "interface": "wls2", + "format": "{ifname}", + "format-wifi": "{essid} {icon}", + "format-ethernet": "{ipaddr}/{cidr} 󰊗", + "format-disconnected": "", //An empty format will hide the module. + "tooltip-format": "{ifname} via {gwaddr} 󰊗", + "tooltip-format-wifi": "{essid} ({signalStrength}%) ", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected", + "max-length": 50, + "format-icons": ["󰤟 ", "󰤢 ","󰤥 ","󰤨 "], + "on-click": "swaymsg exec '$term -t wtui -e nmtui-connect'" }, "battery": { "interval": 1, @@ -57,18 +71,18 @@ "tooltip": false }, "wireplumber": { - "format": "{volume}%", - "format-muted": "{node_name} off", + //"format": "{icon}", + "format": "{volume}% {icon}", + "format-muted": "{node_name} 󰝟", "on-click-right": "pactl set-default-sink $((s=$(pactl list short sinks | sed -e 's:^[0-9]\\+\\s\\+::' | grep -oP '^\\S+'); echo \"$s\"; echo \"$s\") | fgrep $(pactl get-default-sink) -m 1 -A 1 | tail -1)", "on-click": "pavucontrol", "max-volume": 100, "scroll-step": 2, - "format-icons": ["", ""], + "format-icons":["󰕿","","󰕾"] }, - "custom/tiramisu": { "format": "{} ", "exec": "sh ~/.config/polybar/scripts/polytiramisu.sh", }, -} +}, diff --git a/waybar/style.css b/waybar/style.css index 37d9ab3..2aa19d7 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -17,166 +17,166 @@ @define-color content_inactive rgba(255, 255, 255, 0.69); * { - text-shadow: none; - box-shadow: none; - border: none; - border-radius: 0; - font-family: "Hack Nerd Font" ; - font-weight: 400; - font-size: 16px; - - + text-shadow: none; + box-shadow: none; + border: none; + border-radius: 0; + font-family: "0xProto Nerd Font" ; + font-weight: 400; + font-size: 16px; + + } window#waybar { - background: @bg_main; - border-top: 1px solid @border_main; - color: @content_main; + background: @bg_main; + border-top: 1px solid @border_main; + color: @content_main; } tooltip { - background: @bg_main_tooltip; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: @border_main; + background: @bg_main_tooltip; + border-radius: 5px; + border-width: 1px; + border-style: solid; + border-color: @border_main; } tooltip label{ - color: @content_main; + color: @content_main; } #custom-os_button { - font-family: "JetBrainsMono Nerd Font"; - font-size: 24px; - padding-left: 12px; - padding-right: 20px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + font-family: "JetBrainsMono Nerd Font"; + font-size: 24px; + padding-left: 12px; + padding-right: 20px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #custom-os_button:hover { - background: @bg_hover; - color: @content_main; + background: @bg_hover; + color: @content_main; } #workspaces { - color: transparent; - margin-right: 1.5px; - margin-left: 1.5px; + color: transparent; + margin-right: 1.5px; + margin-left: 1.5px; } #workspaces button { - padding: 3px; - color: @content_inactive; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + padding: 3px; + color: @content_inactive; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #workspaces button.active { - color: @content_main; - border-bottom: 3px solid white; + color: @content_main; + border-bottom: 3px solid white; } #workspaces button.focused { - color: @bg_active; + color: @bg_active; } #workspaces button.urgent { - background: rgba(255, 200, 0, 0.35); - border-bottom: 3px dashed @warning_color; - color: @warning_color; + background: rgba(255, 200, 0, 0.35); + border-bottom: 3px dashed @warning_color; + color: @warning_color; } #workspaces button:hover { - background: @bg_hover; - color: @content_main; + background: @bg_hover; + color: @content_main; } #taskbar { } #taskbar button { - min-width: 130px; - border-bottom: 3px solid rgba(255, 255, 255, 0.3); - margin-left: 2px; - margin-right: 2px; - padding-left: 8px; - padding-right: 8px; - color: white; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + min-width: 130px; + border-bottom: 3px solid rgba(255, 255, 255, 0.3); + margin-left: 2px; + margin-right: 2px; + padding-left: 8px; + padding-right: 8px; + color: white; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #taskbar button.active { - border-bottom: 3px solid white; - background: @bg_active; + border-bottom: 3px solid white; + background: @bg_active; } #taskbar button:hover { - border-bottom: 3px solid white; - background: @bg_hover; - color: @content_main; + border-bottom: 3px solid white; + background: @bg_hover; + color: @content_main; } #cpu, #disk, #memory { - padding:3px; + padding:3px; } #temperature { - color: transparent; - font-size: 0px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + color: transparent; + font-size: 0px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #temperature.critical { - padding-right: 3px; - color: @warning_color; - font-size: initial; - border-bottom: 3px dashed @warning_color; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + padding-right: 3px; + color: @warning_color; + font-size: initial; + border-bottom: 3px dashed @warning_color; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #window { - border-radius: 10px; - margin-left: 20px; - margin-right: 20px; + border-radius: 10px; + margin-left: 20px; + margin-right: 20px; } #tray{ - margin-left: 5px; - margin-right: 5px; + margin-left: 5px; + margin-right: 5px; } #tray > .passive { - border-bottom: none; + border-bottom: none; } /*#tray > .active {*/ - /*border-bottom: 3px solid white;*/ +/*border-bottom: 3px solid white;*/ /*}*/ #tray > .needs-attention { - border-bottom: 3px solid @warning_color; + border-bottom: 3px solid @warning_color; } #tray > widget { - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #tray > widget:hover { - background: @bg_hover; + background: @bg_hover; } -#pulseaudio { - font-family: "JetBrainsMono Nerd Font"; - padding-left: 3px; - padding-right: 3px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +#wireplumber { + font-family: "0xProto Nerd Font"; + padding-left: 3px; + padding-right: 3px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #pulseaudio:hover { - background: @bg_hover; + background: @bg_hover; } #network { - padding-left: 3px; - padding-right: 3px; + padding-left: 3px; + padding-right: 3px; } #language { - padding-left: 5px; - padding-right: 5px; + padding-left: 5px; + padding-right: 5px; } #clock { - padding-right: 5px; - padding-left: 5px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + padding-right: 5px; + padding-left: 5px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); } #clock:hover { - background: @bg_hover; + background: @bg_hover; }