From 8722eadb45cc9433bb79459958312c121e8feef8 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 29 Apr 2022 10:37:55 -0500 Subject: [PATCH] many updates --- home/dot_zshrc | 1 + .../alacritty/alacritty.yml | 8 +- .../alacritty/catppuccin.yml | 37 +++++++++ home/private_dot_config/git/config | 5 ++ home/private_dot_config/leftwm/config.toml | 24 +++--- home/private_dot_config/lvim/config.lua | 12 +-- home/private_dot_config/lvim/lua/plugins.lua | 8 +- home/private_dot_config/starship/config.toml | 2 +- system/completions/_lsd | 81 +++++++++++++++++++ 9 files changed, 155 insertions(+), 23 deletions(-) create mode 100644 home/private_dot_config/alacritty/catppuccin.yml create mode 100644 system/completions/_lsd diff --git a/home/dot_zshrc b/home/dot_zshrc index 7a81854..d2bedd6 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -35,3 +35,4 @@ unset EXTRAFILE export DOTFILES_DIR DOTFILES_EXTRA_DIR +[ -f ~/.welcome ] && clear && cat ~/.welcome diff --git a/home/private_dot_config/alacritty/alacritty.yml b/home/private_dot_config/alacritty/alacritty.yml index 9060769..8bcb228 100644 --- a/home/private_dot_config/alacritty/alacritty.yml +++ b/home/private_dot_config/alacritty/alacritty.yml @@ -9,8 +9,8 @@ # All imports must either be absolute paths starting with `/`, or paths relative # to the user's home directory starting with `~/`. import: - - C:\Users\daylin\AppData\Roaming\alacritty\dracula-pro.yml - - ~/.config/alacritty/dracula-pro.yml + # - ~/.config/alacritty/dracula-pro.yml + - ~/.config/alacritty/catppuccin.yml # Any items in the `env` entry below will be added as # environment variables. Some entries may override variables @@ -175,7 +175,7 @@ font: #use_thin_strokes: true # If `true`, bold text is drawn using the bright color variants. -#draw_bold_text_with_bright_colors: false +draw_bold_text_with_bright_colors: true # Colors (Tomorrow Night) #colors: @@ -387,7 +387,7 @@ cursor: # - Off: Disable blinking by default # - On: Enable blinking by default # - Always: Force the cursor to always blink - blinking: on + blinking: Never # Vi mode cursor style # diff --git a/home/private_dot_config/alacritty/catppuccin.yml b/home/private_dot_config/alacritty/catppuccin.yml new file mode 100644 index 0000000..8e3c311 --- /dev/null +++ b/home/private_dot_config/alacritty/catppuccin.yml @@ -0,0 +1,37 @@ +# Catppuccin! +colors: + # Default colors + primary: + background: '0x1E1D2F' + foreground: '0xD9E0EE' + + # Colors the cursor will use if `custom_cursor_colors` is true + cursor: + text: '0x1E1D2F' + cursor: '0xF5E0DC' + + # Normal colors + normal: + black: '0x6E6C7E' + red: '0xF28FAD' + green: '0xABE9B3' + yellow: '0xFAE3B0' + blue: '0x96CDFB' + magenta: '0xF5C2E7' + cyan: '0x89DCEB' + white: '0xD9E0EE' + + # Bright colors + bright: + black: '0x988BA2' + red: '0xF28FAD' + green: '0xABE9B3' + yellow: '0xFAE3B0' + blue: '0x96CDFB' + magenta: '0xF5C2E7' + cyan: '0x89DCEB' + white: '0xD9E0EE' + + indexed_colors: + - { index: 16, color: '0xF8BD96' } + - { index: 17, color: '0xF5E0DC' } diff --git a/home/private_dot_config/git/config b/home/private_dot_config/git/config index a1f7354..ba7a136 100644 --- a/home/private_dot_config/git/config +++ b/home/private_dot_config/git/config @@ -15,3 +15,8 @@ autosetuprebase = always [alias] adog = log --all --decorate --oneline --graph +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true diff --git a/home/private_dot_config/leftwm/config.toml b/home/private_dot_config/leftwm/config.toml index b722a40..0304e56 100644 --- a/home/private_dot_config/leftwm/config.toml +++ b/home/private_dot_config/leftwm/config.toml @@ -2,17 +2,19 @@ modkey = "Mod4" mousekey = "Mod4" workspaces = [] tags = ["1", "2", "3", "4", "5", "6", "7", "8"] -# tags = ["", "", "", "", "", ""] layouts = ["MainAndVertStack", "Monocle", "EvenVertical", "CenterMainBalanced"] layout_mode = "Workspace" disable_current_tag_swap = false focus_behaviour = "Sloppy" focus_new_windows = true + ##################################### # Program Specific Settings ##################################### -## Rofi +# ------ +# Rofi +# ------ [[keybind]] command = "Execute" value = "~/.config/leftwm/themes/current/rofi/bin/launcher.sh" @@ -33,15 +35,10 @@ key = "k" [[keybind]] command = "Execute" -value = "~/.config/leftwm/themes/current/rofi/bin/rofi-screenshot" -modifier = ["modkey"] -key = "s" - -[[keybind]] -command = "Execute" -value = "~/.config/leftwm/themes/current/rofi/bin/rofi-screenshot" +value = "~/.config/leftwm/themes/current/rofi/bin/bluetooth.sh" modifier = ["modkey", "Shift"] -key = "s" +key = "b" + [[keybind]] command = "Execute" @@ -65,8 +62,13 @@ key = "l" command = "Execute" value = "flameshot gui" modifier = ["modkey"] -key = "y" +key = "s" +[[keybind]] +command = "Execute" +value = "flameshot screen -n 0" +modifier = ["modkey", "Shift"] +key = "s" [[scratchpad]] name = "Alacritty" # This is the name which is referenced when calling (case-sensitive) diff --git a/home/private_dot_config/lvim/config.lua b/home/private_dot_config/lvim/config.lua index 8f815df..a61b341 100644 --- a/home/private_dot_config/lvim/config.lua +++ b/home/private_dot_config/lvim/config.lua @@ -14,27 +14,27 @@ lvim.builtin.nvimtree.show_icons.git = 0 -- if you don't want all the parsers change this to a table of the ones you want lvim.builtin.treesitter.ensure_installed = { "bash", - "javascript", + -- "javascript", "json", "lua", "python", - "typescript", + -- "typescript", "css", - "rust", + -- "rust", "yaml", "go" } -lvim.builtin.treesitter.ignore_install = { "haskell" } lvim.builtin.treesitter.highlight.enabled = true -- colorscheme -lvim.builtin.lualine.options.theme = "dracula" -lvim.colorscheme = "dracula" +lvim.builtin.lualine.options.theme = "catppuccin" +lvim.colorscheme = "catppuccin" -- settings local opt = vim.opt opt.timeoutlen = 200 +opt.cmdheight = 1 lvim.autocommands.custom_groups = { -- On entering insert mode in any file, scroll the window so the cursor line is centered diff --git a/home/private_dot_config/lvim/lua/plugins.lua b/home/private_dot_config/lvim/lua/plugins.lua index ae65cb5..426fd7b 100644 --- a/home/private_dot_config/lvim/lua/plugins.lua +++ b/home/private_dot_config/lvim/lua/plugins.lua @@ -2,6 +2,12 @@ local p = function(name) return string.format("require'config.%s'", name) end -- extra plugins lvim.plugins = { + { 'chrisbra/Colorizer' }, + { + 'catppuccin/nvim', + as = 'catppuccin' + }, + { 'NoahTheDuke/vim-just' }, { 'Mofiqul/dracula.nvim' }, { 'ggandor/lightspeed.nvim' }, { 'elkowar/yuck.vim' }, @@ -38,7 +44,7 @@ lvim.plugins = { -- default plugins settings -- make telescope respect that hidden files exist -lvim.builtin.telescope.pickers = { find_files = { hidden = true }} +-- lvim.builtin.telescope.pickers = { find_files = { hidden = true }} lvim.builtin.nvimtree.setup.git.ignore = false lvim.builtin.dashboard.custom_header = { diff --git a/home/private_dot_config/starship/config.toml b/home/private_dot_config/starship/config.toml index 49cdbb8..917f931 100644 --- a/home/private_dot_config/starship/config.toml +++ b/home/private_dot_config/starship/config.toml @@ -2,7 +2,7 @@ format = "[$user]($style) on " [character] -success_symbol = "[❯](bold #8AFF80)[❯](bold #80FFEA)[❯](bold #FF80BF)" +success_symbol = "[❯](bold green)[❯](bold yellow)[❯](bold cyan)" error_symbol = "[✗](bold red) " [gcloud] diff --git a/system/completions/_lsd b/system/completions/_lsd new file mode 100644 index 0000000..ac12cec --- /dev/null +++ b/system/completions/_lsd @@ -0,0 +1,81 @@ +#compdef lsd + +autoload -U is-at-least + +_lsd() { + typeset -A opt_args + typeset -a _arguments_options + local ret=1 + + if is-at-least 5.2; then + _arguments_options=(-s -S -C) + else + _arguments_options=(-s -C) + fi + + local context curcontext="$curcontext" state line + _arguments "${_arguments_options[@]}" \ +'*--color=[When to use terminal colours]: :(always auto never)' \ +'*--icon=[When to print the icons]: :(always auto never)' \ +'*--icon-theme=[Whether to use fancy or unicode icons]: :(fancy unicode)' \ +'--config-file=[Provide a custom lsd configuration file]' \ +'*--depth=[Stop recursing into directories after reaching specified depth]' \ +'*--size=[How to display size]: :(default short bytes)' \ +'*--date=[How to display date \[possible values: date, relative, +date-time-format\]]' \ +'*--sort=[sort by WORD instead of name]: :(size time version extension)' \ +'*--group-dirs=[Sort the directories then the files]: :(none first last)' \ +'*--blocks=[Specify the blocks that will be displayed and in what order]: :(permission user group size date name inode links)' \ +'*-I+[Do not display files/directories with names matching the glob pattern(s). More than one can be specified by repeating the argument]' \ +'*--ignore-glob=[Do not display files/directories with names matching the glob pattern(s). More than one can be specified by repeating the argument]' \ +'*-a[Do not ignore entries starting with .]' \ +'*--all[Do not ignore entries starting with .]' \ +'*-A[Do not list implied . and ..]' \ +'*--almost-all[Do not list implied . and ..]' \ +'*-F[Append indicator (one of */=>@|) at the end of the file names]' \ +'*--classify[Append indicator (one of */=>@|) at the end of the file names]' \ +'*-l[Display extended file metadata as a table]' \ +'*--long[Display extended file metadata as a table]' \ +'--ignore-config[Ignore the configuration file]' \ +'*-1[Display one entry per line]' \ +'*--oneline[Display one entry per line]' \ +'(--tree)*-R[Recurse into directories]' \ +'(--tree)*--recursive[Recurse into directories]' \ +'*-h[For ls compatibility purposes ONLY, currently set by default]' \ +'*--human-readable[For ls compatibility purposes ONLY, currently set by default]' \ +'(-R --recursive)*--tree[Recurse into directories and present the result as a tree]' \ +'(--depth -R --recursive)-d[Display directories themselves, and not their contents (recursively when used with --tree)]' \ +'(--depth -R --recursive)--directory-only[Display directories themselves, and not their contents (recursively when used with --tree)]' \ +'*--total-size[Display the total size of directories]' \ +'*-t[Sort by time modified]' \ +'*--timesort[Sort by time modified]' \ +'*-S[Sort by size]' \ +'*--sizesort[Sort by size]' \ +'*-X[Sort by file extension]' \ +'*--extensionsort[Sort by file extension]' \ +'*-v[Natural sort of (version) numbers within text]' \ +'*--versionsort[Natural sort of (version) numbers within text]' \ +'*-r[Reverse the order of the sort]' \ +'*--reverse[Reverse the order of the sort]' \ +'--classic[Enable classic mode (display output similar to ls)]' \ +'*--no-symlink[Do not display symlink target]' \ +'*-i[Display the index number of each file]' \ +'*--inode[Display the index number of each file]' \ +'*-L[When showing file information for a symbolic link, show information for the file the link references rather than for the link itself]' \ +'*--dereference[When showing file information for a symbolic link, show information for the file the link references rather than for the link itself]' \ +'--help[Prints help information]' \ +'-V[Prints version information]' \ +'--version[Prints version information]' \ +'::FILE:_files' \ +&& ret=0 + +} + +(( $+functions[_lsd_commands] )) || +_lsd_commands() { + local commands; commands=( + + ) + _describe -t commands 'lsd commands' commands "$@" +} + +_lsd "$@" \ No newline at end of file