From 87a6044f29873e678072cd777812e63992c1fee0 Mon Sep 17 00:00:00 2001 From: Adam Cooper Date: Thu, 16 Jan 2025 20:32:33 -0500 Subject: [PATCH] Various changes --- README.md | 10 ---------- awesome/autorun.sh | 13 ++++++------- awesome/mytheme.lua | 3 +++ awesome/rc.lua | 27 ++++++++++++++++----------- bin/start-tuis.sh | 5 +---- neovim/init.lua | 24 +----------------------- zsh/.zshenv | 28 +++++++--------------------- 7 files changed, 34 insertions(+), 76 deletions(-) diff --git a/README.md b/README.md index a15ed6c..c743f6e 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,4 @@ These are the messy dotfiles for my Arch Linux system. They're useful for - restoring my system after a catastrophe - almost nothing else :) -#### dracula/vim -I am using my own fork of dracula/vim. Specifically, I changed the color of the virtual text so it doesn't conflict with the cursor line. When updates in upstream come through, we run the following: -- `git switch master` -- `git pull upstream` -- `git switch adamc-main` -- `git merge master` -- `git add . && git commit` -- `git push origin` - - Please feel free to contact me with any questions; I'll be glad to help. diff --git a/awesome/autorun.sh b/awesome/autorun.sh index c31e9be..7ae01fe 100755 --- a/awesome/autorun.sh +++ b/awesome/autorun.sh @@ -1,4 +1,7 @@ #!/bin/sh +# +# autorun.sh +# AwesomeWM startup items run() { if ! pgrep -f "$1" ; @@ -7,20 +10,16 @@ run() { fi } -# /usr/sbin/alacritty --socket "$XDG_RUNTIME_DIR/alacritty-main.sock" --title awesome-startup & -# /usr/sbin/alacritty --title bottom --option font.size=6.5 --command btm --battery & -# /usr/sbin/alacritty --title btop --command btop & /usr/sbin/wezterm start & run "cbatticon" run "blueman-applet" run "nm-applet" -run "nextcloud --background" -run "pasystray" run "mullvad-vpn" -run "xscreensaver -no-splash" run "keepassxc" -# run "sleep 4" +/usr/sbin/nextcloud --background & +/usr/sbin/pasystray --key-grabbing --notify=all & +/usr/sbin/xscreensaver -no-splash & /usr/sbin/sleep 4 # This seems to broken specifically for wezterm & btop at startup diff --git a/awesome/mytheme.lua b/awesome/mytheme.lua index cc0c593..228c0e5 100644 --- a/awesome/mytheme.lua +++ b/awesome/mytheme.lua @@ -54,7 +54,10 @@ theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel( -- Variables set for theming notifications: -- notification_font +theme.notification_font = "Liberation Sans 8" -- notification_[bg|fg] +theme.notification_bg = "#00ff00" +theme.notification_fg = "#600060" -- notification_[width|height|margin] -- notification_[border_color|border_width|shape|opacity] diff --git a/awesome/rc.lua b/awesome/rc.lua index aef4902..f3226ed 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -82,8 +82,9 @@ local editor_cmd = terminal() .. " -- " .. editor modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. -awful.layout.layouts = { - awful.layout.suit.tile, +-- awful.layout.layouts = { +awful.layout.append_default_layouts({ + -- awful.layout.suit.tile, awful.layout.suit.max, awful.layout.suit.max.fullscreen, awful.layout.suit.tile.left, @@ -99,7 +100,7 @@ awful.layout.layouts = { -- awful.layout.suit.corner.ne, -- awful.layout.suit.corner.sw, -- awful.layout.suit.corner.se, -} +}) -- }}} -- {{{ Menu @@ -109,13 +110,14 @@ myawesomemenu = { { "manual", terminal() .. " -e man awesome" }, { "edit config", editor_cmd .. " " .. awesome.conffile }, { "restart", awesome.restart }, - -- { "quit", function() awesome.quit() end }, - { "quit", "xfce4-session-logout &" }, + { "quit", function() awesome.quit() end }, } -mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "open terminal", terminal() } -} +mymainmenu = awful.menu({ + items = { + { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal() }, + } }) mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, @@ -416,7 +418,9 @@ globalkeys = gears.table.join( {description = "lua execute prompt", group = "awesome"}), -- Menubar awful.key({ modkey }, "p", function() os.execute("dmenu_run") end, - {description = "show the menubar", group = "launcher"}) + {description = "show the menubar", group = "launcher"}), + awful.key({ }, "XF86MonBrightnessUp", function() awful.spawn("xbacklight -inc 10") end, { description = "Brighten the screen", group = "monitor" }), + awful.key({ }, "XF86MonBrightnessDown", function() awful.spawn("xbacklight -dec 10") end, { description = "Brighten the screen", group = "monitor" }) ) clientkeys = gears.table.join( @@ -587,9 +591,10 @@ awful.rules.rules = { -- { rule = { class = "Firefox" }, -- properties = { screen = 1, tag = "2" } }, { rule = { class = "KeePassXC" }, properties = { screen = 1, tag = "2" } }, - { rule = { class = "bottom" }, properties = { screen = 1, tag = "9" } }, + { rule = { class = "btop" }, properties = { screen = 1, tag = "9" } }, { rule = { class = "qutebrowser" }, properties = { screen = 1, tag = "2" } }, - { rule = { class = "Alacritty" }, properties = { screen = 1, tag = "1" } }, + { rule = { class = "librewolf" }, properties = { screen = 1, tag = "2" } }, + { rule = { class = "wezterm" }, properties = { screen = 1, tag = "1" } }, } -- }}} diff --git a/bin/start-tuis.sh b/bin/start-tuis.sh index f837a9d..482f743 100755 --- a/bin/start-tuis.sh +++ b/bin/start-tuis.sh @@ -4,10 +4,7 @@ # # Convenience script to start up my usual TUIs -# alacritty msg create-window --title joplin --command /home/adam/.config/nvm/versions/node/v20.11.1/bin/joplin -# alacritty msg create-window --title newsboat --command newsboat -# alacritty msg create-window --title aerc --command aerc -wezterm cli spawn -- /home/adam/.config/nvm/versions/node/v20.11.1/bin/joplin +wezterm cli spawn -- /home/adam/.config/nvm/versions/node/v22.12.0/bin/joplin wezterm cli set-tab-title 'joplin' wezterm cli spawn -- newsboat wezterm cli spawn -- aerc diff --git a/neovim/init.lua b/neovim/init.lua index c6380a7..b76568d 100644 --- a/neovim/init.lua +++ b/neovim/init.lua @@ -95,22 +95,6 @@ vim.opt.rtp:prepend(lazypath) local js_based_languages = { "javascript", "typescript" } require("lazy").setup({ - --[[ - { - url = "https://git.theadamcooper.com/adam/dracula-vim.git", - branch = "adamc-main", - name = "dracula", - lazy = false, - priority = 1000, - config = function() - vim.cmd.colorscheme("dracula") - end, - }, - --]] - { - "miikanissi/modus-themes.nvim", - priority = 1000, - }, { "afair/vibrantink2", priority = 1000, @@ -790,13 +774,7 @@ require('nvim-treesitter.configs').setup({ enable = true, module_path = "nvim-treesitter.indent", }, - -- [nvim-orgmode] NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option - -- add ~org~ to ignore_install - -- require('nvim-treesitter.configs').setup({ - -- ensure_installed = 'all', - -- ignore_install = { 'org' }, - -- }) - ensure_installed = { "bash", "comment", "go", "html", "javascript", "json", "lua", "python", "typescript", "yaml" }, + ensure_installed = { "bash", "comment", "go", "html", "javascript", "json", "kdl", "lua", "python", "typescript", "yaml" }, sync_install = false, auto_install = false, ignore_install = {}, diff --git a/zsh/.zshenv b/zsh/.zshenv index 76b94b2..ee05c31 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -8,26 +8,10 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export HISTSIZE=9998 export SAVEHIST=10000 -export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.cargo/env:$HOME/code/go/bin:/usr/local/bin:/opt/local/bin:/opt/local/sbin:/usr/local/go/bin:/usr/sbin:/usr/bin:/sbin:/bin:$HOME/.rbenv:$PATH" - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - +export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.cargo/env:$HOME/code/go/bin:/opt/local/bin:/opt/local/sbin:/usr/local/go/bin:/usr/sbin:/sbin:$PATH" export EDITOR="nvim" export VISUAL="nvim" -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - # FZF export FZF_DEFAULT_COMMAND="fd --no-ignore --hidden --type f" # Includes hidden files export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" @@ -35,9 +19,7 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" # exa colors export LS_COLORS="rs=0:fi=35:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:*.md=36" -# ddgr -export BROWSER=w3m -export DDGR_COLORS="MBdexy" +export BROWSER=cha # navi export NAVI_TAG_COLOR=6 @@ -51,4 +33,8 @@ export GOMPHOTHERIUM_ACCESS_TOKEN='qqscVpLBugWAv6cFUqu1vBm0QMbgsWTiafg7TwZsTec' export ROSWELL_HOME="/home/adam/.config/roswell" # Consolidate PATH -# export PATH="$(consolidate-path "$PATH")" +export PATH="$(consolidate-path "$PATH")" + +# rover +source "/home/adam/.rover/env" +export APOLLO_TELEMETRY_DISABLED=1