From d78e6c923cf3f53b9ece0a42ffc396b822f0f986 Mon Sep 17 00:00:00 2001 From: Leon Date: Tue, 14 Mar 2023 11:24:59 +0100 Subject: [PATCH] Re-set up laptop --- alacritty/.config/alacritty/alacritty.yml | 3 +- foot/.config/foot/foot.ini | 186 ++++++++++++++++++++++ nvim/.config/nvim/fnl/dots/plugins.fnl | 4 +- nvim/.config/nvim/lazy-lock.json | 2 +- sway/.config/sway/config | 2 +- zsh/.config/zsh/.gitignore | 1 + zsh/.config/zsh/prompt.zsh | 10 +- zsh/.zshenv | 3 +- 8 files changed, 200 insertions(+), 11 deletions(-) create mode 100644 foot/.config/foot/foot.ini diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 0835a55..ac2b4cd 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -29,7 +29,8 @@ cursor: blinking: "Never" unfocused_hollow: true font: - normal: { "family": "Fira Code Nerd Font" } + normal: { "family": "Fira Code" } + #normal: { "family": "Fira Code Nerd Font" } #normal: { "family": "APL 385 Unicode" } #normal: { "family": "Jetbrains Mono" } #normal: { "family": "Victor Mono" } diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini new file mode 100644 index 0000000..ccbcd18 --- /dev/null +++ b/foot/.config/foot/foot.ini @@ -0,0 +1,186 @@ +# -*- conf -*- + +# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) +# term=foot (or xterm-256color if built with -Dterminfo=disabled) +# login-shell=no + +# app-id=foot +# title=foot +# locked-title=no + +font=Fira Code:size=8 +# font-bold= +# font-italic= +# font-bold-italic= +# font-size-adjustment=0.5 +# line-height= +# letter-spacing=0 +# horizontal-letter-offset=0 +# vertical-letter-offset=0 +# underline-offset= +# underline-thickness= +# box-drawings-uses-font-glyphs=no +# dpi-aware=auto + +# initial-window-size-pixels=700x500 # Or, +# initial-window-size-chars= +# initial-window-mode=windowed +pad=15x15 # optionally append 'center' +# resize-delay-ms=100 + +# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} + +# bold-text-in-bright=no +# word-delimiters=,│`|:"'()[]{}<> +# selection-target=primary +# workers= +# utempter=/usr/lib/utempter/utempter + +[environment] +# name=value + +[bell] +urgent=no +notify=no +command-focused=no + +[scrollback] +lines=100000 +# multiplier=3.0 +# indicator-position=relative +# indicator-format="" + +[url] +# launch=xdg-open ${url} +# label-letters=sadfjklewcmpgh +# osc8-underline=url-mode +# protocols=http, https, ftp, ftps, file, gemini, gopher +# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[] + +[cursor] +style=block +# color= +# blink=no +# beam-thickness=1.5 +# underline-thickness= + +[mouse] +hide-when-typing=yes +# alternate-scroll-mode=yes + +[colors] +background=282828 +foreground=ebdbb2 +regular0=282828 +regular1=cc241d +regular2=98971a +regular3=d79921 +regular4=458588 +regular5=b16286 +regular6=689d6a +regular7=a89984 +bright0=928374 +bright1=fb4934 +bright2=b8bb26 +bright3=fabd2f +bright4=83a598 +bright5=d3869b +bright6=8ec07c +bright7=ebdbb2 +# alpha=1.0 +# background=002b36 +# foreground=839496 + + +## Misc colors +# selection-foreground= +# selection-background= +# jump-labels= # black-on-yellow +# scrollback-indicator= # black-on-bright-blue +# search-box-no-match= # black-on-red +# search-box-match= # black-on-yellow +# urls= + +[csd] +# preferred=server +# size=26 +# font= +# color= +# hide-when-typing=no +# border-width=0 +# border-color= +# button-width=26 +# button-color= +# button-minimize-color= +# button-maximize-color= +# button-close-color= + +[key-bindings] +# scrollback-up-page=Shift+Page_Up +# scrollback-up-half-page=none +# scrollback-up-line=none +# scrollback-down-page=Shift+Page_Down +# scrollback-down-half-page=none +# scrollback-down-line=none +# clipboard-copy=Control+Shift+c XF86Copy +# clipboard-paste=Control+Shift+v XF86Paste +# primary-paste=Shift+Insert +# search-start=Control+Shift+r +# font-increase=Control+plus Control+equal Control+KP_Add +# font-decrease=Control+minus Control+KP_Subtract +# font-reset=Control+0 Control+KP_0 +# spawn-terminal=Control+Shift+n +# minimize=none +# maximize=none +# fullscreen=none +# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none +# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none +# pipe-selected=[xargs -r firefox] none +# show-urls-launch=Control+Shift+u +# show-urls-copy=none +# show-urls-persistent=none +# prompt-prev=Control+Shift+z +# prompt-next=Control+Shift+x +# unicode-input=none +# noop=none + +[search-bindings] +# cancel=Control+g Control+c Escape +# commit=Return +# find-prev=Control+r +# find-next=Control+s +# cursor-left=Left Control+b +# cursor-left-word=Control+Left Mod1+b +# cursor-right=Right Control+f +# cursor-right-word=Control+Right Mod1+f +# cursor-home=Home Control+a +# cursor-end=End Control+e +# delete-prev=BackSpace +# delete-prev-word=Mod1+BackSpace Control+BackSpace +# delete-next=Delete +# delete-next-word=Mod1+d Control+Delete +# extend-to-word-boundary=Control+w +# extend-to-next-whitespace=Control+Shift+w +# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste +# primary-paste=Shift+Insert +# unicode-input=none + +[url-bindings] +# cancel=Control+g Control+c Control+d Escape +# toggle-url-visible=t + +[text-bindings] +# \x03=Mod4+c # Map Super+c -> Ctrl+c + +[mouse-bindings] +# selection-override-modifiers=Shift +# primary-paste=BTN_MIDDLE +# select-begin=BTN_LEFT +# select-begin-block=Control+BTN_LEFT +# select-extend=BTN_RIGHT +# select-extend-character-wise=Control+BTN_RIGHT +# select-word=BTN_LEFT-2 +# select-word-whitespace=Control+BTN_LEFT-2 +# select-row=BTN_LEFT-3 + +# vim: ft=dosini diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl index a5236e2..3a23009 100644 --- a/nvim/.config/nvim/fnl/dots/plugins.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins.fnl @@ -44,8 +44,8 @@ :kyazdani42/nvim-web-devicons {} :folke/which-key.nvim {} :folke/todo-comments.nvim {:lazy true - :event "VeryLazy - ":config #(require "dots.plugins.todo-comments")} + :event "VeryLazy" + :config #(require "dots.plugins.todo-comments")} :Famiu/feline.nvim {:config #(require "dots.plugins.feline")} :akinsho/nvim-bufferline.lua {:config #(require "dots.plugins.bufferline") diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index b027bfb..f9fae19 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -35,7 +35,7 @@ "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" }, "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" }, "lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" }, - "lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" }, + "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" }, "lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" }, "neoformat": { "branch": "master", "commit": "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81" }, diff --git a/sway/.config/sway/config b/sway/.config/sway/config index 457e0ac..c024cb1 100644 --- a/sway/.config/sway/config +++ b/sway/.config/sway/config @@ -24,7 +24,7 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec -- ### Output configuration # # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -output * bg /home/leon/Pictures/wallpapers/0126.jpg fill +#output * bg /home/leon/Pictures/wallpapers/0126.jpg fill # # Example configuration: # diff --git a/zsh/.config/zsh/.gitignore b/zsh/.config/zsh/.gitignore index 10fcbd2..7d821c3 100644 --- a/zsh/.config/zsh/.gitignore +++ b/zsh/.config/zsh/.gitignore @@ -1,2 +1,3 @@ .zcompdump +.zcompcache *.zwc diff --git a/zsh/.config/zsh/prompt.zsh b/zsh/.config/zsh/prompt.zsh index 48167c2..30e7d78 100644 --- a/zsh/.config/zsh/prompt.zsh +++ b/zsh/.config/zsh/prompt.zsh @@ -4,6 +4,7 @@ local __bright_cyan="#8ec07c" local __bright_white="#ebdbb2" local __bright_green="#b8bb26" +local CUTOFF=3 # black magic that reruns prompt whenever the vi mode changes {{{ function zle-line-init zle-keymap-select { @@ -19,10 +20,9 @@ zle -N zle-keymap-select -dir() { - local CUTOFF=3 +function get_dir() { local IFS=/ - local my_path=($(print -P '%~')) + local my_path=$(print -P '%~') local p for p in $my_path; do printf %s "${s}${p[0,$CUTOFF]}" @@ -32,7 +32,7 @@ dir() { } -git_status() { +function git_status() { local BRANCH=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/*\s*\(.*\)/\1/') if [ ! -z $BRANCH ]; then @@ -48,7 +48,7 @@ function _my_prompt() { #echo -n "%F{$__bright_white}╭───" echo -n "%F{$__bright_cyan}$USER" echo -n "%F{$__bright_white} in" - echo -n "%F{$__bright_green} $(dir)" + echo -n "%F{$__bright_green} $(get_dir)" echo -n "%F{$__bright_white} $(git_status)" if [ ! "$exit_code" = 0 ]; then echo -n "%F{red} REEEEEEEEEEE $exit_code" diff --git a/zsh/.zshenv b/zsh/.zshenv index 631a27a..8f1cd0e 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,2 +1,3 @@ ZDOTDIR=$HOME/.config/zsh -. "$HOME/.cargo/env" + +[ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env"