From e8bc2be255b8b1c77fe74fcb3701dfd9f5a7468e Mon Sep 17 00:00:00 2001 From: William Ball Date: Tue, 4 Mar 2025 22:42:07 -0800 Subject: [PATCH] cleaning up; rewrote README --- README.md | 56 ---- README.org | 78 +++++ fish/.config/fish/fish_variables | 1 + ssh/.ssh/config | 4 - sway/.config/sway/config | 287 ------------------ waybar-sway/.config/waybar/config | 97 ------ waybar-sway/.config/waybar/mocha.css | 37 --- waybar-sway/.config/waybar/style.css | 66 ---- .../.config/waybar/config | 0 .../.config/waybar/mocha.css | 0 .../.config/waybar/style.css | 0 yambar/.config/yambar/config.yml | 153 ---------- 12 files changed, 79 insertions(+), 700 deletions(-) delete mode 100644 README.md create mode 100644 README.org delete mode 100644 ssh/.ssh/config delete mode 100644 sway/.config/sway/config delete mode 100644 waybar-sway/.config/waybar/config delete mode 100644 waybar-sway/.config/waybar/mocha.css delete mode 100644 waybar-sway/.config/waybar/style.css rename {waybar-river => waybar}/.config/waybar/config (100%) rename {waybar-river => waybar}/.config/waybar/mocha.css (100%) rename {waybar-river => waybar}/.config/waybar/style.css (100%) delete mode 100644 yambar/.config/yambar/config.yml diff --git a/README.md b/README.md deleted file mode 100644 index 8b97330..0000000 --- a/README.md +++ /dev/null @@ -1,56 +0,0 @@ -# Dotfiles - -My personal dotfiles for River/Sway on Arch Linux. They are designed to be used -with [gnu stow](https://www.gnu.org/software/stow/). Each directory is a kind -of 'module' that can be individually symlinked. - -You are welcome to do whatever you would like with these configs (they are -licensed under the 0 clause BSD license); be inspired by them, copy them, -whatever, no attribution necessary. I would encourage you to fork this repo, -then use `stow` to install whatever modules you would like, changing whatever -you want as you go. For example, if you want to steal my neovim configuration, -you could run `stow nvim`, assuming this repo is located in your home -directory. - -# Some Software I run -These are my configs that are most easily stealable. I have several more -configs in this repo that you are absolutely welcome to steal or look through, -but these are the most transferrable to other systems. - -## Shell -I use [fish](https://fishshell.com/) together with -[starship](https://starship.rs). It's basic, but gets the job done. - -## Editors - -### Neovim -I love [neovim](https://neovim.io), but it's a pain to configure. My config is -a ~570 LOC lua monstrosity that works wonderfully for me but is kind of -incomprehensible. If you are new to neovim, I would recommend checking out -projects like [lunarvim](https://www.lunarvim.org/) or -[nvchad](https://nvchad.com/), as they are much easier to set up, and probably -better suited for your use case than my config. - -### Emacs -I love [emacs](https://www.gnu.org/software/emacs/) as well. My configuration -is a literate `org` file that gets tangled into `init.el`. As far as Emacs -configurations go, it's pretty clean, but still is a several hundred line mess. - -## Compositors -I'm on Wayland now, and mostly use [river](https://codeberg.org/river/river), -though I do have a config for [sway](https://swaywm.org/) set up. To help keep -the configs separate, I use [waybar](https://github.com/Alexays/Waybar) for -sway and [yambar](https://codeberg.org/dnkl/yambar) for river. All the other -configs (swaylock, fuzzel, etc.) are compositor agnostic. Note, in both my sway -and river configs I swap meta and left-alt. That's just a habit from starting -on [dwm](https://dwm.suckless.org/), whose default mod key is alt. You may want -to change that, as it interferes pretty heavily in keybindings from other apps. - -## Keyd -Since I use vim and emacs, I like to map caps lock to act as control when held -and escape when tapped. I use a simple [keyd](https://github.com/rvaiya/keyd) -config for this. However, note that `keyd/default.conf` should be copied to -`/etc/keyd/` and the `keyd` service should be enabled and started. If `keyd` -isn't in your distro's repos, it is very easy to build and install from source. -Otherwise, [caps2esc](https://gitlab.com/interception/linux/plugins/caps2esc) -probably is and is likewise pretty simple to get set up. diff --git a/README.org b/README.org new file mode 100644 index 0000000..5f78c17 --- /dev/null +++ b/README.org @@ -0,0 +1,78 @@ +#+title: William's Dotfiles +#+author: William Ball +#+email: williampi103@gmail.com + +#+options: toc:nil num:nil + +* Dotfiles +My personal dotfiles for River on Arch Linux. They are designed to be used with [[https://www.gnu.org/software/stow/][gnu stow]]. Each directory is a kind of 'module' that can be individually symlinked. + +You are welcome to do whatever you would like with these configs (they are licensed under the 0 clause BSD license); be inspired by them, copy them, whatever, no attribution necessary. I would encourage you to fork this repo, then use =stow= to install whatever modules you would like, changing whatever you want as you go. For example, if you want to use just my neovim configuration, you could run =stow nvim=, assuming this repo is located in your home directory, and my neovim configuration will automatically be symlinked to =~/.config/nvim=. + +* Some Software I run + +** Terminal + +*** Foot +I use [[https://codeberg.org/dnkl/foot][foot]] as my terminal of choice, mostly because I like having a terminal and client. It makes launching the terminal practically instantaneous, and I don't really need the multiplexing capabilities. I've also used and enjoyed [[https://alacritty.org/][alacritty]], [[https://sw.kovidgoyal.net/kitty/][kitty]], [[https://wezterm.org/][wezterm]] and [[https://st.suckless.org][st]] in the past and think they are all excellent terminals. + +*** Fish +I use [[https://fishshell.com/][fish]] as my shell, with [[https://starship.rs][starship]] as my prompt. My config is fairly small and sensible, though you would likely want to tweak it. I particularly love and recommend settings =fish_hybrid_key_bindings=, as I'm used to both Emacs and Vim keybindings. + +Most of the config is just setting the path, and tweaking some environment variables to make things better for wayland or force programs to follow the XDG spec. + +*** RIIR +I have a couple (mostly written in rust) replacements for standard unix tools. Here's a bunch of them: + +|-----------+----------| +| Tool | Replaces | +|-----------+----------| +| [[https://github.com/sharkdp/bat][bat]] | =cat= | +| [[https://github.com/bootandy/dust][dust]] | =du= | +| [[https://github.com/eza-community/eza][eza]] | =ls= | +| [[https://github.com/sharkdp/fd][fd]] | =find= | +| [[https://github.com/sharkdp/hyperfine][hyperfine]] | =time= | +| [[https://github.com/BurntSushi/ripgrep][ripgrep]] | =grep= | +| [[https://github.com/XAMPPRocky/tokei][tokei]] | =wc= | +|-----------+----------| + +** Editors + +*** Neovim +I absolutely love [[https://neovim.io][neovim]], though it is a pain to configure. My config is fairly clean as far as neovim configs go, but probably isn't a very good fit for your use case. I would recommend checking out projects like [[https://www.lunarvim.org/][lunarvim]], [[https://nvchad.com/][nvchad]], or [[https://github.com/LazyVim/LazyVim][LazyVim]] to get started, or borrowing how my config is structured but changing the actual details. + +*** Emacs +I love both [[https://www.gnu.org/software/emacs/][emacs]] and vim, but use them for different purposes. In terms of editing experience, my extremely customized neovim is absolutely perfect for me, but there are some things that emacs can do that is just impossible to replicate in neovim. Emacs is fantastic for [[https://orgmode.org][org-mode]] and writing [[https://latex-project.org][LaTeX]], though I usually leave writing code to neovim (emacs still being single-threaded in hurts). + +** Desktop +I use a custom [[https://wayland.freedesktop.org][Wayland]] desktop built around the excellent compositor [[https://codeberg.org/river/river][river]] + +*** River +The first tiling window manager I used (after a brief stint with [[https://i3wm.org][i3]]) was [[https://dwm.suckless.org][dwm]], and river strikes the best balance between maturity, usability, and similarity to dwm. The tag system is strictly superior to usual workspaces in my opinion. + +*** Mako +I use [[https://github.com/emersion/mako][mako]] as my notification daemon of choice. I started off on X11 using [[https://github.com/dunst-project/dunst][dunst]], but switched to mako before dunst got Wayland support, since mako's almost the same thing. + +*** Swaylock/Swayidle +I use [[https://github.com/swaywm/swaylock][swaylock]] and [[https://github.com/swaywm/swayidle][swayidle]] to handle my screen locking needs. I also have a couple scripts (=timeout.sh= and =toggle_caffeine.sh= in my river config), to basically enable toggling swayidle. I usually want my computer to lock automatically if I've been idle long enough, but sometimes want to be able to turn that off. + +*** Fuzzel +I use [[https://codeberg.org/dnkl/fuzzel][fuzzel]] as my launcher. It's basically [[https://github.com/davatorium/rofi][rofi]] for wayland but with less baggage and better [[https://tools.suckless.org/dmenu/][dmenu]]-like functionality. I use it in several scripts in addition to it being my launcher. + +*** Wob +I use [[https://github.com/francma/wob][wob]] to show my volume and brightness when I change them. It's just a wayland version of the excellent [[https://github.com/florentc/xob][xob]]. + +*** Wbg +I use [[https://codeberg.org/dnkl/wbg][wbg]] as my wallpaper setter. There are a million of these, and it doesn't really matter which you pick. + +*** Waybar +I don't really like really elaborate and fancy status bars. Whatever status bar I'm using, I like to have workspaces on the left, time and date in the middle, and volume, wifi, and battery on the right. I don't know where I picked up this habit (I think an ancient [[https://github.com/LemonBoy/bar][lemonbar]] script of mine, but I don't really remember), but it's what I'm used to now, and is very easy to emulate in [[https://github.com/Alexays/Waybar][waybar]]. I've tried [[https://codeberg.org/dnkl/yambar][yambar]], but found it very confusing to configure. + +*** Keyd +As a heavy emacs/vim user, remapping caps lock to esc/control is absolutely necessary, and [[https://github.com/rvaiya/keyd][keyd]] is great for this. Note that =stow keyd= won't work properly. Instead you should copy =keyd/default.conf= to =/etc/keyd/= and enable the =keyd= service. [[https://gitlab.com/interception/linux/plugins/caps2esc][caps2esc]] is also great for this purpose, but I find keyd a little easier to use. + +*** Zathura +My pdf viewer of choice is [[https://pwmt.org/projects/zathura/][zathura]], which is simply excellent. Configurable, uses vim keybindings, does exactly what I need it to out of the box and nothing more. I've tried to get into [[https://sioyek.info/][sioyek]] in the past, but never quite figured it out. + +*** Pianobar +[[https://github.com/PromyLOPh/pianobar][Pianobar]] is one of the most underrated pieces of software ever. It's an absolutely phenomenal cli [[https://pandora.com][pandora]] client (that skips ads btw). As just a cli, it's phenomenal, but it's also very easy to build on top of. I'm not much of a hacker, but I was easily able to throw together some scripts to let me pause, skip songs, etc. from keybinds from river, change the station with a dmenu style menu in fuzzel, and send notifications upon song changes with the album art and everything. All with a couple tiny bash scripts. If you don't want to set this up manually, there are also several pieces of software built on top of pianobar, my favorite being [[https://pithos.github.io/][pithos]] (though [[https://github.com/agrif/pianobar.el][pianobar.el]] is also a ton of fun, it just doesn't work very well for me). diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index b9b5365..a90c876 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -1,6 +1,7 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231e1e2e\x2cspinner\x3a\x23f5e0dc\x2chl\x3a\x23f38ba8\x20\x2d\x2dcolor\x3dfg\x3a\x23cdd6f4\x2cheader\x3a\x23f38ba8\x2cinfo\x3a\x23cba6f7\x2cpointer\x3a\x23f5e0dc\x20\x2d\x2dcolor\x3dmarker\x3a\x23f5e0dc\x2cfg\x2b\x3a\x23cdd6f4\x2cprompt\x3a\x23cba6f7\x2chl\x2b\x3a\x23f38ba8 +SETUVAR --export GPG_TTY:not\x20a\x20tty SETUVAR --export SSH_AGENT_PID:786479 SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475 SETUVAR ZO_CMD:zo diff --git a/ssh/.ssh/config b/ssh/.ssh/config deleted file mode 100644 index be3630c..0000000 --- a/ssh/.ssh/config +++ /dev/null @@ -1,4 +0,0 @@ -Host fg - Hostname forgejo-ssh.ballcloud.cc - User git - ProxyCommand /usr/bin/cloudflared access ssh --hostname %h diff --git a/sway/.config/sway/config b/sway/.config/sway/config deleted file mode 100644 index e85be10..0000000 --- a/sway/.config/sway/config +++ /dev/null @@ -1,287 +0,0 @@ -### Autotiling -exec autotiling - -### Variables -# -# Logo key. Use Mod1 for Alt. -set $mod Mod4 -# Home row direction keys, like vim -set $left h -set $down j -set $up k -set $right l -# Your preferred terminal emulator -set $term wezterm -set $browser firefox -set $emacs "emacsclient --create-frame --alternate-editor='emacs'" -# Your preferred application launcher -# Note: pass the final command to swaymsg so that the resulting window can be opened -# on the original workspace that the command was run on. -set $menu fuzzel | xargs swaymsg exec -- - -### Appearance -# window corner radius in px -# corner_radius 0 -# -# # Window background blur -# blur off -# blur_xray off -# blur_passes 2 -# blur_radius 5 -# -# shadows enable -# shadows_on_csd off -# shadow_blur_radius 20 -# shadow_color #0000007F -# -# # inactive window fade amount. 0.0 = no dimming, 1.0 = fully dimmed -# default_dim_inactive 0.0 -# dim_inactive_colors.unfocused #000000FF -# dim_inactive_colors.urgent #900000FF -# -# # Move minimized windows into Scratchpad (enable|disable) -# scratchpad_minimize disable - -smart_gaps on -gaps inner 10 -default_border pixel 2 - -client.focused #f5c2e7 #1e1e2e #cdd6f4 #a6e3a1 #f5c2e7 -client.unfocused #1e1e2e #1e1e2e #cdd6f4 #a6e3a1 #586e75 -client.focused_inactive #1e1e2e #1e1e2e #cdd6f4 #a6e3a1 #586e75 - -font pango:Iosevka Nerd Font 10 - -### Output configuration -# -# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -output * bg ~/.config/wallpaper.png fill -output * scale 1.25 -# -# Example configuration: -# -# output HDMI-A-1 resolution 1920x1080 position 1920,0 -# -# You can get the names of your outputs by running: swaymsg -t get_outputs - -### Idle configuration -# -# Example configuration: -# -exec swayidle -w \ - timeout 300 'swaylock -f -c 000000' \ - timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ - before-sleep 'swaylock -f -c 000000' -# -# This will lock your screen after 300 seconds of inactivity, then turn off -# your displays after another 300 seconds, and turn your screens back on when -# resumed. It will also lock your screen before your computer goes to sleep. - -### Input configuration -# -# Example configuration: -# -input "type:touchpad" { - dwt enabled - tap enabled - natural_scroll enabled - accel_profile adaptive -} - -input "type:keyboard" { - xkb_layout us,us - xkb_variant ,dvorak - xkb_options altwin:swap_lalt_lwin,grp:win_space_toggle - repeat_delay 300 - repeat_rate 40 -} - -seat * hide_cursor 3000 -seat * hide_cursor when-typing enable - -# -# You can get the names of your inputs by running: swaymsg -t get_inputs -# Read `man 5 sway-input` for more information about this section. - -bindgesture swipe:right workspace prev -bindgesture swipe:left workspace next - -### Key bindings -# -# Basics: -# - # Start a terminal - bindsym $mod+Return exec $term - - bindsym $mod+bracketright exec $browser - bindsym $mod+e exec $emacs - bindsym $mod+d exec "makoctl dismiss" - bindsym $mod+Shift+d exec "makoctl dismiss --all" - bindsym $mod+z exec "books.sh" - bindsym $mod+y exec "papers.sh" - bindsym $mod+Control+k exec 'brightnessctl set +5%' - bindsym $mod+Control+j exec 'brightnessctl set 5%-' - bindsym XF86MonBrightnessUp exec 'brightnessctl set +5%' - bindsym XF86MonBrightnessDown exec 'brightnessctl set 5%-' - bindsym $mod+Shift+o exec 'swaylock -f -c 000000' - bindsym XF86AudioRaiseVolume exec 'wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 2%+' - bindsym XF86AudioLowerVolume exec 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-' - bindsym XF86AudioMute exec 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle' - bindsym XF86AudioMicMute exec 'wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle' - - # Kill focused window - bindsym $mod+Shift+c kill - - # Start your launcher - bindsym $mod+semicolon exec $menu - - # Drag floating windows by holding down $mod and left mouse button. - # Resize them with right mouse button + $mod. - # Despite the name, also works for non-floating windows. - # Change normal to inverse to use left mouse button for resizing and right - # mouse button for dragging. - floating_modifier $mod normal - - # Reload the configuration file - bindsym $mod+Shift+r reload - - # Exit sway (logs you out of your Wayland session) - bindsym $mod+Shift+q exit -# -# Moving around: -# - # Move your focus around - bindsym $mod+$left focus left - bindsym $mod+$down focus down - bindsym $mod+$up focus up - bindsym $mod+$right focus right - # Or use $mod+[up|down|left|right] - bindsym $mod+Left focus left - bindsym $mod+Down focus down - bindsym $mod+Up focus up - bindsym $mod+Right focus right - - # Move the focused window with the same, but add Shift - bindsym $mod+Shift+$left move left - bindsym $mod+Shift+$down move down - bindsym $mod+Shift+$up move up - bindsym $mod+Shift+$right move right - # Ditto, with arrow keys - bindsym $mod+Shift+Left move left - bindsym $mod+Shift+Down move down - bindsym $mod+Shift+Up move up - bindsym $mod+Shift+Right move right -# -# Workspaces: -# - # Switch to workspace - bindsym $mod+1 workspace number 1 - bindsym $mod+2 workspace number 2 - bindsym $mod+3 workspace number 3 - bindsym $mod+4 workspace number 4 - bindsym $mod+5 workspace number 5 - bindsym $mod+6 workspace number 6 - bindsym $mod+7 workspace number 7 - bindsym $mod+8 workspace number 8 - bindsym $mod+9 workspace number 9 - bindsym $mod+0 workspace number 10 - # Move focused container to workspace - bindsym $mod+Shift+1 move container to workspace number 1 - bindsym $mod+Shift+2 move container to workspace number 2 - bindsym $mod+Shift+3 move container to workspace number 3 - bindsym $mod+Shift+4 move container to workspace number 4 - bindsym $mod+Shift+5 move container to workspace number 5 - bindsym $mod+Shift+6 move container to workspace number 6 - bindsym $mod+Shift+7 move container to workspace number 7 - bindsym $mod+Shift+8 move container to workspace number 8 - bindsym $mod+Shift+9 move container to workspace number 9 - bindsym $mod+Shift+0 move container to workspace number 10 - # Note: workspaces can have any name you want, not just numbers. - # We just use 1-10 as the default. -# -# Layout stuff: -# - # You can "split" the current object of your focus with - # $mod+b or $mod+v, for horizontal and vertical splits - # respectively. - bindsym $mod+b splith - bindsym $mod+v splitv - - # Switch the current container between different layout styles - bindsym $mod+s layout stacking - bindsym $mod+w layout tabbed - bindsym $mod+t layout toggle split - - # Make the current focus fullscreen - bindsym $mod+f fullscreen - - # Toggle the current focus between tiling and floating mode - bindsym $mod+Shift+space floating toggle - - # Swap focus between the tiling area and the floating area - bindsym $mod+space focus mode_toggle - - # Move focus to the parent container - bindsym $mod+a focus parent -# -# Scratchpad: -# - # Sway has a "scratchpad", which is a bag of holding for windows. - # You can send windows there and get them back later. - - # Move the currently focused window to the scratchpad - bindsym $mod+Shift+slash move scratchpad - - # Show the next scratchpad window or hide the focused scratchpad window. - # If there are multiple scratchpad windows, this command cycles through them. - bindsym $mod+slash scratchpad show -# -# Resizing containers: -# -mode "resize" { - # left will shrink the containers width - # right will grow the containers width - # up will shrink the containers height - # down will grow the containers height - bindsym $mod+$left resize shrink width 10px - bindsym $mod+$down resize grow height 10px - bindsym $mod+$up resize shrink height 10px - bindsym $mod+$right resize grow width 10px - - # Return to default mode - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" - -# -# pianobar mode: -# -mode "pianobar" { - bindsym $mod+s exec "~/.config/pianobar/change_station.sh" ; mode "default" - bindsym $mod+p exec "echo 'p' > ~/.config/pianobar/ctl" ; mode "default" - bindsym $mod+c exec "~/.config/pianobar/display_info.sh" ; mode "default" - bindsym $mod+n exec "echo 'n' > ~/.config/pianobar/ctl" ; mode "default" - bindsym s exec "~/.config/pianobar/change_station.sh" ; mode "default" - bindsym p exec "echo 'p' > ~/.config/pianobar/ctl" ; mode "default" - bindsym c exec "~/.config/pianobar/display_info.sh" ; mode "default" - bindsym n exec "echo 'n' > ~/.config/pianobar/ctl" ; mode "default" - bindsym Escape mode "default" -} -bindsym $mod+p mode "pianobar" - -# -# Status Bar: -# -# Read `man 5 sway-bar` for more information about this section. -bar { - swaybar_command waybar -} - -# autostart -exec blueman-applet -exec mako -exec nm-applet -exec emacs --daemon - -include /etc/sway/config.d/* diff --git a/waybar-sway/.config/waybar/config b/waybar-sway/.config/waybar/config deleted file mode 100644 index e467b8c..0000000 --- a/waybar-sway/.config/waybar/config +++ /dev/null @@ -1,97 +0,0 @@ -// -*- mode: json -*- - -{ - "layer": "top", - "position": "bottom", - "height" : 30, - - "modules-left": [ - "sway/workspaces", - ], - "modules-center": [ - "clock", - ], - "modules-right": [ - "sway/language", - "pulseaudio", - "network", - "battery", - "tray" - ], - - "sway/language": { - "format": "{short} {variant}", - "on-click": "swaymsg input type:keyboard xkb_switch_layout next", - }, - - "sway/workspaces": { - "format": "{icon}", - "format-icons": { - "1": " 1 ", - "2": " 2 ", - "3": " 3 ", - "4": " 4 ", - "5": " 5 ", - "6": " 6 ", - "7": " 7 ", - "8": " 8 ", - "9": " 9 ", - }, - }, - - "clock": { - "format": "{:%H:%M %A, %B %d}", - "tooltip": false - }, - - "pulseaudio": { - "format": "{icon} {volume:2}%", - "format-bluetooth": "{icon} {volume}%", - "format-muted": "MUTE", - "format-icons": { - "headphones": "", - "default": [ - "", - "" - ] - }, - "scroll-step": 5, - "on-click": "pamixer -t", - "on-click-right": "pavucontrol" - }, - - "network": { - "interface": "wlan0", - "format": "{ifname}", - "format-wifi": "{essid} ({signalStrength}%)  ", - "format-ethernet": "{ipaddr}/{cidr} ", - "format-disconnected": "", - "tooltip-format": "{ifname} via {gwaddr} ", - "tooltip-format-wifi": "{essid} ({signalStrength}%)  ", - "tooltip-format-ethernet": "{ifname} ", - "tooltip-format-disconnected": "Disconnected", - "max-length": 50 - }, - - "battery": { - "bat": "BAT0", - "interval": 60, - "states": { - "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{icon} {capacity}%", - "format-icons": [ - "", - "", - "", - "", - "" - ] - }, - - "tray": { - "icon-size": 20 - } -} diff --git a/waybar-sway/.config/waybar/mocha.css b/waybar-sway/.config/waybar/mocha.css deleted file mode 100644 index 98e218a..0000000 --- a/waybar-sway/.config/waybar/mocha.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Mocha palette -* Maintainer: rubyowo -* -*/ - -@define-color base #1e1e2e; -@define-color mantle #181825; -@define-color crust #11111b; - -@define-color text #cdd6f4; -@define-color subtext0 #a6adc8; -@define-color subtext1 #bac2de; - -@define-color surface0 #313244; -@define-color surface1 #45475a; -@define-color surface2 #585b70; - -@define-color overlay0 #6c7086; -@define-color overlay1 #7f849c; -@define-color overlay2 #9399b2; - -@define-color blue #89b4fa; -@define-color lavender #b4befe; -@define-color sapphire #74c7ec; -@define-color sky #89dceb; -@define-color teal #94e2d5; -@define-color green #a6e3a1; -@define-color yellow #f9e2af; -@define-color peach #fab387; -@define-color maroon #eba0ac; -@define-color red #f38ba8; -@define-color mauve #cba6f7; -@define-color pink #f5c2e7; -@define-color flamingo #f2cdcd; -@define-color rosewater #f5e0dc; diff --git a/waybar-sway/.config/waybar/style.css b/waybar-sway/.config/waybar/style.css deleted file mode 100644 index 27f514a..0000000 --- a/waybar-sway/.config/waybar/style.css +++ /dev/null @@ -1,66 +0,0 @@ -@import "mocha.css"; - -* { - font-size: 20px; - font-family: Iosevka Nerd Font; - border-radius: 0; -} - -window#waybar { - background: rgba(30, 30, 40, 1); - color: @text; -} - -#workspaces, -#clock, -#pulseaudio, -#battery, -#tray { - background: transparent; -} - -#language { - color: @yellow; -} - -#workspaces button { - padding: 0 2px; - color: @text; -} -#workspaces button.focused { - color: @base; - background: @pink; -} - -#workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; -} - -#workspaces button:hover { - background: @yellow; - color: @base; - border: @base; - padding: 0 3px; -} - -#pulseaudio { - color: @red; -} - -#network { - color: @green; -} - -#battery { - color: @blue; -} - -#clock, -#pulseaudio, -#memory, -#cpu, -#battery, -#disk { - padding: 0 10px; -} diff --git a/waybar-river/.config/waybar/config b/waybar/.config/waybar/config similarity index 100% rename from waybar-river/.config/waybar/config rename to waybar/.config/waybar/config diff --git a/waybar-river/.config/waybar/mocha.css b/waybar/.config/waybar/mocha.css similarity index 100% rename from waybar-river/.config/waybar/mocha.css rename to waybar/.config/waybar/mocha.css diff --git a/waybar-river/.config/waybar/style.css b/waybar/.config/waybar/style.css similarity index 100% rename from waybar-river/.config/waybar/style.css rename to waybar/.config/waybar/style.css diff --git a/yambar/.config/yambar/config.yml b/yambar/.config/yambar/config.yml deleted file mode 100644 index bd6df08..0000000 --- a/yambar/.config/yambar/config.yml +++ /dev/null @@ -1,153 +0,0 @@ -font: &font Iosevka Nerd Font:size=40 - -rosewater: &rosewater f5e0dcff -flamingo: &flamingo f2cdcdff -pink: &pink f5c2e7ff -mauve: &mauve cba6f7ff -red: &red f38ba8ff -maroon: &maroon eba0acff -peach: &peach fab387ff -yellow: &yellow f9e2afff -green: &green a6e3a1ff -teal: &teal 94e2d5ff -sky: &sky 89dcebff -sapphire: &sapphire 74c7ecff -blue: &blue 89b4faff -lavender: &lavender b4befeff -text: &text cdd6f4ff -base: &base 1e1e2eff - -bg_default: &bg_default {stack: [{background: {color: *base}}, {underline: {size: 4, color: *pink}}]} -bar: - height: 80 - location: bottom - font: *font - spacing: 10 - margin: 7 - layer: bottom - foreground: *text - background: *base - - left: - - river: - anchors: - - base: &river_base - left-margin: 10 - right-margin: 13 - default: {string: {text:  }} - conditions: - id == 1: {string: {text: 1}} - id == 2: {string: {text: 2}} - id == 3: {string: {text: 3}} - id == 4: {string: {text: 4}} - id == 5: {string: {text: 5}} - id == 6: {string: {text: 6}} - id == 7: {string: {text: 7}} - id == 8: {string: {text: 8}} - id == 9: {string: {text: 9}} - id == 1048576: {string: {text: "scratchpad"}} - - content: - map: - on-click: - left: sh -c "riverctl set-focused-tags $((1 << ({id} - 1)))" - right: sh -c "riverctl toggle-focused-tags $((1 << ({id} -1)))" - middle: sh -c "riverctl toggle-view-tags $((1 << ({id} -1)))" - conditions: - state == urgent: - map: - <<: *river_base - deco: {background: {color: *red}} - state == focused: - map: - <<: *river_base - deco: *bg_default - state == visible && ~occupied: - map: - <<: *river_base - state == visible && occupied: - map: - <<: *river_base - deco: *bg_default - state == unfocused: - map: - <<: *river_base - state == invisible && ~occupied: {empty: {}} - state == invisible && occupied: - map: - <<: *river_base - deco: {underline: {size: 3, color: *blue}} - center: - - clock: - time-format: "%H:%M %A, %B %d" - content: - - string: {text: "{time}"} - - right: - - network: - # name: "wlan0" - poll-interval: 1000 - content: - map: - default: {string: {text: "", foreground: *text}} - conditions: - state == down: {string: {text:  , foreground: *text}} - state == up: - map: - default: - - string: {text:  } - - string: {text: " {ssid}"} - - conditions: - ipv4 == "": - - string: {text:  , foreground: *text} - - string: {text: " {ssid}", foreground: *text} - - battery: - name: BAT0 - poll-interval: 60000 - anchors: - discharging: &discharging - list: - items: - - ramp: - tag: capacity - items: - - string: {text:  , foreground: *red} - - string: {text:  , foreground: *red} - - string: {text:  ,} - - string: {text:  ,} - - string: {text:  ,} - - string: {text:  ,} - - string: {text:  ,} - - string: {text:  ,} - - string: {text:  ,} - - string: {text:  , foreground: *green} - - string: {text: " {capacity}% {estimate}"} - content: - map: - conditions: - state == unknown: - <<: *discharging - state == discharging: - <<: *discharging - state == charging: - - string: {text:  , foreground: *text} - - string: {text: " {capacity}% {estimate}"} - state == full: - - string: {text:  , foreground: *green} - - string: {text: " {capacity}% full"} - state == "not charging": - - ramp: - tag: capacity - items: - - string: {text:   , foreground: *red} - - string: {text:   , foreground: *rosewater} - - string: {text:   , foreground: *green} - - string: {text:   , foreground: *green} - - string: {text:   , foreground: *green} - - string: {text:   , foreground: *green} - - string: {text:   , foreground: *green} - - string: {text:   , foreground: *green} - - string: {text:   , foreground: *green} - - string: {text:   , foreground: *green} - - string: {text: " {capacity}%"}