diff --git a/Xresources/.Xresources b/Xresources/.Xresources deleted file mode 100644 index e69de29..0000000 diff --git a/eww/.config/eww/eww.xml b/eww/.config/eww/eww.xml index 2beb0dd..9351cac 100644 --- a/eww/.config/eww/eww.xml +++ b/eww/.config/eww/eww.xml @@ -12,42 +12,11 @@ - testing {{shit}} bruh - - is shit true? {{shit == true}} - is shit "shit"? {{shit == "shit"}} - - true and false 🤔 - {{ true && false }} - - fancy ass math {{ 12 + 5 * 12 * 4 }} - - - bruh " < fuck > - " - - - - - - - @@ -129,7 +98,7 @@ - true + enp34s0 @@ -164,12 +133,15 @@ - {"hi": "ho"} + {"hi": "ho", "hey": "fuck", "lol": "test" } + + /home/leon/reee.sh + diff --git a/fish/.config/fish/conf.d/omf.fish b/fish/.config/fish/conf.d/omf.fish deleted file mode 100644 index 3e0f6d6..0000000 --- a/fish/.config/fish/conf.d/omf.fish +++ /dev/null @@ -1,7 +0,0 @@ -# Path to Oh My Fish install. -set -q XDG_DATA_HOME - and set -gx OMF_PATH "$XDG_DATA_HOME/omf" - or set -gx OMF_PATH "$HOME/.local/share/omf" - -# Load Oh My Fish configuration. -source $OMF_PATH/init.fish diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish deleted file mode 100644 index f9c9b54..0000000 --- a/fish/.config/fish/config.fish +++ /dev/null @@ -1,84 +0,0 @@ -fish_vi_key_bindings -# fish_default_key_bindings - -# disable truecolor for dvtm -# set -e fish_term24bit -#source /home/leon/.config/fish/gruvbox-colors.fish - -#set -U FZF_TMUX 1 -set -U FZF_DEFAULT_COMMANDS "--filepath-word --cycle" -set -U FZF_PREVIEW_FILE_CMD "head -n 10 | bat --color=always --decorations=never" -set -U fish_greeting -#function fish_greeting -#end - - -alias ls="exa --icons" -alias tcolors="env TERM=xterm-256color tcolors" -abbr --add --global vim nvim -abbr --add --global tsh trash -#abbr --add --global clear "clear && ls" -abbr --add --global cxmonad "nvim /home/leon/.xmonad/lib/Config.hs" - - -#if status is-interactive -#and not set -q TMUX - #exec tmux -#end - -abbr --add --global gaa "git add --all" -abbr --add --global gc "git commit -m " -abbr --add --global gp "git push" -abbr --add --global gs "git status" - - -[ (hostname) = "garnix" ] && alias rm='echo "rm is disabled. Please use trash instead."; false' - -function run_pipr - set -l commandline (commandline -b) - pipr --out-file /tmp/pipr_out --default "$commandline" - set -l result (cat /tmp/pipr_out) - commandline -r $result - commandline -f repaint -end - -bind \ca run_pipr - -function c - set -l result (/home/leon/scripts/conf) - commandline -r "$result" - commandline -f execute -end - - - - -function replace_with_yay - set -l cmd (commandline -b) - switch $cmd - case "*pacman*" - set edited (echo $cmd | sed 's/sudo //g' | sed 's/pacman/yay/g') - case "yay*" - set edited (echo $cmd | sed 's/yay/sudo pacman/g') - end - commandline -r "$edited" - commandline -f repaint -end - -bind \cy replace_with_yay - -# fff file manager cd on exit -function f - fff $argv - set -q XDG_CACHE_HOME; or set XDG_CACHE_HOME $HOME/.cache - cd (cat $XDG_CACHE_HOME/fff/.fff_d) -end -set -x EDITOR "nvim" -set -x FFF_TRASH_CMD "trash" # make fff's trash function use trash-cli - -fenv source '$HOME/.nix-profile/etc/profile.d/nix.sh' -#bass source '$HOME/.nix-profile/etc/profile.d/nix.sh' & -set -g NIX_PATH "$HOME/.nix-defexpr/channels:$NIX_PATH" -fenv source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" -#eval (direnv hook fish) - diff --git a/fish/.config/fish/fish/config.fish b/fish/.config/fish/fish/config.fish deleted file mode 120000 index 9a1ae26..0000000 --- a/fish/.config/fish/fish/config.fish +++ /dev/null @@ -1 +0,0 @@ -/nix/store/6y0vwjy4bp38zlq8dwhallp7325cm8vi-home-manager-files/.config/fish/config.fish \ No newline at end of file diff --git a/fish/.config/fish/fish/fish_variables b/fish/.config/fish/fish/fish_variables deleted file mode 100644 index 1428cb7..0000000 --- a/fish/.config/fish/fish/fish_variables +++ /dev/null @@ -1,34 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR FZF_DEFAULT_COMMANDS:\x2d\x2dfilepath\x2dword\x20\x2d\x2dcycle -SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010\x20\x7c\x20bat\x20\x2d\x2dcolor\x3dalways\x20\x2d\x2ddecorations\x3dnever -SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:555\x1ebrblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:005fd7 -SETUVAR fish_color_comment:990000 -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:009900 -SETUVAR fish_color_error:ff0000 -SETUVAR fish_color_escape:00a6b2 -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:00afff -SETUVAR fish_color_quote:999900 -SETUVAR fish_color_redirection:00afff -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting:\x1d -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_completion:\x1d -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables deleted file mode 100644 index feb6015..0000000 --- a/fish/.config/fish/fish_variables +++ /dev/null @@ -1,50 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR FZF_DEFAULT_COMMANDS:\x2d\x2dfilepath\x2dword\x20\x2d\x2dcycle -SETUVAR FZF_DEFAULT_OPTS:\x2d\x2dheight\x2040\x25 -SETUVAR FZF_ENABLE_OPEN_PREVIEW:1 -SETUVAR FZF_LEGACY_KEYBINDINGS:0 -SETUVAR FZF_PREVIEW_DIR_CMD:ls -SETUVAR FZF_PREVIEW_FILE_CMD:head\x20\x2dn\x2010\x20\x7c\x20bat\x20\x2d\x2dcolor\x3dalways\x20\x2d\x2ddecorations\x3dnever -SETUVAR FZF_TMUX:1 -SETUVAR FZF_TMUX_HEIGHT:40\x25 -SETUVAR SXHKD_SHELL:sh -SETUVAR __fish_initialized:3100 -SETUVAR dangerous_colors:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900 -SETUVAR dangerous_cursors:\x5c033\x5d12\x3b\x23268bd2\x5c007\x1e\x5c033\x5d12\x3b\x23b58900\x5c007\x1e\x5c033\x5d12\x3b\x23af005f\x5c007\x1e\x5c033\x5d12\x3b\x236c71c4\x5c007 -SETUVAR dangerous_day:000000\x1e333333\x1e666666\x1effffff\x1effff00\x1eff6600\x1eff0000\x1eff0033\x1e3300ff\x1e00aaff\x1e00ffff\x1e00ff00 -SETUVAR dangerous_night:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900 -SETUVAR dangerous_nocmdhist:c\x1ed\x1ell\x1els\x1em\x1es -SETUVAR dangerous_pwdstyle:short\x1elong\x1enone -SETUVAR dangerous_sessions_active:\x1d -SETUVAR dangerous_sessions_active_pid:\x1d -SETUVAR fish_color_autosuggestion:555 -SETUVAR fish_color_cancel:normal -SETUVAR fish_color_command:0087d7 -SETUVAR fish_color_comment:990000 -SETUVAR fish_color_cwd:008000 -SETUVAR fish_color_cwd_root:800000 -SETUVAR fish_color_end:009900 -SETUVAR fish_color_error:ff0000 -SETUVAR fish_color_escape:00a6b2 -SETUVAR fish_color_history_current:normal -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_match:normal -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:0087af -SETUVAR fish_color_quote:999900 -SETUVAR fish_color_redirection:00afff -SETUVAR fish_color_search_match:ffff00 -SETUVAR fish_color_selection:c0c0c0 -SETUVAR fish_color_status:red -SETUVAR fish_color_user:00ff00 -SETUVAR fish_color_valid_path:normal -SETUVAR fish_greeting:\x1d -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_user_paths:/home/leon/\x2efzf/bin diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish deleted file mode 120000 index aba2104..0000000 --- a/fish/.config/fish/functions/fish_prompt.fish +++ /dev/null @@ -1 +0,0 @@ -/home/leon/.local/share/omf/themes/lambda_better/fish_prompt.fish \ No newline at end of file diff --git a/fish/.config/fish/functions/fish_user_key_bindings.fish b/fish/.config/fish/functions/fish_user_key_bindings.fish deleted file mode 100644 index 3698914..0000000 --- a/fish/.config/fish/functions/fish_user_key_bindings.fish +++ /dev/null @@ -1,2 +0,0 @@ -function fish_user_key_bindings -end diff --git a/fish/.config/fish/functions/lambda_fish_prompt b/fish/.config/fish/functions/lambda_fish_prompt deleted file mode 120000 index f48d83d..0000000 --- a/fish/.config/fish/functions/lambda_fish_prompt +++ /dev/null @@ -1 +0,0 @@ -/home/leon/.local/share/omf/themes/lambda/fish_prompt.fish \ No newline at end of file diff --git a/fish/.config/fish/functions/my_fish_prompt.fish b/fish/.config/fish/functions/my_fish_prompt.fish deleted file mode 100644 index 71d4e87..0000000 --- a/fish/.config/fish/functions/my_fish_prompt.fish +++ /dev/null @@ -1,67 +0,0 @@ - - -function fish_prompt - # Cache exit status - set -l last_status $status - - set -l normal (set_color normal) - set -l white (set_color FFFFFF) - set -l turquoise (set_color 5fdfff) - set -l orange (set_color df5f00) - set -l hotpink (set_color df005f) - set -l blue (set_color blue) - set -l limegreen (set_color 87ff00) - set -l purple (set_color af5fff) - - - # Configure __fish_git_prompt - set -g __fish_git_prompt_char_stateseparator ' ' - set -g __fish_git_prompt_color 5fdfff - set -g __fish_git_prompt_color_flags df5f00 - set -g __fish_git_prompt_color_prefix white - set -g __fish_git_prompt_color_suffix white - set -g __fish_git_prompt_showdirtystate true - set -g __fish_git_prompt_showuntrackedfiles true - set -g __fish_git_prompt_showstashstate true - set -g __fish_git_prompt_show_informative_status true - - set -l current_user (whoami) - set -l vi_mode (__fish_vi_mode_prompt_real) - set -l git_prompt (__fish_git_prompt " (%s)") - #(pwd|sed "s=$HOME=~=") - - set -g fish_prompt_pwd_dir_length 1 - - echo -n $white'╭─'$vi_mode - echo -n $white'─'$hotpink$current_user$white' in '$limegreen(prompt_pwd) - echo -n $turquoise$git_prompt - if test $last_status -gt 0 - echo -n ' '$hotpink$last_status - end - echo - - echo -n $white'╰─λ ' - echo -n $normal -end - -function __fish_vi_mode_prompt_real - set -l turquoise (set_color 5fdfff) - set -l orange (set_color df5f00) - switch $fish_bind_mode - case insert - echo -n "─" - case default - echo -n $turquoise'N' - case visual - echo -n $orange'V' - case replace_one - echo -n $turquoise'R' - end -end - - -# needed so fish doesn't draw it by itself -function fish_mode_prompt -end - -# ⌁ diff --git a/fish/.config/fish/gruvbox-colors.fish b/fish/.config/fish/gruvbox-colors.fish deleted file mode 100644 index 227185a..0000000 --- a/fish/.config/fish/gruvbox-colors.fish +++ /dev/null @@ -1,27 +0,0 @@ - -set -l orange '#fe8019' -set -l aqua '#8ec07c' -set -l blue '#83a598' -set -l limegreen '#b8bb26' -set -l purple '#d3869b' -set -l aqua '#8ec07c' -set -l gwhite '#ebdbb2' -set -l gray2 '#665c54' -set -l purple '#d3869b' -set -l gray '#a89984' -set -l yellow '#fabd2f' - -#set -U fish_color_command $blue -#set -U fish_color_normal $gwhite -#set -U fish_color_quote $aqua -#set -U fish_color_redirection $orange -#set -U fish_color_param $aqua -#set -U fish_color_comment $gray -#set -U fish_color_match $yellow -#set -U fish_color_search_match $aqua -#set -U fish_color_autosuggestion $gray2 -#set -U fish_color_cancel $aqua -#set fish_color_selection -#set fish_color_end -#set fish_color_error -#set fish_color_operator diff --git a/nixpkgs/.config/nixpkgs/modules/base.nix b/nixpkgs/.config/nixpkgs/modules/base.nix index d5284c4..6a8703e 100644 --- a/nixpkgs/.config/nixpkgs/modules/base.nix +++ b/nixpkgs/.config/nixpkgs/modules/base.nix @@ -31,7 +31,7 @@ in elkowar.generalConfig.shellAbbrs = { vim = "nvim"; cxmonad = "cd ~/.xmonad && nvim /home/leon/.xmonad/lib/Config.hs && cd -"; - cnix = "cd ~/nixpkgs/ && nvim home.nix && cd -"; + cnix = "cd ~/.config/nixpkgs/ && nvim home.nix && cd -"; cvim = "cd ~/.config/nvim/ && nvim fnl/init.fnl && cd -"; ra = "ranger"; diff --git a/xmonad/.xmonad/lib/Config.hs b/xmonad/.xmonad/lib/Config.hs index 07b19d5..2f2899b 100644 --- a/xmonad/.xmonad/lib/Config.hs +++ b/xmonad/.xmonad/lib/Config.hs @@ -111,7 +111,8 @@ import Data.List (find) myModMask = mod4Mask myLauncher = Rofi.asCommand def ["-show run"] --myTerminal = "alacritty" -myTerminal = "wezterm" +--myTerminal = "wezterm" +myTerminal = "alacritty" useSharedWorkspaces = False {-| adds the scripts-directory path to the filename of a script |-}