diff --git a/.dotter/global.toml b/.dotter/global.toml index 22bf9d9..c6b3ebd 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -1,13 +1,7 @@ [default.files] fish = "~/.config/fish/" -bspwm = "~/.config/bspwm/" -sxhkd = "~/.config/sxhkd/" -rofi = "~/.config/rofi/" -dunst = "~/.config/dunst/" kermit = "~/.config/kermit.conf" -polybar = "~/.config/polybar" -walls = "~/Pictures/walls" -utils = "~/.local/bin/185504a9-utils/" +utils = "~/.local/bin/dotutils/" ideavim = "~/.ideavimrc" -qutebrowser = "~/.config/qutebrowser" -chaakoo = "~/.config/chaakoo/" +astrovim = "~/.config/nvim/lua/user/" +vimrc = "~/.vimrc" diff --git a/astrovim/init.lua b/astrovim/init.lua new file mode 100644 index 0000000..bf254ad --- /dev/null +++ b/astrovim/init.lua @@ -0,0 +1,72 @@ +return { + updater = { + remote = "origin", -- remote to use + channel = "stable", -- "stable" or "nightly" + version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY) + branch = "nightly", -- branch name (NIGHTLY ONLY) + commit = nil, -- commit hash (NIGHTLY ONLY) + pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only) + skip_prompts = false, -- skip prompts about breaking changes + show_changelog = true, -- show the changelog after performing an update + auto_quit = false, -- automatically quit the current session after a successful update + remotes = { -- easily add new remotes to track + -- ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url + -- ["remote2"] = "github_user/repo", -- GitHub user/repo shortcut, + -- ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork + }, + }, + + colorscheme = "catppuccin", + + diagnostics = { + virtual_text = true, + underline = true, + }, + + lsp = { + formatting = { + format_on_save = { + enabled = true, + }, + timeout_ms = 1000, + }, + servers = { + "pyright" + }, + }, + + lazy = { + defaults = { lazy = true }, + }, + + plugins = { + { + "catppuccin/nvim", + as = "catppuccin", + config = function() + require("catppuccin").setup {} + end, + }, + }, + options = { + opt = { + conceallevel = 2, + relativenumber = true, + list = true, + listchars = { tab = "│→", extends = "⟩", precedes = "⟨", trail = "·", nbsp = "␣" }, + showbreak = "↪ ", + showtabline = 1, + wrap = true, + }, + g = { + icons_enabled = false, + mapleader = " ", + autoformat_enabled = true, + cmp_enabled = true, + autopairs_enabled = true, + diagnostics_enabled = true, + status_diagnostics_enabled = true, + }, + } +} + diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc index 9eab209..9716deb 100755 --- a/bspwm/bspwmrc +++ b/bspwm/bspwmrc @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh #### #### misc tools @@ -22,7 +22,7 @@ bspc monitor -d HDMI-2 5 6 7 8 9 #### bspwm #### -#~/.builds/bin/set-monitors.sh +set-monitors.sh bspc config border_width 5 bspc config window_gap 8 diff --git a/chaakoo/sls_offline.yml b/chaakoo/sls_offline.yml deleted file mode 100644 index fe13792..0000000 --- a/chaakoo/sls_offline.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: sls-offline -windows: - - grid: | - term term - sls-start docs-serve - name: window1 - commands: - - pane: term - command: | - source .venv/bin/activate.fish - source ../.env-prod.fish - set -x AWS_DEFAULT_REGION "eu-west-1" - clear - workdir: /home/catalin/dev/ceco/valexa - - pane: sls-start - command: | - source ../.env-prod.fish - make sls-stop - make sls-start - make sls-flog - workdir: /home/catalin/dev/ceco/valexa - - pane: docs-serve - command: | - source .venv/bin/activate.fish - make docs-serve - workdir: /home/catalin/dev/ceco/valexa diff --git a/dunst/dunstrc b/dunst/dunstrc deleted file mode 100644 index 7f92ab7..0000000 --- a/dunst/dunstrc +++ /dev/null @@ -1,54 +0,0 @@ -[global] -monitor = 0 -follow = mouse -geometry = "300x60-20+48" -indicate_hidden = yes -shrink = no -separator_height = 0 -padding = 32 -horizontal_padding = 32 -frame_width = 2 -sort = no -idle_threshold = 120 -font = rissole 8 -line_height = 4 -markup = full -format = %s\n%b -alignment = left -show_age_threshold = 60 -word_wrap = yes -ignore_newline = no -stack_duplicates = false -hide_duplicate_count = yes -show_indicators = no -icon_position = off -sticky_history = yes -history_length = 20 -browser = /usr/bin/firefox -new-tab -always_run_script = true -title = Dunst -class = Dunst - -[shortcuts] -close = ctrl+space -close_all = ctrl+shift+space -history = ctrl+grave -context = ctrl+shift+period - -[urgency_low] -timeout = 4 -background = "#141c21" -foreground = "#93a1a1" -frame_color = "#8bc34a" - -[urgency_normal] -timeout = 8 -background = "#141c21" -foreground = "#93a1a1" -frame_color = "#ba68c8" - -[urgency_critical] -timeout = 0 -background = "#141c21" -foreground = "#93a1a1" -frame_color = "#ff7043" diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish index 5bacafa..ceb5ba7 100644 --- a/fish/conf.d/aliases.fish +++ b/fish/conf.d/aliases.fish @@ -1,4 +1,7 @@ alias ls 'exa -alh' -alias cat 'batcat' alias g 'git' +alias copy 'xclip -selection clipboard' +alias cat 'bat' +alias k 'kubectl' alias rm 'trash' +alias future-commit 'git commit --date (echo (date -d +7hours))' diff --git a/fish/conf.d/common.fish b/fish/conf.d/common.fish index bc6fd5d..46d8f4f 100644 --- a/fish/conf.d/common.fish +++ b/fish/conf.d/common.fish @@ -1,2 +1,4 @@ -set -gx EDITOR vim +set -gx EDITOR nvim +set -gx BAT_THEME "Catppuccin-frappe" +pyenv init - | source diff --git a/fish/conf.d/envsource.fish b/fish/conf.d/envsource.fish new file mode 100644 index 0000000..af570e4 --- /dev/null +++ b/fish/conf.d/envsource.fish @@ -0,0 +1,7 @@ +function envsource + for line in (cat $argv | grep -v '^#') + set item (string split -m 1 '=' $line) + set -gx $item[1] $item[2] + echo "Exported key $item[1]" + end +end diff --git a/fish/conf.d/paths.fish b/fish/conf.d/paths.fish index 000fe48..cd6d06d 100644 --- a/fish/conf.d/paths.fish +++ b/fish/conf.d/paths.fish @@ -1,8 +1,7 @@ set -gx PATH ~/.local/bin $PATH -set -gx PATH ~/.local/bin/185504a9-utils/ $PATH +set -gx PATH ~/.local/bin/dotutils/ $PATH +set -gx PATH "$HOME/.cargo/bin" $PATH; set -gx PATH $ANDROID_HOME/emulator $PATH set -gx PATH $ANDROID_HOME/tools $PATH set -gx PATH $ANDROID_HOME/tools/bin $PATH set -gx PATH $ANDROID_HOME/platform-tools $PATH - - diff --git a/fish/conf.d/rust.fish b/fish/conf.d/rust.fish deleted file mode 100644 index 98d36e9..0000000 --- a/fish/conf.d/rust.fish +++ /dev/null @@ -1 +0,0 @@ -set -gx PATH "$HOME/.cargo/bin" $PATH; diff --git a/greenclip.toml b/greenclip.toml index 72c220d..5346073 100644 --- a/greenclip.toml +++ b/greenclip.toml @@ -1,5 +1,5 @@ [greenclip] - history_file = "/home/erebe/.cache/greenclip.history" + history_file = "~/.cache/greenclip.history" max_history_length = 50 max_selection_size_bytes = 0 trim_space_from_selection = true diff --git a/polybar/config b/polybar/config deleted file mode 100644 index c070b67..0000000 --- a/polybar/config +++ /dev/null @@ -1,200 +0,0 @@ -[colors] - -background = ${xrdb:color0:#222} -color1 = ${xrdb:color2} -color2 = ${xrdb:color4} -color3 = ${xrdb:color6} - -; _ -; | |__ __ _ _ __ ___ -; | '_ \ / _` | '__/ __| -; | |_) | (_| | | \__ \ -; |_.__/ \__,_|_| |___/ - -[bar/base] -enable-ipc = true -font-0=cherry:size=14;3 -font-1=FontAwesome5Free:style=Regular:pixelsize=8:antialias=true;2 -font-2=FontAwesome5Free:style=Solid:pixelsize=8:antialias=true;2 -font-3=IPAGothic:style=Regular:size=11:antialias=true;3 - -bottom = true -border-size = 0 -border-color = ${self.foreground} - -height = 50 - -background = ${colors.background} -override-redirect=false -offset-y = 10 - -wm-restack = bspwm - -[bar/ws] -inherit = bar/base -width = 36% -bottom = true - -foreground = ${colors.color1} - -offset-x = 10 - -; bspwm -modules-left = bspwm xwindow -scroll-up = bspwm-desknext -scroll-down = bspwm-deskprev - - -[bar/music] -inherit = bar/base -enable-ipc = true -width = 32% - -foreground = ${colors.color2} -offset-x = 50.7% - -modules-left = battery -modules-right= network -padding = 10 - -[bar/tray] -inherit = bar/base -width = 16.2% - -offset-x = 83.3% -foreground = ${colors.color3} - -;tray-position = right - -modules-left = pulseaudio time power - -[bar/dummy] -height = 60 -background = #0000 -modules-center = dummy-module -override-redirect = false -bottom = true - -; _ _ -; _ __ ___ ___ __| |_ _| | ___ ___ -; | '_ ` _ \ / _ \ / _` | | | | |/ _ \/ __| -; | | | | | | (_) | (_| | |_| | | __/\__ \ -; |_| |_| |_|\___/ \__,_|\__,_|_|\___||___/ - -[module/wsnumber] -type = custom/script -exec = ~/.config/polybar/get_workspace -tail = true -interval = 0 -format-padding = 0 -format = "