reorganize to use stow to manage configs, remove fish and stumpwm configs
This commit is contained in:
1 parent
8dfd72a3de
commit
a8668f5409
23 files changed
+24
-272
No files matched your search
@@ -1,11 +0,0 @@
|
||||
# abbr -a e emacsclient -n
|
||||
|
||||
set -g fish_prompt_pwd_dir_length 0
|
||||
|
||||
bind \cg cancel
|
||||
|
||||
# to synch current directory betweeen Emacs an fish shell in vterm
|
||||
function fish_vterm_prompt_end;
|
||||
printf '\e]51;A'(whoami)'@'(prompt_hostname)':'(pwd)'\e\\';
|
||||
end
|
||||
function track_directories --on-event fish_prompt; fish_vterm_prompt_end; end
|
||||
@@ -1,97 +0,0 @@
|
||||
function fish_prompt --description 'Write out the prompt'
|
||||
set -l last_status $status
|
||||
|
||||
if not set -q __fish_git_prompt_show_informative_status
|
||||
set -g __fish_git_prompt_show_informative_status 1
|
||||
end
|
||||
if not set -q __fish_git_prompt_hide_untrackedfiles
|
||||
set -g __fish_git_prompt_hide_untrackedfiles 1
|
||||
end
|
||||
|
||||
if not set -q __fish_git_prompt_color_branch
|
||||
set -g __fish_git_prompt_color_branch magenta --bold
|
||||
end
|
||||
if not set -q __fish_git_prompt_showupstream
|
||||
set -g __fish_git_prompt_showupstream "informative"
|
||||
end
|
||||
if not set -q __fish_git_prompt_char_upstream_ahead
|
||||
set -g __fish_git_prompt_char_upstream_ahead "↑"
|
||||
end
|
||||
if not set -q __fish_git_prompt_char_upstream_behind
|
||||
set -g __fish_git_prompt_char_upstream_behind "↓"
|
||||
end
|
||||
if not set -q __fish_git_prompt_char_upstream_prefix
|
||||
set -g __fish_git_prompt_char_upstream_prefix ""
|
||||
end
|
||||
|
||||
if not set -q __fish_git_prompt_char_stagedstate
|
||||
set -g __fish_git_prompt_char_stagedstate "●"
|
||||
end
|
||||
if not set -q __fish_git_prompt_char_dirtystate
|
||||
set -g __fish_git_prompt_char_dirtystate "✚"
|
||||
end
|
||||
if not set -q __fish_git_prompt_char_untrackedfiles
|
||||
set -g __fish_git_prompt_char_untrackedfiles "…"
|
||||
end
|
||||
if not set -q __fish_git_prompt_char_invalidstate
|
||||
set -g __fish_git_prompt_char_invalidstate "✖"
|
||||
end
|
||||
if not set -q __fish_git_prompt_char_cleanstate
|
||||
set -g __fish_git_prompt_char_cleanstate "✔"
|
||||
end
|
||||
|
||||
if not set -q __fish_git_prompt_color_dirtystate
|
||||
set -g __fish_git_prompt_color_dirtystate blue
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_stagedstate
|
||||
set -g __fish_git_prompt_color_stagedstate yellow
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_invalidstate
|
||||
set -g __fish_git_prompt_color_invalidstate red
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_untrackedfiles
|
||||
set -g __fish_git_prompt_color_untrackedfiles $fish_color_normal
|
||||
end
|
||||
if not set -q __fish_git_prompt_color_cleanstate
|
||||
set -g __fish_git_prompt_color_cleanstate green --bold
|
||||
end
|
||||
|
||||
if not set -q __fish_prompt_normal
|
||||
set -g __fish_prompt_normal (set_color normal)
|
||||
end
|
||||
|
||||
set -l color_cwd
|
||||
set -l prefix
|
||||
set -l suffix
|
||||
switch "$USER"
|
||||
case root toor
|
||||
if set -q fish_color_cwd_root
|
||||
set color_cwd $fish_color_cwd_root
|
||||
else
|
||||
set color_cwd $fish_color_cwd
|
||||
end
|
||||
set suffix '#'
|
||||
case '*'
|
||||
set color_cwd $fish_color_cwd
|
||||
set suffix '$'
|
||||
end
|
||||
|
||||
# USER@HOST
|
||||
set_color normal
|
||||
printf '%s@%s ' "$USER" (prompt_hostname)
|
||||
|
||||
# PWD
|
||||
set_color $color_cwd
|
||||
echo -n (prompt_pwd)
|
||||
set_color normal
|
||||
|
||||
printf '%s ' (__fish_vcs_prompt)
|
||||
|
||||
if not test $last_status -eq 0
|
||||
set_color $fish_color_error
|
||||
echo -n "[$last_status] "
|
||||
set_color normal
|
||||
end
|
||||
|
||||
echo -n "$suffix "
|
||||
end
|
||||
@@ -1,3 +0,0 @@
|
||||
if test "$TERM" = "eterm-color"
|
||||
function fish_title; end
|
||||
end
|
||||
@@ -1,63 +0,0 @@
|
||||
--- config.def.h 2020-01-22 00:08:57.811290066 +0100
|
||||
+++ config.h 2020-01-22 00:08:50.174623312 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
*
|
||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||
*/
|
||||
-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
||||
+static char *font = "FantasqueSansMono:pixelsize=30:antialias=true:autohint=true";
|
||||
static int borderpx = 2;
|
||||
|
||||
/*
|
||||
@@ -86,22 +86,22 @@
|
||||
static const char *colorname[] = {
|
||||
/* 8 normal colors */
|
||||
"black",
|
||||
- "red3",
|
||||
- "green3",
|
||||
- "yellow3",
|
||||
- "blue2",
|
||||
- "magenta3",
|
||||
- "cyan3",
|
||||
+ "#ef6a6c", // "red3",
|
||||
+ "#59c19f", // "green3",
|
||||
+ "#e9dc88", // "yellow3",
|
||||
+ "#25bcf6", // "blue2",
|
||||
+ "#dc88e9", // "magenta3",
|
||||
+ "#62dafb", // "cyan3",
|
||||
"gray90",
|
||||
|
||||
/* 8 bright colors */
|
||||
"gray50",
|
||||
- "red",
|
||||
- "green",
|
||||
- "yellow",
|
||||
- "#5c5cff",
|
||||
- "magenta",
|
||||
- "cyan",
|
||||
+ "#ef9a9a", // "red",
|
||||
+ "#a5d6a7", // "green",
|
||||
+ "#fff59d", // "yellow",
|
||||
+ "#90caf9", // "#5c5cff",
|
||||
+ "#ce93d8", // "magenta",
|
||||
+ "#80deea", // "cyan",
|
||||
"white",
|
||||
|
||||
[255] = 0,
|
||||
@@ -109,6 +109,7 @@
|
||||
/* more colors can be added after 255 to use with DefaultXX */
|
||||
"#cccccc",
|
||||
"#555555",
|
||||
+ "#424242",
|
||||
};
|
||||
|
||||
|
||||
@@ -117,7 +118,7 @@
|
||||
* foreground, background, cursor, reverse cursor
|
||||
*/
|
||||
unsigned int defaultfg = 7;
|
||||
-unsigned int defaultbg = 0;
|
||||
+unsigned int defaultbg = 258;
|
||||
static unsigned int defaultcs = 256;
|
||||
static unsigned int defaultrcs = 257;
|
||||
|
||||
@@ -1,95 +0,0 @@
|
||||
;; -*- common-lisp -*-
|
||||
|
||||
(in-package :stumpwm)
|
||||
|
||||
(set-prefix-key (kbd "s-;"))
|
||||
(or (set-font "terminus-32")
|
||||
(set-font "-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso10646-1"))
|
||||
(set-focus-color "gray50")
|
||||
(setf *screen-mode-line-format* "[^B%n^b] %W^>%d")
|
||||
(setf *mode-line-timeout* 5)
|
||||
(setf *message-window-gravity* :center)
|
||||
(setf *input-window-gravity* :center)
|
||||
(setf *mouse-focus-policy* :click)
|
||||
(setf *time-modeline-string* "%k:%M")
|
||||
|
||||
(define-key *root-map* (kbd ";") "colon")
|
||||
(define-key *root-map* (kbd "c") "exec st")
|
||||
(define-key *root-map* (kbd "C-c") "exec st")
|
||||
(define-key *root-map* (kbd "s-TAB") "gother")
|
||||
(define-key *root-map* (kbd "H") "exec systemctl hibernate")
|
||||
(define-key *root-map* (kbd "L") "exec systemctl suspend")
|
||||
(define-key *root-map* (kbd "F") "exec firefox")
|
||||
|
||||
(define-key *top-map* (kbd "s-1") "gselect 1")
|
||||
(define-key *top-map* (kbd "s-2") "gselect 2")
|
||||
(define-key *top-map* (kbd "s-3") "gselect 3")
|
||||
(define-key *top-map* (kbd "s-4") "gselect 4")
|
||||
(define-key *top-map* (kbd "s-5") "gselect 5")
|
||||
(define-key *top-map* (kbd "s-6") "gselect 6")
|
||||
(define-key *top-map* (kbd "s-7") "gselect 7")
|
||||
(define-key *top-map* (kbd "s-8") "gselect 8")
|
||||
(define-key *top-map* (kbd "s-9") "gselect 9")
|
||||
(define-key *top-map* (kbd "s-0") "gselect 0")
|
||||
(define-key *top-map* (kbd "s-!") "gmove 1")
|
||||
(define-key *top-map* (kbd "s-@") "gmove 2")
|
||||
(define-key *top-map* (kbd "s-#") "gmove 3")
|
||||
(define-key *top-map* (kbd "s-$") "gmove 4")
|
||||
(define-key *top-map* (kbd "s-%") "gmove 5")
|
||||
(define-key *top-map* (kbd "s-^") "gmove 6")
|
||||
(define-key *top-map* (kbd "s-&") "gmove 7")
|
||||
(define-key *top-map* (kbd "s-*") "gmove 8")
|
||||
(define-key *top-map* (kbd "s-(") "gmove 9")
|
||||
(define-key *top-map* (kbd "s-)") "gmove 0")
|
||||
|
||||
(define-key *top-map* (kbd "s-e") "exec emacsclient -c")
|
||||
(define-key *top-map* (kbd "s-p") "run-shell-command")
|
||||
(define-key *top-map* (kbd "s-S-RET") "exec emacsclient -c -e '(vterm)'")
|
||||
|
||||
(define-key *top-map* (kbd "s-TAB") "gother")
|
||||
(define-key *top-map* (kbd "s-h") "move-focus left")
|
||||
(define-key *top-map* (kbd "s-j") "move-focus down")
|
||||
(define-key *top-map* (kbd "s-k") "move-focus up")
|
||||
(define-key *top-map* (kbd "s-l") "move-focus right")
|
||||
(define-key *top-map* (kbd "s-H") "move-window left")
|
||||
(define-key *top-map* (kbd "s-J") "move-window down")
|
||||
(define-key *top-map* (kbd "s-K") "move-window up")
|
||||
(define-key *top-map* (kbd "s-L") "move-window right")
|
||||
|
||||
(define-key *top-map* (kbd "XF86AudioMute") "exec amixer set Master toggle")
|
||||
(define-key *top-map* (kbd "XF86AudioLowerVolume") "exec amixer set Master 5-")
|
||||
(define-key *top-map* (kbd "XF86AudioRaiseVolume") "exec amixer set Master 5+")
|
||||
(define-key *top-map* (kbd "XF86MonBrightnessDown") "exec xbacklight -dec 3")
|
||||
(define-key *top-map* (kbd "XF86MonBrightnessUp") "exec xbacklight -inc 3")
|
||||
|
||||
(when (and (= 1 (group-number (current-group)))
|
||||
(string= "Default" (group-name (current-group))))
|
||||
(grename "1")
|
||||
(dolist (name '("2" "3" "4" "5" "6" "7" "8" "9"))
|
||||
(gnewbg name))
|
||||
(let ((widths (mapcar #'head-width (screen-heads (current-screen)))))
|
||||
(if (and (= (length widths) 2) (< (car widths) (cadr widths)))
|
||||
(mapc #'focus-next-frame (screen-groups (current-screen)))))
|
||||
(gnewbg-float "Float"))
|
||||
|
||||
(setq *mode-line-background-color* "#455a64")
|
||||
(setq *mode-line-foreground-color* "#b0bec5")
|
||||
(set-border-color "#212121")
|
||||
(set-bg-color "#455a64")
|
||||
(set-fg-color "#b0bec5")
|
||||
(setq *colors* '("#212121" "#e57373" "#a5d6a7" "#fff59d" "#90caf9" "#e1bee7" "#80deea" "#fafafa"))
|
||||
(update-color-map (current-screen))
|
||||
|
||||
(let ((scr (current-screen)))
|
||||
(dolist (head (screen-heads scr))
|
||||
(enable-mode-line scr head t)))
|
||||
|
||||
(require :asdf) ; needed to find swank in ~/common-lisp if not using
|
||||
; quicklisp
|
||||
(require :swank)
|
||||
|
||||
(defcommand swank () ()
|
||||
"Start swank server"
|
||||
(swank:create-server :port 4004
|
||||
:style swank:*communication-style*
|
||||
:dont-close t))
|
||||
@@ -0,0 +1,17 @@
|
||||
Lupan's config files
|
||||
====================
|
||||
|
||||
To reproduce my environment clone this repo into `~/dotfiles` and run
|
||||
|
||||
```
|
||||
$ stow -v alacritty bspwm music shell tmux
|
||||
```
|
||||
|
||||
if you want i3 instead of bspwm (left as a fallback) *also* run
|
||||
|
||||
```
|
||||
$ stow -v i3
|
||||
```
|
||||
|
||||
Watch this video for a demo of using `stow` to manage dotfiles:
|
||||
https://www.youtube.com/watch?v=TG_R7lpR2zU
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,6 @@
|
||||
Directory for plugins. Checkout here
|
||||
|
||||
1. zsh-autosuggestions (https://github.com/zsh-users/zsh-autosuggestions)
|
||||
2. zsh-syntax-highlighting (https://github.com/zsh-users/zsh-syntax-highlighting)
|
||||
|
||||
or install then with package manager in /usr/share/zsh/plugins/ and symlink.
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,6 @@
|
||||
# History.
|
||||
|
||||
HISTFILE="$ZDOTDIR/.zsh_history"
|
||||
SCD_HISTFILE="$ZDOTDIR/.scdhistory"
|
||||
HISTFILE=${ZDOTDIR:-~}/.zsh_history
|
||||
HISTSIZE=10000
|
||||
SAVEHIST=10000
|
||||
setopt append_history
|
||||
File renamed without changes.
Reference in new issue
Block a user