Updated config

This commit is contained in:
Eduard Urbach 2024-02-01 20:59:19 +01:00
parent 8998a54e82
commit 973894cfab
Signed by: akyoto
GPG Key ID: C874F672B1AF20C0
16 changed files with 207 additions and 32 deletions

50
.config/fish/alias.fish Normal file
View File

@ -0,0 +1,50 @@
# Git
alias g "git"
alias gc "git clone"
alias gd "git diff"
alias gl "git log --oneline"
alias gp "git pull"
alias gs "git status"
alias home "git --git-dir=$HOME/.home/ --work-tree=$HOME"
# Go
alias gob "go build -v"
alias got "go test -v"
# Hyperfine
alias bench "hyperfine --shell=none"
# Neovim
alias e "nvim"
alias n "nvim"
# Pacman
alias p "pacman"
alias pi "sudo pacman -S"
alias pr "sudo pacman -Rs"
alias pu "sudo pacman -Syu"
# Tmux
alias t "tmux"
alias ta "tmux attach"
alias td "tmux detach"
alias tl "tmux ls"
alias tk "tmux kill-server"
# Systemctl
alias s "systemctl"
alias s+ "systemctl start"
alias s- "systemctl stop"
alias sl "systemctl list-units --type=service --state=running"
alias sld "systemctl list-unit-files --type=service --state=disabled"
alias sle "systemctl list-unit-files --type=service --state=enabled"
alias slt "systemctl list-timers"
alias ss "systemctl status"
# ...
alias cdp "cd ~/projects"
alias cls "clear"
alias hex "hexdump -C"
# Close all windows
alias closeall "wmctrl -l | awk '{print $1}' | xargs -rn1 wmctrl -ic"

11
.config/fish/config.fish Normal file
View File

@ -0,0 +1,11 @@
if status is-interactive
source $HOME/.config/fish/alias.fish
set -x LS_COLORS di=0:ln=0:so=0:pi=0:ex=0:bd=0:cd=0:su=0:sg=0:tw=0:ow=0
end
set -x GOPATH $HOME/.go
set -x EDITOR nvim
set -x LANG en_US.UTF-8
fish_add_path $GOPATH/bin
fish_add_path $HOME/.bin

View File

@ -0,0 +1,45 @@
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR __fish_initialized:3400
SETUVAR fish_color_autosuggestion:707A8C
SETUVAR fish_color_cancel:\x2d\x2dreverse
SETUVAR fish_color_command:00ff00
SETUVAR fish_color_comment:5C6773
SETUVAR fish_color_cwd:73D0FF
SETUVAR fish_color_cwd_root:red
SETUVAR fish_color_end:F29E74
SETUVAR fish_color_error:FF3333
SETUVAR fish_color_escape:95E6CB
SETUVAR fish_color_gray:9ca0b0
SETUVAR fish_color_history_current:\x2d\x2dbold
SETUVAR fish_color_host:normal
SETUVAR fish_color_host_remote:\x1d
SETUVAR fish_color_keyword:\x1d
SETUVAR fish_color_match:F28779
SETUVAR fish_color_normal:CBCCC6
SETUVAR fish_color_operator:FFCC66
SETUVAR fish_color_option:\x1d
SETUVAR fish_color_param:ffffff
SETUVAR fish_color_quote:5fff00
SETUVAR fish_color_redirection:D4BFFF
SETUVAR fish_color_search_match:\x2d\x2dbackground\x3dFFCC66
SETUVAR fish_color_selection:\x2d\x2dbackground\x3dFFCC66
SETUVAR fish_color_status:red
SETUVAR fish_color_user:brgreen
SETUVAR fish_color_valid_path:\x1d
SETUVAR fish_key_bindings:fish_default_key_bindings
SETUVAR fish_pager_color_background:\x1d
SETUVAR fish_pager_color_completion:normal
SETUVAR fish_pager_color_description:B3A06D
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_pager_color_secondary_background:\x1d
SETUVAR fish_pager_color_secondary_completion:\x1d
SETUVAR fish_pager_color_secondary_description:\x1d
SETUVAR fish_pager_color_secondary_prefix:\x1d
SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dFFCC66
SETUVAR fish_pager_color_selected_completion:\x1d
SETUVAR fish_pager_color_selected_description:\x1d
SETUVAR fish_pager_color_selected_prefix:\x1d
SETUVAR fish_prompt_pwd_dir_length:0
SETUVAR fish_user_paths:/home/eduard/\x2ego/bin\x1e/home/eduard/\x2ebin

View File

@ -0,0 +1,2 @@
function fish_greeting
end

View File

@ -0,0 +1,6 @@
function fish_prompt
set_color $fish_color_cwd
echo -n (prompt_pwd)
set_color normal
printf ' '
end

View File

@ -0,0 +1,3 @@
function ll
ls -l $argv
end

View File

@ -0,0 +1,7 @@
function ls
if command -q exa
exa -1 --icons=auto $argv
else
command ls $argv
end
end

View File

@ -0,0 +1,38 @@
fish_color_autosuggestion 707A8C
fish_color_cancel --reverse
fish_color_command 00ff00
fish_color_comment 5C6773
fish_color_cwd 73D0FF
fish_color_cwd_root red
fish_color_end F29E74
fish_color_error FF3333
fish_color_escape 95E6CB
fish_color_history_current --bold
fish_color_host normal
fish_color_host_remote
fish_color_keyword
fish_color_match F28779
fish_color_normal CBCCC6
fish_color_operator FFCC66
fish_color_option
fish_color_param ffffff
fish_color_quote 5fff00
fish_color_redirection D4BFFF
fish_color_search_match --background=FFCC66
fish_color_selection --background=FFCC66
fish_color_status red
fish_color_user brgreen
fish_color_valid_path
fish_pager_color_background
fish_pager_color_completion normal
fish_pager_color_description B3A06D
fish_pager_color_prefix 'normal' '--bold' '--underline'
fish_pager_color_progress 'brwhite' '--background=cyan'
fish_pager_color_secondary_background
fish_pager_color_secondary_completion
fish_pager_color_secondary_description
fish_pager_color_secondary_prefix
fish_pager_color_selected_background --background=FFCC66
fish_pager_color_selected_completion
fish_pager_color_selected_description
fish_pager_color_selected_prefix

View File

@ -46,3 +46,6 @@ alias cdp = cd ~/projects
alias cls = clear
alias hex = hexdump -C
alias ll = ls -la
# Close all windows
def closeall [] { wmctrl -l | awk '{print $1}' | xargs -rn1 wmctrl -ic }

View File

@ -1,20 +1,20 @@
{
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
"gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" },
"lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
"mini.completion": { "branch": "main", "commit": "3469773c1280a962bff89c06278007e8aaa30eb5" },
"multiple-cursors.nvim": { "branch": "main", "commit": "9f41d2991f36e3558a83760fba8eb94529c68ea6" },
"neodev.nvim": { "branch": "main", "commit": "5bbbeda6a9c672f314c95ca47a8b495cf6de17f9" },
"noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
"multiple-cursors.nvim": { "branch": "main", "commit": "8529e887c4d6d7ad9734443c2ad01a4010092941" },
"neodev.nvim": { "branch": "main", "commit": "2793ba3127c2c93ee486b9072a3ef129eeb950cc" },
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
"nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
"nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" },
"nvim-lspconfig": { "branch": "master", "commit": "ac530dfb97e51d82e3b0a7cddbf7a4a7c4c10ff8" },
"nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" },
"nvim-tree.lua": { "branch": "master", "commit": "7bdb220d0fe604a77361e92cdbc7af1b8a412126" },
"nvim-treesitter": { "branch": "master", "commit": "97997c928bb038457f49343ffa5304d931545584" },
"nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" },
"onedark.nvim": { "branch": "master", "commit": "14e5de43cf1ff761c280d1ff5b9980897f5b46c7" },
"plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" },
"nvim-tree.lua": { "branch": "master", "commit": "f39f7b6fcd3865ac2146de4cb4045286308f2935" },
"nvim-treesitter": { "branch": "master", "commit": "5fca7ae4960c415af0b038e89a2d84ef6e16d28d" },
"nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" },
"onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" },
"telescope.nvim": { "branch": "master", "commit": "20efb3864903fb854a85faf57513ffd80582275b" }
"telescope.nvim": { "branch": "master", "commit": "7b5c5f56a21e82fdcfe5b250278b8dfc4b1cbab4" }
}

View File

@ -19,7 +19,6 @@ opt.expandtab = false
opt.grepformat = "%f:%l:%c:%m"
opt.grepprg = "rg --grep"
opt.ignorecase = false
opt.linespace = 0
opt.mouse = "a"
opt.ruler = false
opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" }
@ -39,20 +38,20 @@ opt.undolevels = 10000
opt.updatetime = 250
opt.virtualedit = "onemore"
opt.wildmode = "longest:full,full"
opt.winblend = 10
opt.wrap = false
-- UI
opt.fillchars = { eob = " ", vert = " " }
opt.laststatus = 0
opt.number = true
opt.number = false
opt.relativenumber = false
opt.signcolumn = "number"
opt.signcolumn = "yes"
opt.statusline = "%{repeat('─',winwidth('.'))}"
-- Neovide
if g.neovide then
opt.linespace = 3
g.neovide_fullscreen = true
g.neovide_transparency = 0.9
vim.o.guifont = "UbuntuMono Nerd Font:h20"
g.neovide_transparency = 0.92
vim.o.guifont = "UbuntuMono Nerd Font:h20:#h-none"
end

View File

@ -4,7 +4,7 @@ return {
priority = 1000,
opts = {
style = "dark",
--transparent = true,
transparent = true,
term_colors = true,
highlights = {
["StatusLine"] = {fg = "$bg3", bg = "Normal"},

View File

@ -18,7 +18,6 @@ return {
["<esc>"] = require("telescope.actions").close,
},
},
winblend = 10,
},
extensions = {
project = {

View File

@ -1,22 +1,26 @@
# global options
set -g base-index 1
set -g terminal-overrides ",*:RGB"
set -g escape-time 0
set -g focus-events on
set -g mouse on
set -g prefix C-a
set -g prefix C-Space
# unbind all
unbind-key -a
# prefix using Ctrl-a
bind C-a send-prefix
# prefix using Ctrl-space
bind C-Space send-prefix
# detach tmux using q
bind q detach
# detach tmux using d
bind d detach
# split panes using s and d
bind d split-window -h
bind s split-window -v
# kill pane using q
bind q kill-pane
# split panes using arrow keys
bind Right split-window -h
bind Down split-window -v
# switch panes using Alt-arrow without prefix
bind -n M-Left select-pane -L
@ -24,5 +28,11 @@ bind -n M-Right select-pane -R
bind -n M-Up select-pane -U
bind -n M-Down select-pane -D
# resize panes using Shift-arrow without prefix
bind -n S-Up resize-pane -U 5
bind -n S-Down resize-pane -D 5
bind -n S-Left resize-pane -L 5
bind -n S-Right resize-pane -R 5
# theme
source-file ~/.config/tmux/theme.conf

View File

@ -1,5 +1,6 @@
{
"breadcrumbs.enabled": false,
"diffEditor.ignoreTrimWhitespace": false,
"editor.cursorBlinking": "phase",
"editor.fontFamily": "UbuntuMono Nerd Font",
"editor.fontSize": 15,
@ -34,7 +35,7 @@
"window.menuBarVisibility": "hidden",
"window.zoomLevel": 1,
"workbench.activityBar.location": "hidden",
"workbench.colorTheme": "One Dark Pro Darker",
"workbench.colorTheme": "Default Dark+",
"workbench.editor.enablePreview": false,
"workbench.editor.showTabs": "none",
"workbench.iconTheme": "material-icon-theme",

7
.gitignore vendored
View File

@ -7,9 +7,10 @@
!.gitignore
!/.config
/.config/*
!/.config/nvim
!/.config/nushell
!/.config/tmux
!/.config/alacritty
!/.config/fish
!/.config/htop
!/.config/nushell
!/.config/nvim
!/.config/tmux
!/.config/vscode