Desktop tweaks and layout changes. - dotfiles - These are my dotfiles. There are many like it, but these are mine.
(HTM) git clone git://jay.scot/dotfiles
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
---
(DIR) commit 82950c175a46c3eb86e688f7937b1652c9bca478
(DIR) parent b4f15da7233f538384b6987014779998300e6c50
(HTM) Author: Jay Scott <me@jay.scot>
Date: Sat, 7 Jun 2025 12:51:24 +0100
Desktop tweaks and layout changes.
Diffstat:
M .gitignore | 1 +
M ashrc | 16 ++++++++--------
M bin/link-handler | 2 +-
M bin/sway-start | 7 ++++++-
M bootstrap.sh | 2 +-
M foot/foot.ini | 21 ++++-----------------
M newsraft/config | 6 ++----
M newsraft/feeds | 31 +++++++++++++++++++++++++++++++
M sway/config | 11 +++++++++--
M waybar/config | 23 ++++++++---------------
M waybar/style.css | 23 -----------------------
11 files changed, 71 insertions(+), 72 deletions(-)
---
(DIR) diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ bin/golangci-lint
bin/neonmodem
bin/radio
bin/w3m
+bin/reddittui
# vim
nvim/lazy-lock.json
(DIR) diff --git a/ashrc b/ashrc
@@ -10,7 +10,7 @@ export PASSWORD_STORE_DIR="$XDG_CONFIG_HOME"/pass
GPG_TTY=$(tty)
export GPG_TTY
export EDITOR="nvim"
-export BROWSER="qutebrowser"
+export BROWSER="librewolf"
export PATH=$PATH:$HOME/bin
# tools
@@ -41,16 +41,14 @@ alias gma='git commit -am'
alias vim='nvim'
alias mutt='neomutt'
alias mpv="mpv --autofit=30% --really-quiet --no-terminal"
-alias w="w3m -B"
# vpn
-alias von='mullvad ~/.config/mullvad/se-mma-wg-111.conf'
+alias von='doas wg-quick up se-sto-wg-011'
+alias voff='doas wg-quick down se-sto-wg-011'
alias vcheck='curl https://am.i.mullvad.net/connected'
-# vpn
-alias von='doas wg-quick up mullvad'
-alias voff='doas wg-quick down mullvad'
-alias vcheck='curl https://am.i.mullvad.net/connected'
+# reddit
+alias r='reddittui'
# pass
export PASSWORD_STORE_DIR=$HOME/src/pass
@@ -59,4 +57,6 @@ export PASSWORD_STORE_DIR=$HOME/src/pass
export LANG=en_US.UTF-8
export LC_CTYPE="en_US.UTF-8"
export LC_ALL=en_US.UTF-8
-export PS1="\[\e[00;34m\]▶▶▶ \W \[\e[0m\]"
+#export PS1="\[\e[00;34m\]▶▶▶ \W \[\e[0m\]"
+#export PS1="\033[35m\w \033[36m➤ \033[0m"
+export PS1="\033[90m\w \033[36m➤ \033[0m"
(DIR) diff --git a/bin/link-handler b/bin/link-handler
@@ -5,7 +5,7 @@ launcher="setsid"
# applications
player="mpv --autofit=30% --really-quiet --no-terminal"
gemini="foot -e amfora"
-gopher="foot -e w3m"
+gopher="foot -e lynx"
pdf="zathura"
images="swayimg"
torrent="qbittorrent"
(DIR) diff --git a/bin/sway-start b/bin/sway-start
@@ -1,9 +1,15 @@
#!/bin/sh
+
export TERM=foot
export _JAVA_AWT_WM_NONREPARENTING=1
export XKB_DEFAULT_OPTIONS=caps:escape
export GDK_BACKEND=wayland
+
+# Session
export XDG_SESSION_TYPE=wayland
+export XDG_SESSION_DESKTOP=sway
+export XDG_CURRENT_DESKTOP=sway
+
#export XCURSOR_THEME=Adwaita
export XDG_DESKTOP_DIR="$HOME"
export XDG_DOWNLOAD_DIR="$HOME/tmp"
@@ -11,7 +17,6 @@ export XDG_DOCUMENTS_DIR="$HOME/tmp"
export XDG_MUSIC_DIR="$HOME/tmp"
export XDG_PICTURES_DIR="$HOME/tmp"
export XDG_VIDEOS_DIR="$HOME/tmp"
-export XDG_CURRENT_DESKTOP=sway
if [ -z "$XDG_RUNTIME_DIR" ]; then
mkdir -p /tmp/runtime/jay
(DIR) diff --git a/bootstrap.sh b/bootstrap.sh
@@ -4,7 +4,7 @@ DOTFILES=$(pwd)
FILES='ashrc profile'
ROOT='bin'
-CONFIG='foot git isync lynx mutt newsraft nvim qutebrowser sway waybar'
+CONFIG='foot git isync lynx mutt newsraft nvim sway waybar'
link() {
for f in $FILES; do ln -sfn "$DOTFILES/$f" "$HOME/.$f"; done
(DIR) diff --git a/foot/foot.ini b/foot/foot.ini
@@ -1,4 +1,4 @@
-font=Hack:size=14
+font=Hack:size=16
[url]
launch=link-handler ${url}
@@ -9,19 +9,6 @@ show-urls-launch=Control+Shift+p
[colors]
background=282828
foreground=ebdbb2
-regular0=282828
-regular1=cc241d
-regular2=98971a
-regular3=d79921
-regular4=458588
-regular5=b16286
-regular6=689d6a
-regular7=a89984
-bright0=928374
-bright1=fb4934
-bright2=b8bb26
-bright3=fabd2f
-bright4=83a598
-bright5=d3869b
-bright6=8ec07c
-bright7=ebdbb2
+
+bright0=a0a0a0
+regular6=40bfbf
(DIR) diff --git a/newsraft/config b/newsraft/config
@@ -1,9 +1,7 @@
# settings
set open-in-browser-command ~/bin/link-handler "%l"
-set clean-database-on-startup true
-
-set menu-feed-sorting unread-desc
-set menu-item-sorting unread-desc
+list-entry-date-format "%D"
+feeds-menu-paramount-explore true
# key bindings
bind f exec "~/bin/link-handler %l"
(DIR) diff --git a/newsraft/feeds b/newsraft/feeds
@@ -17,3 +17,34 @@ https://pluralistic.net/feed/ "Pluralistic"
https://k0.tel/feed.xml "Koutsie"
https://labnotes.org/rss/ "Lab Notes"
https://www.jeffgeerling.com/blog.xml "Jeff Geerling"
+
+@ GAMING
+https://www.gamingonlinux.com/article_rss.php "Gaming On Linux"
+
+@ YOUTUBE
+https://www.youtube.com/feeds/videos.xml?channel_id=UC2I6Et1JkidnnbWgJFiMeHA "Steve1989MREInfo"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC7uO9V1Frl_wPd9d1qOm_RQ "Dave Snider"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC5k3Kc0avyDJ2nG9Kxm9JmQ "Bright Sun Films"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCQCrKxBj5Id79syQEsY2Qxg "Simon Wilson"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCRvWwMPr2SmSG7rXXzeEUdA "SideNote"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCVqpNG1R72i21jh-nAxEk4A "c90adventures"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCXulruMI7BHj3kGyosNa0jA "Indigo Traveller"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCnHEz9DZ6EAof1-DaQGD_Xw "PPPeter"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCHL9bfHTxCMi-7vfxQ-AYtg "Abroad in Japan"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCl7mAGnY4jh4Ps8rhhh8XZg "Serpentza"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC2O6HDtMOZf9FkUAepz9Atg "Noel Phillips"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCE-f0sqi-H7kuLT0YiW9rcA "The Lazy Peon"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCcjx6m03fZwtRBFn1Cf7kKQ "Zav Alsop"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCBhQuxcHU3aydk_zTXcbdTg "Steve Marsh"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCcKw8Eg0FfRvhIAnC0cPGAA "Planes, Trains, Everything"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCLmltEyJ0zBsKnL8bWSdn3A "We Hate The Cold"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCv8Po8UR9OfhPhPCLjz1d8Q "Christopher Collects"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCIDIqg7LhjLFCyD2awY_38g "Astonishing Glasgow"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC7sGXeJOixPBgJ3r5R55JYg "Drain Cleaning Aus"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCpp3cHR9TWVyXqL1AVw4XkA "Mike Okay"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCSwl4SnA68L8iDfj5gBf-yA "All the Gear"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCRl31PWkfF0a3j3hiDRaCGA "Rhykker"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCsxidPdmPXDlsS3rn7arJsA "Signs Of Kelani"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCld68syR8Wi-GY_n4CaoJGA "Brodie Robertson"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCVls1GmFKf6WlTraIb_IaJg "DistroTube"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCylGUf9BvQooEFjgdNudoQg "Linux Cast"
(DIR) diff --git a/sway/config b/sway/config
@@ -15,7 +15,9 @@ default_floating_border pixel 5
workspace_layout default
font pango: Hack:style=Regular 2
-for_window [app_id="mpv"] floating enable, sticky enable, move absolute position 1340 760, no_focus
+# application assignment
+for_window [app_id="mpv"] floating enable, sticky enable, resize set 560 280, move absolute position 3000 1100, no_focus
+assign [app_id="librewolf"] 2
# misc
xwayland enable
@@ -36,13 +38,18 @@ output DP-2 {
transform 270 pos 0 0 res 1920x1080
}
+workspace 1 output DP-1
+workspace 2 output DP-2
+workspace 3 output DP-1
+workspace 4 output DP-1
focus output DP-1
# keybinds
bindsym $mod+Space exec footclient
bindsym $mod+p exec $menu
-bindsym $mod+f exec firefox
+bindsym $mod+f exec librewolf
bindsym $mod+m exec /home/jay/bin/music
+bindsym $mod+s exec flatpak run com.heroicgameslauncher.hgl
bindsym XF86AudioRaiseVolume exec pamixer -i 5
bindsym XF86AudioLowerVolume exec pamixer -d 5
(DIR) diff --git a/waybar/config b/waybar/config
@@ -1,10 +1,13 @@
{
+ // general
+ "output": "DP-1",
+ "reload_style_on_change": true,
"layer": "top",
"position": "top",
+ // layout
"modules-left": [
- "sway/workspaces",
- "custom/right-arrow-dark"
+ "sway/workspaces"
],
"modules-center": [
@@ -12,22 +15,12 @@
],
"modules-right": [
- "custom/left-arrow-dark",
"pulseaudio",
"tray",
"clock"
],
- "custom/right-arrow-dark": {
- "format": "",
- "tooltip": false
- },
-
- "custom/left-arrow-dark": {
- "format": "",
- "tooltip": false
- },
-
+ // modules
"sway/workspaces": {
"disable-scroll": true,
"format": "{name}"
@@ -51,8 +44,8 @@
"on-click": "pamixer -t"
},
- "custom/vpn":{
- "format": "{icon} {}",
+ "custom/vpn": {
+ "format": "{icon} {text}",
"format-icons": {
"default": [""]
},
(DIR) diff --git a/waybar/style.css b/waybar/style.css
@@ -3,26 +3,12 @@
font-family: Hack;
}
-
#custom-vpn,
window#waybar {
background: #292b2e;
color: #fdf6e3;
}
-#workspaces,
-#clock,
-#custom-mail,
-#pulseaudio,
-#tray {
- background: #1a1a1a;
-}
-
-#custom-right-arrow-dark,
-#custom-left-arrow-dark {
- color: #1a1a1a;
-}
-
#workspaces button {
padding: 0 0px;
color: #fdf6e3;
@@ -30,15 +16,6 @@ window#waybar {
#workspaces button.focused {
color: #268bd2;
}
-#workspaces button:hover {
- box-shadow: inherit;
- text-shadow: inherit;
-}
-#workspaces button:hover {
- background: #1a1a1a;
- border: #1a1a1a;
- padding: 0 1px;
-}
#custom-vpn.connected {
color: #007300;