7 files changed, 40 insertions(+), 54 deletions(-)

M README.md
A etc/iwd/main.conf
M river/.config/river/autorun
M river/.config/river/init
A sh/.local/bin/color-picker
M usr/local/bin/compositor
M vis/.config/vis/visrc.lua

@@ 1,16 1,20 @@
 # archlinux setup
 
-| software | description        |
-|----------|--------------------|
-| river    | wayland compositor |
-| waybar   | statusbar          |
-| foot     | terminal emulator  |
-| fuzzel   | command launcher   |
-| bash     | shell              |
-| vis      | text editor        |
-| fff      | file manager       |
-| amfora   | gemini browser     |
-| firefox  | web browser        |
-| imv      | image viewer       |
-| mpv      | media player       |
-| pipewire | audio backend      |
+| software  | description        |
+|-----------|--------------------|
+| river     | wayland compositor |
+| levee     | statusbar          |
+| foot      | terminal emulator  |
+| fuzzel    | command launcher   |
+| bash      | shell              |
+| vivo      | text editor        |
+| fff       | file manager       |
+| astronaut | gemini browser     |
+| firefox   | web browser        |
+| imv       | image viewer       |
+| mpv       | media player       |
+| pipewire  | audio backend      |
+| spotifyd  | spotify daemon     |
+| spt       | spotify frontend   |
+| iwd       | wireless daemon    |
+

@@ 0,0 1,4 @@
+[General]
+EnableIPv6=True
+EnableNetworkConfiguration=True
+NameResolvingService=systemd

@@ 1,9 1,9 @@
+systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 dbus-update-activation-environment DISPLAY
 levee
 foot --server
 gammastep
 mako
-nm-applet --indicator
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 1password --silent
 rivertile -main-ratio 0.5 -view-padding 8 -outer-padding 8

@@ 6,6 6,7 @@ riverctl map normal Super E spawn '$TERMINAL'
 riverctl map normal Super A spawn '$TERMINAL fff'
 riverctl map normal Super G spawn '$TERMINAL astronaut'
 riverctl map normal Super P spawn '1password --quick-access'
+riverctl map normal Super N spawn 'iwdgui'
 
 riverctl map normal Super BackSpace close
 riverctl map normal Super+Shift BackSpace exit


@@ 22,10 23,6 @@ riverctl map normal Super F toggle-float
 riverctl map normal Super Return zoom
 riverctl map normal Super Tab swap next
 
-riverctl declare-mode passthrough
-riverctl map normal Super 0 enter-mode passthrough
-riverctl map passthrough Super 0 enter-mode normal
-
 riverctl map-pointer normal Super BTN_LEFT move-view
 riverctl map-pointer normal Super+Shift BTN_LEFT resize-view
 

@@ 0,0 1,3 @@
+#!/bin/sh
+
+grim -g "$(slurp -p)" -t ppm - | convert - -format '%[pixel:p{0,0}]\n' info:-

@@ 1,7 1,8 @@
 #!/bin/sh
 
+export XDG_CURRENT_DESKTOP='river'
 export XKB_DEFAULT_LAYOUT=it
-export XKB_DEFAULT_OPTIONS="caps:swapescape"
+export XKB_DEFAULT_OPTIONS='caps:swapescape'
 export XDG_SESSION_TYPE=wayland
 export SDL_VIDEODRIVER=wayland
 export MOZ_ENABLE_WAYLAND=1

@@ 1,5 1,4 @@
 require('vis')
-require('plugins/cscope')
 require('plugins/open_rej')
 require("plugins/vis-filetype-settings")
 require('plugins/vis-smart-backspace')


@@ 12,11 11,8 @@ prs = require('plugins/pairs')
 prs.autopairs = false
 
 spell = require('plugins/spellcheck')
-spell.cmd = "nuspell -d %s"
-spell.list_cmd = "nuspell -l -d %s"
-
-toggler = require('plugins/vis-toggler')
-toggler.config = require('plugins/vis-toggler.example')
+spell.cmd = "enchant-2 -a -d %s"
+spell.list_cmd = "enchant-2 -l -d %s"
 
 vis.events.subscribe(vis.events.INIT, function()
 	vis:command('set escdelay 0')


@@ 27,43 23,24 @@ vis.events.subscribe(vis.events.INIT, function()
 	vis:map(vis.modes.VISUAL, ' y', '"+<vis-operator-yank>')
 	vis:map(vis.modes.VISUAL_LINE, ' y', '"+<vis-operator-yank>')
 	-- Folding --
-	vis:map(vis.modes.NORMAL, ' w', 'ggVG:|fold -w 80 -s<Enter>')
+	vis:map(vis.modes.VISUAL_LINE, ' w', ':|fold -w 80 -s<Enter><Escape>')
 	-- FZF --
 	vis:map(vis.modes.NORMAL, ' f', ':fzf<Enter><Enter>')
 	-- Toggle Spellcheck --
-	vis:map(vis.modes.NORMAL, ' s', ':spelllang<Enter><F7>')
+	vis:map(vis.modes.NORMAL, ' s', '<F7>')
+	-- Correct Typo
+	vis:map(vis.modes.NORMAL, ' c', '<C-w>w')
 end)
 
 vis.events.subscribe(vis.events.WIN_OPEN, function(win)
 	vis:command('set relativenumbers')
 	vis:command('set cursorline')
+	vis:command('set colorcolumn 80')
 end)
 
 settings = {
-	ansi_c = {
-		'set colorcolumn 80',
-	},
-	bash = {
-		'set colorcolumn 80',
-	},
-	html = {
-		'set tabwidth 2',
-		'set expandtab',
-	},
-	lua = {
-		'set colorcolumn 80',
-	},
-	python = {
-		'set colorcolumn 80',
-		'set tabwidth 4',
-		'set expandtab',
-	},
-	rust = {
-		'set tabwidth 4',
-		'set expandtab',
-	},
-	zig = {
-		'set tabwidth 4',
-		'set expandtab',
-	},
+	html = {'set tabwidth 2', 'set expandtab'},
+	python = {'set tabwidth 4', 'set expandtab'},
+	rust = {'set tabwidth 4', 'set expandtab'},
+	zig = {'set tabwidth 4', 'set expandtab'},
 }