diff --git a/.config/btop/btop.conf b/.config/btop/btop.conf
index 55c5a06..7201b1d 100644
--- a/.config/btop/btop.conf
+++ b/.config/btop/btop.conf
@@ -50,20 +50,20 @@ graph_symbol_net = "default"
graph_symbol_proc = "default"
#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
-shown_boxes = "cpu"
+shown_boxes = "cpu proc"
#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
update_ms = 1000
#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "memory"
+proc_sorting = "cpu lazy"
#* Reverse sorting order, True or False.
proc_reversed = False
#* Show processes as a tree.
-proc_tree = True
+proc_tree = False
#* Use the cpu graph colors in the process list.
proc_colors = True
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
new file mode 100644
index 0000000..459d3b8
--- /dev/null
+++ b/.config/dunst/dunstrc
@@ -0,0 +1,316 @@
+[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 = mouse
+
+ # The geometry of the window:
+ # [{width}]x{height}[+/-{x}+/-{y}]
+ # The geometry of the message window.
+ # The height is measured in number of notifications everything else
+ # in pixels. If the width is omitted but the height is given
+ # ("-geometry x2"), the message window expands over the whole screen
+ # (dmenu-like). If width is 0, the window expands to the longest
+ # message displayed. A positive x is measured from the left, a
+ # negative from the right side of the screen. Y is measured from
+ # the top and down respectively.
+ # The width can be negative. In this case the actual width is the
+ # screen width minus the width defined in within the geometry option.
+ geometry = "350x7-13+32"
+
+ # Show how many messages are currently hidden (because of geometry).
+ indicate_hidden = yes
+
+ # Shrink window if it's smaller than the width. Will be ignored if
+ # width is 0.
+ shrink = no
+
+ # 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.).
+ transparency = 1
+
+ # The height of the entire notification. If the height is smaller
+ # than the font height and padding combined, it will be raised
+ # to the font height and padding.
+ notification_height = 0
+
+ # Draw a line of "separator_height" pixel height between two
+ # notifications.
+ # Set to 0 to disable.
+ separator_height = 2
+
+ # Padding between text and separator.
+ padding = 8
+
+ # Horizontal padding.
+ horizontal_padding = 8
+
+ # Defines width in pixels of frame around the notification window.
+ # Set to 0 to disable.
+ frame_width = 2
+
+ # Defines color of the frame around the notification window.
+ frame_color = "#5E81AC"
+
+ # 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 messages by urgency.
+ 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.
+ idle_threshold = 200
+
+ ### Text ###
+
+ font = SF Pro Display 11
+
+ # The spacing between lines. If the height is smaller than the
+ # font height, it will get raised to the font height.
+ line_height = 1
+
+ # Possible values are:
+ # full: Allow a small subset of html markup in notifications:
+ # bold
+ # italic
+ # strikethrough
+ # underline
+ #
+ # For a complete reference see
+ # .
+ #
+ # 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 = yes
+
+ # 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
+ # Markup is allowed
+ #format = "%s\n%b"
+ format = "%s %p\n%b\n%p"
+
+ # Alignment of message text.
+ # Possible values are "left", "center" and "right".
+ alignment = center
+
+ # Show age of message if message is older than show_age_threshold
+ # seconds.
+ # Set to -1 to disable.
+ show_age_threshold = 60
+
+ # Split notifications into multiple lines if they don't fit into
+ # geometry.
+ word_wrap = yes
+
+ # Ignore newlines '\n' in notifications.
+ ignore_newline = no
+
+ ellipsize = middle
+
+ # Merge multiple notifications with the same content
+ stack_duplicates = true
+
+ # Hide the count of merged notifications with the same content
+ hide_duplicate_count = false
+
+ # Display indicators for URLs (U) and actions (A).
+ show_indicators = yes
+
+ ### Icons ###
+
+ # Align icons left/right/off
+ icon_position = left
+
+ # Scale larger icons down to this size, set to 0 to disable
+ max_icon_size = 32
+
+ # Paths to default icons.
+ icon_path = /usr/share/icons/Papirus-Dark/16x16/status/:/usr/share/icons/Papirus-Dark/16x16/devices/
+
+ # 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 = 20
+
+ ### Misc/Advanced ###
+
+ # dmenu path.
+ dmenu = /usr/bin/dmenu -p dunst:
+
+ # Browser for opening urls in context menu.
+ browser = /usr/bin/brave
+
+ # Always run rule-defined scripts, even if the notification is suppressed
+ always_run_script = true
+
+ # Define the title of the windows spawned by dunst
+ title = Dunst
+
+ # Define the class of the windows spawned by dunst
+ class = Dunst
+
+ # Print a notification on startup.
+ # This is mainly for error detection, since dbus (re-)starts dunst
+ # automatically after a crash.
+ startup_notification = 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
+
+# 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
+
+[shortcuts]
+
+ # Shortcuts are specified as [modifier+][modifier+]...key
+ # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
+ # "mod3" and "mod4" (windows-key).
+ # Xev might be helpful to find names for keys.
+
+ # Close notification.
+ close = ctrl+space
+
+ # Close all notifications.
+ close_all = ctrl+shift+space
+
+ # Redisplay last message(s).
+ # On the US keyboard layout "grave" is normally above TAB and left
+ # of "1". Make sure this key actually exists on your keyboard layout,
+ # e.g. check output of 'xmodmap -pke'
+ history = ctrl+mod1+j
+
+
+[urgency_low]
+ msg_urgency = low
+ background = "#2E344090"
+ foreground = "#D8DEE9"
+ timeout= 4
+
+[urgency_normal]
+ msg_urgency = normal
+ background = "#3B425299"
+ foreground = "#E5E9F0"
+ timeout = 4
+
+[urgency_critical]
+ msg_urgency = critical
+ background = "#2E344099"
+ foreground = "#D08770"
+ timeout = 0
+
+
+# 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", "summary", "body", "icon", "category",
+# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
+# "background", "new_icon" and "format".
+# Shell-like globbing will get expanded.
+#
+# 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: if you don't want a notification to be displayed, set the format
+# to "".
+# NOTE: It might be helpful to run dunst -print in a terminal in order
+# to find fitting options for rules.
+
+#[espeak]
+# summary = "*"
+# script = dunst_espeak.sh
+
+#[script-test]
+# summary = "*script*"
+# script = dunst_test.sh
+
+#[ignore]
+# # This notification will not be displayed
+# summary = "foobar"
+# format = ""
+
+#[history-ignore]
+# # This notification will not be saved in history
+# summary = "foobar"
+# history_ignore = 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
+#
+
+# vim: ft=cfg
+
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 0b79290..a1d0be9 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -10,3 +10,5 @@ fx --comp fish | source
zoxide init fish | source
fzf --fish | source
+
+syncthing install-completions | source
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index dc66287..0e3cde5 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -2,7 +2,7 @@ map ctrl+c copy_to_clipboard
map ctrl+v paste_from_clipboard
map ctrl+shift+c send_text all \x03
map ctrl+shift+s show_scrollback
-font_size 13.0
+font_size 12.0
font_family 0xProto Nerd Font Mono
touch_scroll_multiplier 5.0
scrollback_pager ~/.scripts/pager.sh +INPUT_LINE_NUMBER +CURSOR_LINE +CURSOR_COLUMN
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 02b14d2..47556bd 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -157,6 +157,8 @@ vim.opt.cursorline = true
-- Minimal number of screen lines to keep above and below the cursor.
vim.opt.scrolloff = 10
+vim.opt.tabstop = 2
+vim.opt.shiftwidth = 2
-- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()`
@@ -186,8 +188,10 @@ vim.keymap.set("n", "q", vim.diagnostic.setloclist, { desc = "Open diagn
vim.keymap.set("t", "", "", { desc = "Exit terminal mode" })
-- TIP: Disable arrow keys in normal mode
--- vim.keymap.set('n', '', 'echo "Use h to move!!"') vim.keymap.set('n', '', 'echo "Use l to move!!"') vim.keymap.set('n', '', 'echo "Use k to move!!"')
--- vim.keymap.set('n', '', 'echo "Use j to move!!"')
+vim.keymap.set("n", "", 'echo "Use h to move!!"')
+vim.keymap.set("n", "", 'echo "Use l to move!!"')
+vim.keymap.set("n", "", 'echo "Use k to move!!"')
+vim.keymap.set("n", "", 'echo "Use j to move!!"')
-- Keybinds to make split navigation easier.
-- Use CTRL+ to switch between windows
@@ -596,7 +600,29 @@ require("lazy").setup({
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
local servers = {
-- clangd = {},
- gopls = {},
+ gopls = {
+ init_options = {
+ usePlaceholders = true,
+ },
+ settings = {
+ gopls = {
+ allExperiments = true,
+ usePlaceholders = true,
+ analyses = {
+ nilness = true,
+ unusedparams = true,
+ shadow = true,
+ },
+ staticcheck = true,
+ },
+ },
+ flags = {
+ debounce_text_changes = 150,
+ },
+ cmd = { "gopls" },
+ filetypes = { "go", "gomod", "gotmpl" },
+ single_file_support = true,
+ },
-- pyright = {},
-- rust_analyzer = {},
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
@@ -718,12 +744,12 @@ require("lazy").setup({
-- `friendly-snippets` contains a variety of premade snippets.
-- See the README about individual language/framework/plugin snippets:
-- https://github.com/rafamadriz/friendly-snippets
- -- {
- -- 'rafamadriz/friendly-snippets',
- -- config = function()
- -- require('luasnip.loaders.from_vscode').lazy_load()
- -- end,
- -- },
+ {
+ "rafamadriz/friendly-snippets",
+ config = function()
+ require("luasnip.loaders.from_vscode").lazy_load()
+ end,
+ },
},
},
"saadparwaiz1/cmp_luasnip",
@@ -769,14 +795,13 @@ require("lazy").setup({
-- If you prefer more traditional completion keymaps,
-- you can uncomment the following lines
- --[''] = cmp.mapping.confirm { select = true },
- --[''] = cmp.mapping.select_next_item(),
- --[''] = cmp.mapping.select_prev_item(),
+ [""] = cmp.mapping.confirm { select = true },
+ [""] = cmp.mapping.select_next_item(),
+ [""] = cmp.mapping.select_prev_item(),
-- Manually trigger a completion from nvim-cmp.
-- Generally you don't need this, because nvim-cmp will display
-- completions whenever it has completion options available.
[""] = cmp.mapping.complete {},
-
-- Think of as moving to the right of your snippet expansion.
-- So if you have a snippet that's like:
-- function $name($args)
@@ -905,6 +930,15 @@ require("lazy").setup({
additional_vim_regex_highlighting = { "ruby" },
},
indent = { enable = true, disable = { "ruby" } },
+ incremental_selection = {
+ enable = true,
+ keymaps = {
+ init_selection = "gnn",
+ node_incremental = "grn",
+ scope_incremental = "grc",
+ node_decremental = "grm",
+ },
+ },
},
-- There are additional nvim-treesitter modules that you can use to interact
-- with nvim-treesitter. You should go explore a few and see what interests you:
diff --git a/.config/sway/config b/.config/sway/config
index 6c43460..9976b86 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -9,13 +9,13 @@ client.unfocused #88c0d0 #2e3440 #d8dee9 #4c566a #4c566a
client.urgent #ebcb8b #ebcb8b #2e3440 #8fbcbb #ebcb8b
workspace_layout default
-default_border normal
-default_floating_border none
-font pango:monospace 0.001
-titlebar_padding 1
-titlebar_border_thickness 1
-smart_borders off
-gaps inner 10
+# default_border normal
+# default_floating_border none
+# font pango:monospace 0.001
+# titlebar_padding 1
+# titlebar_border_thickness 1
+# smart_borders off
+# gaps inner 5
for_window [app_id="kitty_shell"] floating enable, move center
@@ -228,6 +228,8 @@ bindsym $mod+r mode "resize"
### Autostart
#
+
+exec syncthing serve
exec swaylock
exec tuxedo-control-center --tray
workspace 3
diff --git a/.config/waybar/config b/.config/waybar/config
index c351702..0c13e14 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,77 +1,105 @@
{
- "height": 35,
- "modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
- "modules-center": [],
- "modules-right": ["pulseaudio", "backlight", "network", "cpu", "memory", "battery", "clock", "tray", "sway/language", "keyboard-state"],
- "sway/mode": {
- "format": "{}"
+ "height": 35,
+ "modules-left": [
+ "sway/workspaces",
+ "sway/mode",
+ "sway/window"
+ ],
+ "modules-center": [],
+ "modules-right": [
+ "idle_inhibitor",
+ "pulseaudio",
+ "backlight",
+ "network",
+ //"cpu",
+ // "memory",
+ "battery",
+ "clock",
+ "tray",
+ "sway/language",
+ "keyboard-state",
+ ],
+ "sway/mode": {
+ "format": "{}"
+ },
+ "sway/window": {
+ "max-length": 50
+ },
+ "tray": {
+ "spacing": 10
+ },
+ "clock": {
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format": " {:%Y-%m-%d %H:%M}"
+ },
+ "cpu": {
+ "format": " {usage}%",
+ "tooltip": false
+ },
+ "memory": {
+ "format": " {}%"
+ },
+ "backlight": {
+ "format": "{icon} {percent}%",
+ "format-icons": [
+ "",
+ ""
+ ]
+ },
+ "battery": {
+ "states": {
+ "warning": 30,
+ "critical": 15
},
- "sway/window": {
- "max-length": 50
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-plugged": " {capacity}%",
+ "format-alt": "{time} {icon}",
+ "format-icons": [
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ "network": {
+ "format-wifi": " ({signalStrength}%)",
+ "format-ethernet": " {ipaddr}",
+ "format-linked": " {ifname} (No IP)",
+ "format-disconnected": "⚠ Disconnected"
+ },
+ "pulseaudio": {
+ "format": "{icon} {volume}% {format_source}",
+ "format-bluetooth": "{volume}% {icon} {format_source}",
+ "format-bluetooth-muted": " {icon} {format_source}",
+ "format-muted": " {format_source}",
+ "format-source": " {volume}%",
+ "format-source-muted": "",
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": [
+ "",
+ "",
+ ""
+ ]
},
- "tray": {
- // "icon-size": 21,
- "spacing": 10
- },
- "clock": {
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format": " {:%Y-%m-%d %H:%M}"
- },
- "cpu": {
- "format": " {usage}%",
- "tooltip": false
- },
- "memory": {
- "format": " {}%"
- },
- "backlight": {
- // "device": "acpi_video1",
- "format": "{icon} {percent}%",
- "format-icons": ["", ""]
- },
- "battery": {
- "states": {
- // "good": 95,
- "warning": 30,
- "critical": 15
- },
- "format": "{icon} {capacity}%",
- "format-charging": " {capacity}%",
- "format-plugged": " {capacity}%",
- "format-alt": "{time} {icon}",
- // "format-good": "", // An empty format will hide the module
- // "format-full": "",
- "format-icons": ["", "", "", "", ""]
- },
- "network": {
- // "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": " ({signalStrength}%)",
- // "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
- "format-ethernet": " {ipaddr}",
- "format-linked": " {ifname} (No IP)",
- "format-disconnected": "⚠ Disconnected"
- },
- "pulseaudio": {
- // "scroll-step": 1, // %, can be a float
- "format": "{icon} {volume}% {format_source}",
- "format-bluetooth": "{volume}% {icon} {format_source}",
- "format-bluetooth-muted": " {icon} {format_source}",
- "format-muted": " {format_source}",
- "format-source": " {volume}%",
- "format-source-muted": "",
- "format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""]
- },
- "on-click": "pavucontrol"
- },
- "sway/language": {
- "format": "{flag}",
- "on-click": "swaymsg input type:keyboard xkb_switch_layout next",
+ "on-click": "pavucontrol"
+ },
+ "sway/language": {
+ "format": "{flag}",
+ "on-click": "swaymsg input type:keyboard xkb_switch_layout next"
+ },
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
}
+ }
}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index f22159b..5a505a1 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -45,6 +45,7 @@ window {
/*
* Right part
*/
+#idle_inhibitor,
#pulseaudio,
#network,
#cpu,
@@ -60,6 +61,7 @@ window {
color: @nord6;
}
+#idle_inhibitor,
#backlight,
#language,
#battery,
@@ -70,6 +72,7 @@ window {
border-bottom-right-radius: 5px;
}
+#idle_inhibitor,
#pulseaudio,
#network,
#clock,
@@ -78,6 +81,10 @@ window {
border-bottom-left-radius: 5px;
}
+#idle_inhibitor.activated {
+ background-color: @nord10;
+}
+
#pulseaudio.muted {
background-color: @nord13;
color: @nord3;