diff --git a/mpv/.config/mpv/mpv.conf b/mpv/.config/mpv/mpv.conf index 470e258..a6f8e92 100644 --- a/mpv/.config/mpv/mpv.conf +++ b/mpv/.config/mpv/mpv.conf @@ -10,3 +10,7 @@ volume-max=200 af=acompressor ## Youtube-dl settings ytdl-format=bestvideo[height<=?720][vcodec!=vp9]+bestaudio/best +## Wayland +gpu-context=wayland +## Default window size +geometry=50%x50% diff --git a/pam-gpg/.pam_environment b/pam-gpg/.pam_environment index cb081e6..ffc210f 100644 --- a/pam-gpg/.pam_environment +++ b/pam-gpg/.pam_environment @@ -1,3 +1,6 @@ # GPG agent config SSH_AGENT_PID DEFAULT= -SSH_AUTH_SOCK DEFAULT="$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh" +SSH_AUTH_SOCK DEFAULT="/run/user/1000/gnupg/S.gpg-agent.ssh" +# Wayland config +MOZ_ENABLE_WAYLAND=1 +GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots diff --git a/pass-git/.config/pass-git-helper/git-pass-mapping.ini b/pass-git/.config/pass-git-helper/git-pass-mapping.ini index 8b546e2..9f18508 100644 --- a/pass-git/.config/pass-git-helper/git-pass-mapping.ini +++ b/pass-git/.config/pass-git-helper/git-pass-mapping.ini @@ -2,3 +2,7 @@ target=dev/gitea username_extractor=specific_line line_username=1 +[github.com*] +target=dev/github +username_extractor=specific_line +line_username=1 diff --git a/sway/.config/environment.d/envvars.conf b/sway/.config/environment.d/envvars.conf deleted file mode 100644 index c2a2447..0000000 --- a/sway/.config/environment.d/envvars.conf +++ /dev/null @@ -1,2 +0,0 @@ -MOZ_ENABLE_WAYLAND=1 -GRIM_DEFAULT_DIR=$HOME/Photos/Screenshots diff --git a/sway/.config/sway/config b/sway/.config/sway/config index dc1c7d1..4f36fc2 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -119,28 +119,39 @@ output * bg /home/coolneng/Photos/Wallpapers/d2a0wsarpmx21.jpg fill # # Workspaces: # + # Workspace names + set $workspace1 "1: " + set $workspace2 "2: " + set $workspace3 "3: " + set $workspace4 "4: " + set $workspace5 "5: " + set $workspace6 "6: " + #set $workspace7 "7: " + #set $workspace8 "8: " + #set $workspace9 "9: " + #set $workspace10 "10: " # Switch to workspace - bindsym $mod+1 workspace 1 - bindsym $mod+2 workspace 2 - bindsym $mod+3 workspace 3 - bindsym $mod+4 workspace 4 - bindsym $mod+5 workspace 5 - bindsym $mod+6 workspace 6 - bindsym $mod+7 workspace 7 - bindsym $mod+8 workspace 8 - bindsym $mod+9 workspace 9 - bindsym $mod+0 workspace 10 + bindsym $mod+1 workspace $workspace1 + bindsym $mod+2 workspace $workspace2 + bindsym $mod+3 workspace $workspace3 + bindsym $mod+4 workspace $workspace4 + bindsym $mod+5 workspace $workspace5 + bindsym $mod+6 workspace $workspace6 + #bindsym $mod+7 workspace $workspace7 + #bindsym $mod+8 workspace $workspace8 + #bindsym $mod+9 workspace $workspace9 + #bindsym $mod+0 workspace $workspace10 # Move focused container to workspace - bindsym $mod+Shift+1 move container to workspace 1 - bindsym $mod+Shift+2 move container to workspace 2 - bindsym $mod+Shift+3 move container to workspace 3 - bindsym $mod+Shift+4 move container to workspace 4 - bindsym $mod+Shift+5 move container to workspace 5 - bindsym $mod+Shift+6 move container to workspace 6 - bindsym $mod+Shift+7 move container to workspace 7 - bindsym $mod+Shift+8 move container to workspace 8 - bindsym $mod+Shift+9 move container to workspace 9 - bindsym $mod+Shift+0 move container to workspace 10 + bindsym $mod+Shift+1 move container to workspace $workspace1 + bindsym $mod+Shift+2 move container to workspace $workspace2 + bindsym $mod+Shift+3 move container to workspace $workspace3 + bindsym $mod+Shift+4 move container to workspace $workspace4 + bindsym $mod+Shift+5 move container to workspace $workspace5 + bindsym $mod+Shift+6 move container to workspace $workspace6 + #bindsym $mod+Shift+7 move container to workspace $workspace7 + #bindsym $mod+Shift+8 move container to workspace $workspace8 + #bindsym $mod+Shift+9 move container to workspace $workspace9 + #bindsym $mod+Shift+0 move container to workspace $workspace10 # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. # @@ -218,39 +229,72 @@ bar { # # Disable title bar default_border none +# Set GTK theme +set $gnome-schema org.gnome.desktop.interface +exec_always { + gsettings set $gnome-schema gtk-theme 'Adapta-Eta' + gsettings set $gnome-schema icon-theme 'Paper-Mono-Dark' + gsettings set $gnome-schema cursor-theme 'Paper' + gsettings set $gnome-schema gtk-font 'Roboto 10' +} # # Special keys # -# Volume -bindsym XF86AudioRaiseVolume exec amixer set Master 5%+ -bindsym XF86AudioLowerVolume exec amixer set Master 5%- -bindsym XF86AudioMute exec amixer set Master toggle -# Brightness -bindsym XF86MonBrightnessUp exec brillo -A 10 -bindsym XF86MonBrightnessDown exec brillo -U 10 -# Media control -bindsym XF86AudioPlay exec mpc toggle -bindsym XF86AudioStop exec mpc stop -bindsym XF86AudioNext exec mpc next -bindsym XF86AudioPrev exec mpc prev + # Volume + bindsym XF86AudioRaiseVolume exec amixer set Master 5%+ + bindsym XF86AudioLowerVolume exec amixer set Master 5%- + bindsym XF86AudioMute exec amixer set Master toggle + # Brightness + bindsym XF86MonBrightnessUp exec brillo -A 10 + bindsym XF86MonBrightnessDown exec brillo -U 10 + # Media control + bindsym XF86AudioPlay exec mpc toggle + bindsym XF86AudioStop exec mpc stop + bindsym XF86AudioNext exec mpc next + bindsym XF86AudioPrev exec mpc prev # # Program keybindings # -# clipman -bindsym $mod+c exec clipman pick -t rofi -# grim -bindsym Print exec grim + # clipman + bindsym $mod+c exec clipman pick -t rofi + # grim + bindsym Print exec grim + # power management + bindsym $mod+Pause mode "$Pause-break" + +set $Pause-break (p) poweroff, (r) reboot + +mode "$Pause-break" { + bindsym s exec --no-startup-id sudo shutdown -h now, mode "default" + bindsym r exec --no-startup-id sudo shutdown -r now, mode "default" + + bindsym Return mode "default" + bindsym Escape mode "default" +} # # Autostart programs # -# clipman -exec wl-paste -t text --watch clipman store -# tmuxp -exec tmuxp load ~/.tmuxp/local.yaml -# syncthing -exec syncthing -no-browser -home="$HOME/.config/syncthing" + # clipman + exec wl-paste -t text --watch clipman store + # syncthing + exec syncthing -no-browser -home="$HOME/.config/syncthing" + # emacs + assign [class="Emacs"] $workspace3 + exec emacs + # firefox + assign [app_id="firefox"] $workspace2 + exec firefox + # tmuxp + assign [app_id="kitty"] $workspace1 + exec kitty -- tmuxp load ~/.tmuxp/local.yaml -include /etc/sway/config.d/* +# +# Program behaviour +# + # Enable floating windows + for_window [app_id="mpv"] floating enable + + include /etc/sway/config.d/* diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config index 6515338..af70423 100644 --- a/waybar/.config/waybar/config +++ b/waybar/.config/waybar/config @@ -114,7 +114,7 @@ "custom/alsa": { "exec": "amixer get Master | sed -nre 's/.*\\[off\\].*/muted/p; s/.*\\[(.*%)\\].*/\\1/p'", "signal": 11, - "interval": 10, + "interval": 3, "tooltip": false } } diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css index 1257799..4b50be0 100644 --- a/waybar/.config/waybar/style.css +++ b/waybar/.config/waybar/style.css @@ -41,8 +41,8 @@ window#waybar.chromium { /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ #workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; + box-shadow: inherit; + text-shadow: inherit; } #workspaces button.focused { @@ -72,31 +72,24 @@ window#waybar.chromium { #mpd { padding: 0 10px; margin: 0 4px; - color: #ffffff; } #clock { } #battery { + background-color: #211B29; } #battery.charging { - color: #ffffff; } @keyframes blink { to { - color: #000000; } } #battery.critical:not(.charging) { - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; } label:focus { @@ -149,11 +142,9 @@ label:focus { } #idle_inhibitor.activated { - color: #D8DEE9; } #mpd { - color: #D8DEE9; } #mpd.disconnected {