save

.luarc.json

@@ -1,6 +0,0 @@
-{
-    "workspace.library": [
-        "/home/linuxbrew/.linuxbrew/Cellar/neovim/HEAD-c374d78_1/share/nvim/runtime",
-        "${3rd}/luv/library"
-    ]
-}

bin/.local/bin/sober

@@ -0,0 +1,2 @@
+#!/bin/sh
+flatpak run org.vinegarhq.Sober

eza/.config/eza/theme.yml

@@ -0,0 +1,21 @@
+colourful: true
+
+filenames:
+  "documents":
+    icon:
+      glyph: 󰲂
+  "downloads":
+    icon:
+      glyph: 󰉍
+  "media":
+    icon:
+      glyph: 󱍙
+  "programming":
+    icon:
+      glyph: 󰚝
+  "walls":
+    icon:
+      glyph: 󰉏
+  "dotfiles":
+    icon:
+      glyph: 󱁿

fonts/.local/share/fonts/.uuid

@@ -0,0 +1 @@
+eb3159e9-ccfe-40cf-b4aa-9e2f3efd87b6

gtk/.config/gtk-3.0/settings.ini

@@ -0,0 +1,2 @@
+[Settings]
+gtk-application-prefer-dark-theme=1

nvim/.config/nvim/ftplugin/java.lua

@@ -0,0 +1 @@
+vim.opt_local.makeprg = "./gradlew build"

nvim/.config/nvim/ftplugin/markdown.lua

@@ -0,0 +1,12 @@
+vim.opt_local.textwidth = 80
+vim.opt_local.wrap = true
+vim.opt_local.linebreak = true
+vim.opt_local.list = false
+vim.opt_local.spell = true
+vim.opt_local.spelllang = "en_us"
+vim.opt_local.conceallevel = 2
+vim.opt_local.concealcursor = "nv"
+vim.opt_local.autoindent = true
+vim.opt_local.shiftwidth = 2
+vim.opt_local.tabstop = 2
+vim.opt_local.expandtab = true

nvim/.config/nvim/ftplugin/markdown.vim

@@ -1,12 +0,0 @@
-setlocal textwidth=80
-setlocal wrap
-setlocal linebreak
-setlocal nolist
-setlocal spell
-setlocal spelllang=en_us
-setlocal conceallevel=2
-setlocal concealcursor=nv
-setlocal autoindent
-setlocal shiftwidth=2
-setlocal tabstop=2
-setlocal expandtab

nvim/.config/nvim/init.lua

@@ -2,3 +2,4 @@ require 'plugins'
 require 'configs'
 require 'lsp'
 require 'keymaps'
+require 'commands'

nvim/.config/nvim/lsp/jdtls.lua

@@ -0,0 +1,21 @@
+---@type vim.lsp.Config
+return {
+    cmd = {
+        "jdtls",
+        "-data",
+        vim.fn.stdpath("data") .. "/jdtls-workspace/" .. vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t"),
+    },
+
+    filetypes = { "java" },
+
+    root_markers = {
+        "gradlew",
+        "mvnw",
+        "pom.xml",
+        "build.gradle",
+        "build.gradle.kts",
+        ".git",
+    },
+
+    single_file_support = false,
+}

nvim/.config/nvim/lua/commands.lua

@@ -0,0 +1,39 @@
+vim.api.nvim_create_user_command('SimulateRobotCode', function()
+	vim.fn.jobstart({
+		"./gradlew",
+		"simulateJava",
+	}, {
+		stdout_buffered = true,
+		stderr_buffered = true,
+		on_stdout = function(_, data)
+		end,
+		on_stderr = function(_, data)
+		end,
+
+	})
+end, {})
+
+vim.api.nvim_create_user_command("DeployRobotCode", function()
+	vim.fn.jobstart({
+		"./gradlew",
+		"deploy",
+		"-PteamNumber=245",
+		"--offline",
+		"--console=plain",
+		"--warning-mode=none",
+		"-q"
+	}, {
+		stdout_buffered = true,
+		stderr_buffered = true,
+		on_stdout = function(_, data)
+			if data then
+				vim.notify(table.concat(data, "\n"))
+			end
+		end,
+		on_stderr = function(_, data)
+			if data then
+				vim.notify(table.concat(data, "\n"), vim.log.levels.ERROR)
+			end
+		end,
+	})
+end, {})

nvim/.config/nvim/lua/configs.lua

@@ -13,3 +13,7 @@ vim.cmd("colorscheme vim")
 vim.api.nvim_set_hl(0, "MiniPickNormal", { bg = "#000000" })
 vim.api.nvim_set_hl(0, "MiniPickBorder", { bg = "#000000", fg = "#000000" })
 vim.api.nvim_set_hl(0, "MiniPickMatchCurrent", { bg = "#1e1e2e" })
+
+if vim.g.neovide then
+	vim.g.neovide_opacity = 0.8
+end

nvim/.config/nvim/lua/keymaps.lua

@@ -13,5 +13,6 @@ for _, k in ipairs({ "h", "j", "k", "l" }) do
 end
 
 keymap("n", "<leader>f", ":Pick files<CR>")
+keymap("n", "<leader>g", ":Pick grep_live<CR>")
 
 keymap("n", "<leader>lf", vim.lsp.buf.format)

nvim/.config/nvim/lua/lsp.lua

@@ -1,10 +1,8 @@
 vim.lsp.enable {
-	"bashls",
 	"gopls",
 	"lua_ls",
 	"clangd",
 	"jdtls",
-	"rust-analyzer",
 }
 
 vim.diagnostic.config { virtual_text = true, underline = true, signs = false }

nvim/.config/nvim/lua/plugins.lua

@@ -8,10 +8,16 @@ vim.pack.add {
 		version = "1.*",
 	},
 	{ src = "https://github.com/nvim-lualine/lualine.nvim" },
+	{ src = "https://github.com/sphamba/smear-cursor.nvim" },
+
+	{ src = "https://github.com/m00qek/baleia.nvim" },
+	{ src = "https://github.com/esmuellert/codediff.nvim" },
+	{ src = "https://github.com/NeogitOrg/neogit" },
 }
 
 require("mini.pick").setup {}
 require("lualine").setup {}
+require("smear_cursor").setup {}
 
 require('blink.cmp').setup {
 	fuzzy = { implementation = 'prefer_rust_with_warning' },
@@ -52,3 +58,5 @@ require('blink.cmp').setup {
 		}
 	}
 }
+
+require("neogit").setup {}

nvim/.config/nvim/nvim-pack-lock.json

@@ -1,10 +1,18 @@
 {
   "plugins": {
+    "baleia.nvim": {
+      "rev": "710537ff5cd669c5a76c5f5b6a9169fd9b913d18",
+      "src": "https://github.com/m00qek/baleia.nvim"
+    },
     "blink.cmp": {
       "rev": "d0c5196dae32c53cde1208161554906f5b982de8",
       "src": "https://github.com/saghen/blink.cmp",
       "version": "'1.*'"
     },
+    "codediff.nvim": {
+      "rev": "29b06f37251f2e010f53a0892573b2ec03d165e2",
+      "src": "https://github.com/esmuellert/codediff.nvim"
+    },
     "friendly-snippets": {
       "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9",
       "src": "https://github.com/rafamadriz/friendly-snippets"
@@ -17,10 +25,22 @@
       "rev": "8521fe21df86e08d9e4b3c3f3a7d50e47954e1af",
       "src": "https://github.com/nvim-mini/mini.pick"
     },
+    "neogit": {
+      "rev": "99326a1310fb2d616b455d2fd16d01bf00682f06",
+      "src": "https://github.com/NeogitOrg/neogit"
+    },
     "nvim-jdtls": {
       "rev": "77ccaeb422f8c81b647605da5ddb4a7f725cda90",
       "src": "https://codeberg.org/mfussenegger/nvim-jdtls"
     },
+    "nvim-notify": {
+      "rev": "8701bece920b38ea289b457f902e2ad184131a5d",
+      "src": "https://github.com/rcarriga/nvim-notify"
+    },
+    "smear-cursor.nvim": {
+      "rev": "9e9378d6ee34bb3782e0e8c63d9ec8ca618b479b",
+      "src": "https://github.com/sphamba/smear-cursor.nvim"
+    },
     "todo-comments.nvim": {
       "rev": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668",
       "src": "https://github.com/folke/todo-comments.nvim"

oxwm/.config/dunst/dunstrc

@@ -0,0 +1,499 @@
+# See dunst(5) for all configuration options
+
+[global]
+    ### Display ###
+
+    # Which monitor should the notifications be displayed on.
+    monitor = 0
+
+    # Display notification on focused monitor.  Possible modes are:
+    #   mouse: follow mouse pointer
+    #   keyboard: follow window with keyboard focus
+    #   none: don't follow anything
+    #
+    # "keyboard" needs a window manager that exports the
+    # _NET_ACTIVE_WINDOW property.
+    # This should be the case for almost all modern window managers.
+    #
+    # If this option is set to mouse or keyboard, the monitor option
+    # will be ignored.
+    follow = none
+
+    ### Geometry ###
+
+    # The width of the window, excluding the frame.
+    # dynamic width from 0 to 300
+    # width = (0, 300)
+    # constant width of 300
+    width = (100, 300)
+
+    # The height of a single notification, excluding the frame.
+    # dynamic height from 0 to 300
+    height = (0, 300)
+    # constant height of 300
+    # height = 300
+    # NOTE: Dunst from version 1.11 and older don't support dynamic height
+    #       and the given value is treated as the maximum height
+
+    # Position the notification in the top right corner
+    origin = top-right
+
+    # Offset from the origin
+    # NOTE: Dunst from version 1.11 and older use this alternative notation
+    # offset = 10x50
+    offset = (5, 15)
+
+    # Scale factor. It is auto-detected if value is 0.
+	# NOTE: The screenshot was made with scale = 2
+    scale = 0
+
+    # Maximum number of notification (0 means no limit)
+    notification_limit = 10
+
+    ### Progress bar ###
+
+    # Turn on the progress bar. It appears when a progress hint is passed with
+    # for example dunstify -h int:value:12
+    progress_bar = true
+
+    # Set the progress bar height. This includes the frame, so make sure
+    # it's at least twice as big as the frame width.
+    progress_bar_height = 14
+
+    # Set the frame width of the progress bar
+    progress_bar_frame_width = 0
+
+    # Set the minimum width for the progress bar
+    progress_bar_min_width = 100
+
+    # Set the maximum width for the progress bar
+    progress_bar_max_width = 300
+
+    # Corner radius for the progress bar. 0 disables rounded corners.
+    progress_bar_corner_radius = 50
+
+    # Define which corners to round when drawing the progress bar. If progress_bar_corner_radius
+    # is set to 0 this option will be ignored.
+	progress_bar_corners = bottom-left, top-right
+
+    # Corner radius for the icon image.
+    icon_corner_radius = 0
+
+    # Define which corners to round when drawing the icon image. If icon_corner_radius
+    # is set to 0 this option will be ignored.
+    icon_corners = all
+
+    # Show how many messages are currently hidden (because of
+    # notification_limit).
+    indicate_hidden = yes
+
+    # The transparency of the window.  Range: [0; 100].
+    # This option will only work if a compositing window manager is
+    # present (e.g. xcompmgr, compiz, etc.). (X11 only)
+    transparency = 0
+
+    # Draw a line of "separator_height" pixel height between two
+    # notifications.
+    # Set to 0 to disable.
+    # If gap_size is greater than 0, this setting will be ignored.
+    separator_height = 6
+
+    # Padding between text and separator.
+    padding = 10
+
+    # Horizontal padding.
+    horizontal_padding = 8
+
+    # Padding between text and icon.
+    text_icon_padding = 12
+
+    # Defines width in pixels of frame around the notification window.
+    # Set to 0 to disable.
+    frame_width = 1
+
+    # Defines color of the frame around the notification window.
+    frame_color = "#a0a0a0"
+
+    # Size of gap to display between notifications - requires a compositor.
+    # If value is greater than 0, separator_height will be ignored and a border
+    # of size frame_width will be drawn around each notification instead.
+    # Click events on gaps do not currently propagate to applications below.
+    gap_size = 6
+
+    # Define a color for the separator.
+    # possible values are:
+    #  * auto: dunst tries to find a color fitting to the background;
+    #  * foreground: use the same color as the foreground;
+    #  * frame: use the same color as the frame;
+    #  * anything else will be interpreted as a X color.
+    separator_color = frame
+
+    # Sort type.
+    # possible values are:
+    #  * id: sort by id
+    #  * urgency_ascending: sort by urgency (low then normal then critical)
+    #  * urgency_descending: sort by urgency (critical then normal then low)
+    #  * update: sort by update (most recent always at the top)
+    sort = yes
+
+    # Don't remove messages, if the user is idle (no mouse or keyboard input)
+    # for longer than idle_threshold seconds.
+    # Set to 0 to disable.
+    # A client can set the 'transient' hint to bypass this. See the rules
+    # section for how to disable this if necessary
+    # idle_threshold = 120
+
+    ### Text ###
+
+    font = Fira Mono 12
+
+    # The spacing between lines.  If the height is smaller than the
+    # font height, it will get raised to the font height.
+    line_height = 0
+
+    # Possible values are:
+    # full: Allow a small subset of html markup in notifications:
+    #        <b>bold</b>
+    #        <i>italic</i>
+    #        <s>strikethrough</s>
+    #        <u>underline</u>
+    #
+    #        For a complete reference see
+    #        <https://docs.gtk.org/Pango/pango_markup.html>.
+    #
+    # strip: This setting is provided for compatibility with some broken
+    #        clients that send markup even though it's not enabled on the
+    #        server. Dunst will try to strip the markup but the parsing is
+    #        simplistic so using this option outside of matching rules for
+    #        specific applications *IS GREATLY DISCOURAGED*.
+    #
+    # no:    Disable markup parsing, incoming notifications will be treated as
+    #        plain text. Dunst will not advertise that it has the body-markup
+    #        capability if this is set as a global setting.
+    #
+    # It's important to note that markup inside the format option will be parsed
+    # regardless of what this is set to.
+    markup = full
+
+    # The format of the message.  Possible variables are:
+    #   %a  appname
+    #   %s  summary
+    #   %b  body
+    #   %i  iconname (including its path)
+    #   %I  iconname (without its path)
+    #   %p  progress value if set ([  0%] to [100%]) or nothing
+    #   %n  progress value if set without any extra characters
+    #   %%  Literal %
+    # Markup is allowed
+    format = "<b>%s</b>\n%b"
+
+    # Alignment of message text.
+    # Possible values are "left", "center" and "right".
+    alignment = left
+
+    # Vertical alignment of message text and icon.
+    # Possible values are "top", "center" and "bottom".
+    vertical_alignment = center
+
+    # Show age of message if message is older than show_age_threshold
+    # seconds.
+    # Set to -1 to disable.
+    show_age_threshold = -1
+
+    # Specify where to make an ellipsis in long lines.
+    # Possible values are "start", "middle" and "end".
+    ellipsize = middle
+
+    # Ignore newlines '\n' in notifications.
+    ignore_newline = no
+
+    # Stack together notifications with the same content
+    stack_duplicates = true
+
+    # Hide the count of stacked notifications with the same content
+    hide_duplicate_count = false
+
+    # Display indicators for URLs (U) and actions (A).
+    show_indicators = yes
+
+    ### Icons ###
+
+    # Recursive icon lookup. You can set a single theme, instead of having to
+    # define all lookup paths.
+    enable_recursive_icon_lookup = true
+
+    # Set icon theme (only used for recursive icon lookup)
+    icon_theme = Adwaita, Papirus, Papirus-Dark
+    # You can also set multiple icon themes, with the leftmost one being used first.
+    # icon_theme = "Adwaita, breeze"
+
+    # Align icons left/right/top/off
+    icon_position = right
+
+    # Scale small icons up to this size, set to 0 to disable. Helpful
+    # for e.g. small files or high-dpi screens. In case of conflict,
+    # max_icon_size takes precedence over this.
+    min_icon_size = 32
+
+    # Scale larger icons down to this size, set to 0 to disable
+    max_icon_size = 128
+
+    # Paths to default icons (only necessary when not using recursive icon lookup)
+    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+
+    ### History ###
+
+    # Should a notification popped up from history be sticky or timeout
+    # as if it would normally do.
+    sticky_history = yes
+
+    # Maximum amount of notifications kept in history
+    history_length = 30
+
+    ### Misc/Advanced ###
+
+    # dmenu path.
+    dmenu = /usr/bin/dmenu -l 10 -p dunst:
+
+    # Browser for opening urls in context menu.
+    browser = /usr/bin/xdg-open
+
+    # Always run rule-defined scripts, even if the notification is suppressed
+    always_run_script = true
+
+    # Define the title of the windows spawned by dunst (X11 only)
+    title = Dunst
+
+    # Define the class of the windows spawned by dunst (X11 only)
+    class = Dunst
+
+    # Define the corner radius of the notification window
+    # in pixel size. If the radius is 0, you have no rounded
+    # corners.
+    # The radius will be automatically lowered if it exceeds half of the
+    # notification height to avoid clipping text and/or icons.
+    corner_radius = 10
+
+    # Define which corners to round when drawing the window. If the corner radius
+    # is set to 0 this option will be ignored.
+    #
+    # Comma-separated list of the corners. The accepted corner values are bottom-right,
+    # bottom-left, top-right, top-left, top, bottom, left, right or all.
+    corners = bottom, top-left
+
+    # Ignore the dbus closeNotification message.
+    # Useful to enforce the timeout set by dunst configuration. Without this
+    # parameter, an application may close the notification sent before the
+    # user defined timeout.
+    ignore_dbusclose = false
+
+    ### Wayland ###
+    # These settings are Wayland-specific. They have no effect when using X11
+
+    # Uncomment this if you want to let notifications appear under fullscreen
+    # applications (default: overlay)
+    # layer = top
+
+    # Set this to true to use X11 output on Wayland.
+    force_xwayland = false
+
+    ### Legacy
+
+    # Use the Xinerama extension instead of RandR for multi-monitor support.
+    # This setting is provided for compatibility with older nVidia drivers that
+    # do not support RandR and using it on systems that support RandR is highly
+    # discouraged.
+    #
+    # By enabling this setting dunst will not be able to detect when a monitor
+    # is connected or disconnected which might break follow mode if the screen
+    # layout changes.
+    force_xinerama = false
+
+    ### mouse
+
+    # Defines list of actions for each mouse event
+    # Possible values are:
+    # * none: Don't do anything.
+    # * do_action: Invoke the action determined by the action_name rule. If there is no
+    #              such action, open the context menu.
+    # * open_url: If the notification has exactly one url, open it. If there are multiple
+    #             ones, open the context menu.
+    # * close_current: Close current notification.
+    # * close_all: Close all notifications.
+    # * context: Open context menu for the notification.
+    # * context_all: Open context menu for all notifications.
+    # These values can be strung together for each mouse event, and
+    # will be executed in sequence.
+    mouse_left_click = close_current
+    mouse_middle_click = do_action, close_current
+    mouse_right_click = close_all
+
+# Experimental features that may or may not work correctly. Do not expect them
+# to have a consistent behaviour across releases.
+[experimental]
+    # Calculate the dpi to use on a per-monitor basis.
+    # If this setting is enabled the Xft.dpi value will be ignored and instead
+    # dunst will attempt to calculate an appropriate dpi value for each monitor
+    # using the resolution and physical size. This might be useful in setups
+    # where there are multiple screens with very different dpi values.
+    per_monitor_dpi = false
+
+
+[urgency_low]
+    # IMPORTANT: colors have to be defined in quotation marks.
+    # Otherwise the "#" and following would be interpreted as a comment.
+    background = "#222222"
+    foreground = "#ffffff"
+	highlight = "#722ae6, #e4b5cb"
+    timeout = 20
+    # Icon for notifications with low urgency
+    #default_icon = dialog-information
+
+[urgency_normal]
+    background = "#222222"
+    foreground = "#ffffff"
+	frame_color = "#5e5086"
+	highlight = "#722ae6, #e4b5cb"
+    timeout = 20
+    override_pause_level = 30
+    # Icon for notifications with normal urgency
+    default_icon = dialog-information
+
+[urgency_critical]
+    background = "#222222"
+    foreground = "#ffffff"
+    frame_color = "#d54e53"
+	highlight = "#d54e53, #f0f0f0"
+    timeout = 0
+    override_pause_level = 60
+    # Icon for notifications with critical urgency
+    default_icon = dialog-warning
+
+# Every section that isn't one of the above is interpreted as a rules to
+# override settings for certain messages.
+#
+# Messages can be matched by
+#    appname (discouraged, see desktop_entry)
+#    body
+#    category
+#    desktop_entry
+#    icon
+#    match_transient
+#    msg_urgency
+#    stack_tag
+#    summary
+#
+# and you can override the
+#    background
+#    foreground
+#    format
+#    frame_color
+#    fullscreen
+#    new_icon
+#    set_stack_tag
+#    set_transient
+#    set_category
+#    timeout
+#    urgency
+#    icon_position
+#    skip_display
+#    history_ignore
+#    action_name
+#    word_wrap
+#    ellipsize
+#    alignment
+#    hide_text
+#    override_pause_level
+#
+# Shell-like globbing will get expanded.
+#
+# Instead of the appname filter, it's recommended to use the desktop_entry filter.
+# GLib based applications export their desktop-entry name. In comparison to the appname,
+# the desktop-entry won't get localized.
+#
+# You can also allow a notification to appear even when paused. Notification will appear whenever notification's override_pause_level >= dunst's paused level.
+# This can be used to set partial pause modes, where more urgent notifications get through, but less urgent stay paused. To do that, you can override the following in the rules:
+# override_pause_level = X
+
+# SCRIPTING
+# You can specify a script that gets run when the rule matches by
+# setting the "script" option.
+# The script will be called as follows:
+#   script appname summary body icon urgency
+# where urgency can be "LOW", "NORMAL" or "CRITICAL".
+#
+# NOTE: It might be helpful to run dunst -print in a terminal in order
+# to find fitting options for rules.
+
+# Disable the transient hint so that idle_threshold cannot be bypassed from the
+# client
+#[transient_disable]
+#    match_transient = yes
+#    set_transient = no
+#
+# Make the handling of transient notifications more strict by making them not
+# be placed in history.
+#[transient_history_ignore]
+#    match_transient = yes
+#    history_ignore = yes
+
+# fullscreen values
+# show: show the notifications, regardless if there is a fullscreen window opened
+# delay: displays the new notification, if there is no fullscreen window active
+#        If the notification is already drawn, it won't get undrawn.
+# pushback: same as delay, but when switching into fullscreen, the notification will get
+#           withdrawn from screen again and will get delayed like a new notification
+#[fullscreen_delay_everything]
+#    fullscreen = delay
+#[fullscreen_show_critical]
+#    msg_urgency = critical
+#    fullscreen = show
+
+#[espeak]
+#    summary = "*"
+#    script = dunst_espeak.sh
+
+#[script-test]
+#    summary = "*script*"
+#    script = dunst_test.sh
+
+#[ignore]
+#    # This notification will not be displayed
+#    summary = "foobar"
+#    skip_display = true
+
+#[history-ignore]
+#    # This notification will not be saved in history
+#    summary = "foobar"
+#    history_ignore = yes
+
+#[skip-display]
+#    # This notification will not be displayed, but will be included in the history
+#    summary = "foobar"
+#    skip_display = yes
+
+#[signed_on]
+#    appname = Pidgin
+#    summary = "*signed on*"
+#    urgency = low
+#
+#[signed_off]
+#    appname = Pidgin
+#    summary = *signed off*
+#    urgency = low
+#
+#[says]
+#    appname = Pidgin
+#    summary = *says*
+#    urgency = critical
+#
+#[twitter]
+#    appname = Pidgin
+#    summary = *twitter.com*
+#    urgency = normal
+#
+#[stack-volumes]
+#    appname = "some_volume_notifiers"
+#    set_stack_tag = "volume"
+#
+# vim: ft=cfg

oxwm/.config/oxwm/config.lua

@@ -5,80 +5,91 @@ local modkey = "Mod4"
 local terminal = "st"
 
 local colors = {
-    fg = "#bbbbbb",
-    red = "#f7768e",
-    bg = "#1a1b26",
-    cyan = "#0db9d7",
-    green = "#9ece6a",
-    lavender = "#a9b1d6",
-    light_blue = "#7aa2f7",
-    grey = "#bbbbbb",
-    blue = "#6dade3",
-    purple = "#ad8ee6",
+	fg = "#bbbbbb",
+	red = "#f7768e",
+	bg = "#1a1b26",
+	cyan = "#0db9d7",
+	green = "#9ece6a",
+	lavender = "#a9b1d6",
+	light_blue = "#7aa2f7",
+	grey = "#bbbbbb",
+	blue = "#6dade3",
+	purple = "#ad8ee6",
 }
 
 local tags = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }
 
 local bar_font = "BigBlueTermPlus Nerd Font:style=Regular"
 
+local is_desktop = nil
+
+local success, _, _ = os.execute("nmcli >/dev/null")
+if success then
+	is_desktop = nil
+else
+	is_desktop = "yes"
+end
+
 local blocks = {
-    oxwm.bar.block.ram({
-        format = "Ram: {used}/{total} GB",
-        interval = 5,
-        color = colors.light_blue,
-        underline = true,
-    }),
-    oxwm.bar.block.static({
-        text = "│",
-        interval = 999999999,
-        color = colors.lavender,
-        underline = false,
-    }),
-    oxwm.bar.block.shell({
-        format = "{}",
-        command = "uname -r",
-        interval = 999999999,
-        color = colors.red,
-        underline = true,
-    }),
-    oxwm.bar.block.static({
-        text = "│",
-        interval = 999999999,
-        color = colors.lavender,
-        underline = false,
-    }),
-    oxwm.bar.block.datetime({
-        format = "{}",
-        date_format = "%a, %b %d - %-I:%M %P",
-        interval = 1,
-        color = colors.cyan,
-        underline = true,
-    }),
-    -- Uncomment to add battery status (useful for laptops)
-    oxwm.bar.block.battery({
-        format = "Bat: {}%",
-        charging = "⚡ Bat: {}%",
-        discharging = "- Bat: {}%",
-        full = "✓ Bat: {}%",
-        interval = 30,
-        color = colors.green,
-        underline = true,
-        -- click: run a command when the block is clicked
-        -- click = "alacritty -e btop",
-        -- click = { command = "bluetui", floating = true },
-    }),
+	oxwm.bar.block.ram({
+		format = "Ram: {used}/{total} GB",
+		interval = 5,
+		color = colors.light_blue,
+		underline = true,
+	}),
+	oxwm.bar.block.static({
+		text = "│",
+		interval = 999999999,
+		color = colors.lavender,
+		underline = false,
+	}),
+	is_desktop or oxwm.bar.block.shell({
+		format = "{}",
+		command = "nmcli -t -f STATE general",
+		color = colors.red,
+		underline = false,
+		interval = 5,
+		click = {
+			command = "st -e nmtui",
+			floating = true,
+		}
+	}),
+	is_desktop or oxwm.bar.block.static({
+		text = "│",
+		interval = 999999999,
+		color = colors.lavender,
+		underline = false,
+	}),
+	oxwm.bar.block.datetime({
+		format = "{}",
+		date_format = "%a, %b %d - %-I:%M:%S %P",
+		interval = 1,
+		color = colors.cyan,
+		underline = true,
+	}),
+	is_desktop or oxwm.bar.block.battery({
+		format = "Bat: {}%",
+		charging = "⚡ Bat: {}%",
+		discharging = "- Bat: {}%",
+		full = "✓ Bat: {}%",
+		interval = 30,
+		color = colors.green,
+		underline = true,
+		click = { command = "st -e btop", floating = true },
+	}),
+	oxwm.bar.block.systray({})
 };
 
 oxwm.set_terminal(terminal)
 oxwm.set_modkey(modkey)
 oxwm.set_tags(tags)
-
 oxwm.set_layout_symbol("tiling", "[T]")
-oxwm.set_layout_symbol("normie", "[F]")
-oxwm.set_layout_symbol("tabbed", "[=]")
+
+oxwm.key.bind({ modkey }, "C", oxwm.layout.set("tiling"))
+oxwm.key.bind({ "Mod4" }, "T", oxwm.layout.set("tabbed"))
+oxwm.key.bind({ modkey }, "N", oxwm.layout.set("scrolling"))
 
 oxwm.rule.add({ instance = "atlauncher", floating = true })
-oxwm.rule.add({ instance = "minecraft", floating = false })
 
 oxwm.border.set_width(2)
 oxwm.border.set_focused_color(colors.blue)
@@ -98,20 +109,19 @@ oxwm.bar.set_scheme_selected(colors.cyan, colors.bg, colors.purple)
 oxwm.bar.set_scheme_urgent(colors.red, colors.bg, colors.red)
 
 oxwm.key.bind({ modkey }, "B", oxwm.spawn({ "librewolf" }))
-oxwm.key.bind({ modkey }, "D", oxwm.spawn({ "vesktop" }))
+oxwm.key.bind({ modkey }, "D", oxwm.spawn({ "vesktop-bin" }))
 oxwm.key.bind({ modkey }, "G", oxwm.spawn({ "steam" }))
 oxwm.key.bind({ modkey }, "M", oxwm.spawn({ "ATLauncher" }))
-oxwm.key.bind({ modkey }, "S", oxwm.spawn({ "flatpak", "run", "org.vinegarhq.Sober" }))
+oxwm.key.bind({ modkey }, "S", oxwm.spawn({ "flatpak run org.vinegarhq.Sober" }))
 
 oxwm.key.bind({ modkey }, "Return", oxwm.spawn_terminal())
 oxwm.key.bind({ modkey }, "Space", oxwm.spawn({ "sh", "-c", "dmenu_run -l 10" }))
 oxwm.key.bind({ modkey, "Shift" }, "S", oxwm.spawn({ "sh", "-c", "maim -s | xclip -selection clipboard -t image/png" }))
-oxwm.key.bind({ modkey }, "w", oxwm.client.kill())
+oxwm.key.bind({ modkey }, "W", oxwm.client.kill())
 oxwm.key.bind({ modkey, "Shift" }, "Slash", oxwm.show_keybinds())
+oxwm.key.bind({ modkey, "Shift" }, "Space", oxwm.toggle_bar())
 oxwm.key.bind({ modkey }, "F", oxwm.client.toggle_fullscreen())
 oxwm.key.bind({ modkey }, "V", oxwm.client.toggle_floating())
-oxwm.key.bind({ modkey }, "C", oxwm.layout.set("tiling"))
-oxwm.key.bind({ modkey }, "T", oxwm.layout.set("tabbed"))
 oxwm.key.bind({ modkey }, "H", oxwm.set_master_factor(-5))
 oxwm.key.bind({ modkey }, "L", oxwm.set_master_factor(5))
 oxwm.key.bind({ modkey }, "I", oxwm.inc_num_master(1))
@@ -124,16 +134,16 @@ oxwm.key.bind({ modkey }, "K", oxwm.client.focus_stack(-1))
 oxwm.key.bind({ modkey, "Shift" }, "J", oxwm.client.move_stack(1))
 oxwm.key.bind({ modkey, "Shift" }, "K", oxwm.client.move_stack(-1))
 
-oxwm.key.bind({ }, "XF86AudioMute", oxwm.spawn({ "wpctl set-mute @DEFAULT_SINK@ toggle" }))
-oxwm.key.bind({ }, "XF86AudioRaiseVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%+" }))
-oxwm.key.bind({ }, "XF86AudioLowerVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%-" }))
+oxwm.key.bind({}, "XF86AudioMute", oxwm.spawn({ "wpctl set-mute @DEFAULT_SINK@ toggle" }))
+oxwm.key.bind({}, "XF86AudioRaiseVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%+" }))
+oxwm.key.bind({}, "XF86AudioLowerVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 3%-" }))
 oxwm.key.bind({ modkey }, "XF86AudioRaiseVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 10%+" }))
 oxwm.key.bind({ modkey }, "XF86AudioLowerVolume", oxwm.spawn({ "wpctl set-volume @DEFAULT_SINK@ 10%-" }))
 
-oxwm.key.bind({ }, "XF86MonBrightnessUp", oxwm.spawn({ "brightnessctl set +10%" }))
-oxwm.key.bind({ }, "XF86MonBrightnessDown", oxwm.spawn({ "brightnessctl set 10%-" }))
+oxwm.key.bind({}, "XF86MonBrightnessUp", oxwm.spawn({ "brightnessctl set +10%" }))
+oxwm.key.bind({}, "XF86MonBrightnessDown", oxwm.spawn({ "brightnessctl set 10%-" }))
 oxwm.key.bind({ modkey }, "XF86MonBrightnessUp", oxwm.spawn({ "brightnessctl set 100%" }))
-oxwm.key.bind({ modkey }, "XF86MonBrightnessDown", oxwm.spawn({ "brightnessctl set 10%" }))
+oxwm.key.bind({ modkey }, "XF86MonBrightnessDown", oxwm.spawn({ "brightnessctl set 0%" }))
 
 oxwm.key.bind({ modkey }, "1", oxwm.tag.view(0))
 oxwm.key.bind({ modkey }, "2", oxwm.tag.view(1))
@@ -175,22 +185,12 @@ oxwm.key.bind({ modkey, "Control", "Shift" }, "7", oxwm.tag.toggletag(6))
 oxwm.key.bind({ modkey, "Control", "Shift" }, "8", oxwm.tag.toggletag(7))
 oxwm.key.bind({ modkey, "Control", "Shift" }, "9", oxwm.tag.toggletag(8))
 
--------------------------------------------------------------------------------
--- Advanced: Keychords
--------------------------------------------------------------------------------
--- Keychords allow you to bind multiple-key sequences (like Emacs or Vim)
--- Format: {{modifiers}, key1}, {{modifiers}, key2}, ...
--- Example: Press Mod4+Space, then release and press T to spawn a terminal
--- oxwm.key.chord({
---     { { modkey }, "Space" },
---     { {},         "T" }
--- }, oxwm.spawn_terminal())
+oxwm.key.chord({
+	{ { modkey }, "R" },
+	{ {},         "C" }
+}, oxwm.spawn({ "$HOME/wpilib/2026/frccode/frccode2026" }))
 
-oxwm.autostart("export _JAVA_AWT_WM_NONREPARENTING=1")
-
-local walls = {
-	emacs = "emacsfield.png",
-	maxwell = "never_falter.png"
-}
-
-oxwm.autostart("xwallpaper --stretch $HOME/walls/" .. walls.emacs)
+oxwm.autostart("~/walls/set")
+oxwm.autostart("fastcompmgr")
+oxwm.autostart("gentoo-pipewire-launcher")
+oxwm.autostart("dunst")

walls/walls/set

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xwallpaper --stretch $(ls -1 $HOME/walls/*.png | shuf -n 1)

xinitrc/.xinitrc

@@ -0,0 +1,3 @@
+#!/bin/sh
+export _JAVA_AWT_WM_NONREPARENTING=1
+exec dbus-launch --exit-with-session oxwm

zsh/.zshrc

@@ -2,8 +2,9 @@ export TERM=xterm-256color
 
 export XDG_DOWNLOAD_DIR="$HOME/downloads"
 export XDG_PROJECTS_DIR="$HOME/programming"
+
 export XDG_DESKTOP_DIR="$HOME"
-export XDG_DOCUMENTS_DIR="$HOME/media"
+export XDG_DOCUMENTS_DIR="$HOME/documents"
 export XDG_MUSIC_DIR="$HOME/media"
 export XDG_PICTURES_DIR="$HOME/media"
 export XDG_PUBLICSHARE_DIR="$HOME/media"
@@ -15,60 +16,120 @@ export SUDO_EDITOR=nvim
 
 export GOPATH="$HOME/.local/go"
 
-export HISTSIZE=10000
-export SAVEHIST=10000
-export HISTFILE="$HOME/.cache/zsh/history"
-
-setopt append_history
-setopt inc_append_history
-setopt share_history
-setopt interactive_comments
-setopt autocd
-setopt auto_param_slash
-setopt dot_glob
-setopt extended_glob
-
-export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/opt/bin:$PATH"
+export PATH="$HOME/.local/bin:$HOME/.local/go/bin:$HOME/opt/bin:$HOME/.cargo/bin:$PATH"
 export LD_LIBRARY_PATH="$HOME/opt/lib:${LD_LIBRARY_PATH:-}"
 
-alias ls='ls --color=auto'
-alias ll='ls -lah'
-alias gg='lazygit'
-alias v='nvim'
-alias rr='russ read'
-alias cp='cp -v'
-alias sd='st -d "$(pwd)" > /dev/null 2>&1 & disown'
+ZAP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zap"
+[ -f "$ZAP_DIR/zap.zsh" ] && source "$ZAP_DIR/zap.zsh"
 
-take() {
-  mkdir -p -- "$1" && cd -- "$1"
-}
-
-bindkey -e
-
-autoload -Uz compinit colors
-autoload -U bashcompinit
-
-colors
-compinit
-bashcompinit
-
-PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
-
-if [ -f "$HOME/.zprofile" ]; then
-  source "$HOME/.zprofile"
-fi
+[ -f "$HOME/.zprofile" ] && source "$HOME/.zprofile"
 
 if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
   eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 fi
 
-ZAP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zap"
+HISTFILE="${ZDOTDIR:-$HOME}/.zsh_history"
+HISTSIZE=50000
+SAVEHIST=50000
 
-if [ -f "$ZAP_DIR/zap.zsh" ]; then
-  source "$ZAP_DIR/zap.zsh"
+setopt APPEND_HISTORY
+setopt INC_APPEND_HISTORY
+setopt SHARE_HISTORY
+
+setopt EXTENDED_HISTORY
+setopt BANG_HIST
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_IGNORE_DUPS
+setopt HIST_IGNORE_ALL_DUPS
+setopt HIST_FIND_NO_DUPS
+setopt HIST_IGNORE_SPACE
+setopt HIST_SAVE_NO_DUPS
+setopt HIST_REDUCE_BLANKS
+setopt HIST_VERIFY
+
+setopt AUTO_CD
+setopt AUTO_PARAM_SLASH
+setopt GLOB_DOTS
+setopt EXTENDED_GLOB
+setopt INTERACTIVE_COMMENTS
+setopt MENU_COMPLETE
+setopt NOMATCH
+unsetopt BEEP
+
+autoload -Uz compinit colors bashcompinit
+zmodload zsh/complist
+
+zstyle ':completion:*' menu yes select
+zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=*'
+_comp_options+=(globdots)
+zle_highlight=('paste:none')
+
+if [[ -f "${ZDOTDIR:-$HOME}/.zcompdump" ]]; then
+  compinit -C
+else
+  compinit
 fi
 
+bashcompinit
+
+autoload -Uz colors && colors
+PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
+
+bindkey -e
+bindkey -s '^x' '^usource $ZSHRC\n'
+bindkey -M menuselect '?' history-incremental-search-forward
+bindkey -M menuselect '/' history-incremental-search-backward
+bindkey '^H' backward-kill-word
+
+autoload -U up-line-or-beginning-search
+autoload -U down-line-or-beginning-search
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search
+
+alias cat='bat'
+alias gg='lazygit'
+alias v='nvim'
+alias cp='cp -v'
+
+take() {
+  mkdir -p -- "$1" && cd -- "$1"
+}
+
+copy() {
+	xclip -sel c 2>/dev/null
+}
+
+if (( $+commands[eza] )); then
+  alias ls='eza --group-directories-first --icons=auto'
+  if eza --version | grep -q '+git'; then
+    alias ll='ls -lh --git'
+  else
+    alias ll='ls -lh'
+  fi
+  alias la='ll -a'
+  alias tree='ll --tree --level=2'
+else
+  alias ls='ls --group-directories-first'
+  alias ll='ls -lh'
+  alias la='ll -a'
+fi
+
+if (( $+commands[zoxide] )); then
+	eval "$(zoxide init zsh)"
+fi
+
+if ! command -v zap >/dev/null 2>&1; then
+  printf 'Installing zap (release-v1)...\n'
+  zsh <(curl -s https://raw.githubusercontent.com/zap-zsh/zap/master/install.zsh) --keep --branch release-v1
+  if [ -f "${ZDOTDIR:-$HOME}/.zshrc" ]; then
+    source "${ZDOTDIR:-$HOME}/.zshrc"
+  fi
+fi
+
+autoload -Uz plug
 plug "zsh-users/zsh-autosuggestions"
 plug "zsh-users/zsh-syntax-highlighting"
-plug "zap-zsh/sudo"
 plug "Aloxaf/fzf-tab"
+
+: "${XDG_DATA_HOME:=$HOME/.local/share}"
+: "${XDG_CONFIG_HOME:=$HOME/.config}"