mirror of
https://github.com/balkian/dotfiles.git
synced 2024-11-21 11:42:28 +00:00
Several changes
* Changed default terminal * Modified rofi to launch ssh * More shortcuts * Gitlab in emacs
This commit is contained in:
J. Fernando Sánchez
parent
5cd9fdc6a9
commit
5866cb54d0
@ -300,7 +300,9 @@ URxvt.pointerBlank: true
|
||||
! ROFI Color theme
|
||||
! ------------------------------------------------------------------------------
|
||||
rofi.color-enabled: true
|
||||
rofi.terminal: i3-sensible-terminal
|
||||
rofi.color-window: #273238, #273238, #1e2529
|
||||
rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff
|
||||
rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4
|
||||
rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844
|
||||
rofi.ssh-command: {terminal} -e "{ssh-client} {host}"
|
||||
@ -2,4 +2,5 @@
|
||||
setxkbmap us altgr-intl -option ctrl:nocaps
|
||||
#xmodmap ~/.Xmodmap
|
||||
#source ~/.xinitrc
|
||||
export XTERMINAL='termite'
|
||||
export XTERMINAL=xfce4-terminal
|
||||
export TERMINAL=xfce4-terminal
|
||||
|
||||
@ -23,7 +23,7 @@ shadow-exclude = [
|
||||
|
||||
# Opacity
|
||||
mark-override-focused = true;
|
||||
menu-opacity = 0.8;
|
||||
menu-opacity = 0.9;
|
||||
inactive-opacity = 0.8;
|
||||
# active-opacity = 0.8;
|
||||
frame-opacity = 0.7;
|
||||
@ -44,10 +44,10 @@ blur-background-exclude = [
|
||||
# opacity-rule = [ "80:class_g = 'URxvt'" ];
|
||||
|
||||
# Fading
|
||||
fading = true;
|
||||
fading = false;
|
||||
# fade-delta = 30;
|
||||
fade-in-step = 0.03;
|
||||
fade-out-step = 0.03;
|
||||
fade-in-step = 0.05;
|
||||
fade-out-step = 0.05;
|
||||
# no-fading-openclose = true;
|
||||
# no-fading-destroyed-argb = true;
|
||||
fade-exclude = [ ];
|
||||
@ -87,5 +87,5 @@ glx-swap-method = "undefined";
|
||||
# Window type settings
|
||||
wintypes:
|
||||
{
|
||||
tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; };
|
||||
tooltip = { fade = true; shadow = true; opacity = 0.95; focus = true; };
|
||||
};
|
||||
|
||||
@ -8,7 +8,8 @@
|
||||
("3a3917dbcc6571ef3942c2bf4c4240f70b5c4bc0b28192be6d3f9acd83607a24" "b6db49cec08652adf1ff2341ce32c7303be313b0de38c621676122f255ee46db" "b6d649c9f972b491686e7fa634535653e6222c1faca1ab71b3117854470a79ae" "0ae52e74c576120c6863403922ee00340a3bf3051615674c4b937f9c99b24535" "b2028956188cf668e27a130c027e7f240c24c705c1517108b98a9645644711d9" "03e3e79fb2b344e41a7df897818b7969ca51a15a67dc0c30ebbdeb9ea2cd4492" "232f715279fc131ed4facf6a517b84d23dca145fcc0e09c5e0f90eb534e1680f" "aed73c6d0afcf2232bb25ed2d872c7a1c4f1bda6759f84afc24de6a1aec93da8" "0b6645497e51d80eda1d337d6cabe31814d6c381e69491931a688836c16137ed" "cdfb22711f64d0e665f40b2607879fcf2607764b2b70d672ddaa26d2da13049f" "196cc00960232cfc7e74f4e95a94a5977cb16fd28ba7282195338f68c84058ec" default)))
|
||||
'(package-selected-packages
|
||||
(quote
|
||||
(flycheck-cask ensime scala-mode yasnippet yaml-mode slime quelpa-use-package ob-ipython nose n3-mode monokai-theme markdown-mode magit jedi helm-swoop helm-projectile helm-descbinds helm-ag guide-key go-mode go-autocomplete gist flymake-go flycheck exec-path-from-shell evil-surround evil-smartparens evil-paredit evil-org evil-nerd-commenter evil-mu4e evil-matchit evil-leader evil-jumper ein clojure-mode base16-theme auctex ace-jump-mode))))
|
||||
(evil-magit docker password-store gitlab flycheck-cask ensime scala-mode yasnippet yaml-mode slime quelpa-use-package ob-ipython nose n3-mode monokai-theme markdown-mode magit jedi helm-swoop helm-projectile helm-descbinds helm-ag guide-key go-mode go-autocomplete gist flymake-go flycheck exec-path-from-shell evil-surround evil-smartparens evil-paredit evil-org evil-nerd-commenter evil-mu4e evil-matchit evil-leader evil-jumper ein clojure-mode base16-theme auctex ace-jump-mode)))
|
||||
'(safe-local-variable-values (quote ((TeX-command-extra-options . "-shell-escape")))))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
(evil-mode)
|
||||
(use-package evil-leader :ensure)
|
||||
(use-package evil-matchit :ensure)
|
||||
(use-package evil-magit :ensure)
|
||||
(use-package evil-nerd-commenter
|
||||
:ensure
|
||||
:config (progn
|
||||
@ -44,7 +45,6 @@
|
||||
)
|
||||
)
|
||||
(use-package evil-surround :ensure)
|
||||
(use-package evil-jumper :ensure)
|
||||
(use-package ace-jump-mode :ensure
|
||||
:config (progn
|
||||
(eval-after-load "ace-jump-mode"
|
||||
@ -57,8 +57,8 @@
|
||||
(setq evil-default-cursor t)
|
||||
|
||||
;; Evil global modes
|
||||
(global-evil-jumper-mode 1)
|
||||
(global-evil-surround-mode 1)
|
||||
(global-evil-jumper-mode)
|
||||
(global-evil-leader-mode)
|
||||
(global-evil-matchit-mode 1)
|
||||
|
||||
@ -88,7 +88,19 @@
|
||||
(string-match-p "^\*" (buffer-name))
|
||||
(not ( equal bread-crumb (buffer-name) )) )
|
||||
(previous-buffer))))
|
||||
;;
|
||||
|
||||
;; change mode-line color by evil state
|
||||
(lexical-let ((default-color (cons (face-background 'mode-line)
|
||||
(face-foreground 'mode-line))))
|
||||
(add-hook 'post-command-hook
|
||||
(lambda ()
|
||||
(let ((color (cond ((minibufferp) default-color)
|
||||
((evil-insert-state-p) (cons (cdr default-color) (car default-color)))
|
||||
((evil-emacs-state-p) default-color)
|
||||
((buffer-modified-p) '("#ff0000" . "#ffffff"))
|
||||
(t default-color))))
|
||||
(set-face-background 'mode-line (car color))
|
||||
(set-face-foreground 'mode-line (cdr color))))))
|
||||
;; Evil keys
|
||||
(evil-leader/set-leader "<SPC>")
|
||||
|
||||
@ -269,7 +281,7 @@
|
||||
(use-package monokai-theme
|
||||
:ensure t
|
||||
:config (progn
|
||||
(load-theme 'base16-default-dark)
|
||||
(load-theme 'monokai)
|
||||
)
|
||||
)
|
||||
|
||||
@ -463,6 +475,7 @@
|
||||
(use-package magit
|
||||
:ensure
|
||||
:config (progn
|
||||
(add-hook 'after-save-hook 'magit-after-save-refresh-status)
|
||||
)
|
||||
)
|
||||
|
||||
@ -512,6 +525,7 @@
|
||||
(use-package markdown-mode
|
||||
:init
|
||||
:config (progn
|
||||
(setq markdown-command "pandoc -f markdown -t html -s")
|
||||
)
|
||||
)
|
||||
|
||||
@ -568,6 +582,8 @@
|
||||
)
|
||||
|
||||
|
||||
(setq mu4e-compose-context-policy nil)
|
||||
|
||||
(setq message-send-mail-function 'smtpmail-send-it
|
||||
starttls-use-gnutls t
|
||||
smtpmail-debug-info t)
|
||||
@ -603,6 +619,8 @@
|
||||
(setq mu4e-show-images t
|
||||
mu4e-show-addresses t)
|
||||
|
||||
;; By default, mu4e only shows contact names
|
||||
(setq mu4e-view-show-addresses t)
|
||||
;; don't save message to Sent Messages, IMAP takes care of this
|
||||
(setq mu4e-sent-messages-behavior 'delete)
|
||||
|
||||
@ -687,6 +705,23 @@
|
||||
)
|
||||
)
|
||||
|
||||
(use-package password-store
|
||||
:config (progn
|
||||
)
|
||||
)
|
||||
(use-package gitlab
|
||||
:config (progn
|
||||
(setq gitlab-host "https://lab.cluster.gsi.dit.upm.es"
|
||||
gitlab-username "balkian"
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
(use-package docker
|
||||
:config (progn
|
||||
)
|
||||
)
|
||||
|
||||
(setq PREVSHELL (getenv "SHELL")) ;; Workaround for tramp
|
||||
(eval-after-load 'tramp '(setenv "SHELL" "/bin/bash"))
|
||||
(setq tramp-default-method "ssh")
|
||||
|
||||
@ -22,7 +22,7 @@ floating_modifier $mod
|
||||
# start a terminal
|
||||
#bindsym $mod+Return exec --no-startup-id i3-one-tmux
|
||||
bindsym $mod+Return [title="^tmux$"] scratchpad show
|
||||
bindsym Control+Mod1+t exec --no-startup-id termite
|
||||
bindsym Control+Mod1+t exec --no-startup-id i3-sensible-terminal
|
||||
|
||||
# start lock
|
||||
bindsym Control+Mod1+l exec --no-startup-id i3-exit.sh lock
|
||||
@ -244,6 +244,7 @@ client.urgent #2f343a #101010 #93a1a1 #900000
|
||||
|
||||
new_window 1pixel
|
||||
|
||||
for_window [title="^floatingwin"] floating enable;
|
||||
for_window [title="^capture"] floating enable;
|
||||
for_window [title="^myagenda"] move to scratchpad
|
||||
for_window [class="^Google-chrome$"] border none
|
||||
@ -252,6 +253,8 @@ for_window [class="^Firefox$"] border none
|
||||
assign [class="Firefox" window_role="browser"] 2: Web
|
||||
for_window [class="^Xfce4-notifyd$"] floating enable; border none; focus mode_toggle
|
||||
for_window [class="^termite"] border 1px
|
||||
for_window [class="^lxterminal"] border 1px
|
||||
for_window [class="^xfce4-terminal"] border 1px
|
||||
for_window [title="^tmux$"] move to scratchpad
|
||||
for_window [class="^Nemo" title="Home"] move to scratchpad;
|
||||
#KDE
|
||||
@ -306,7 +309,7 @@ exec --no-startup-id nm-applet
|
||||
exec --no-startup-id pasystray
|
||||
exec --no-startup-id syncthing-gtk
|
||||
exec --no-startup-id syndaemon -i 0.5 -d
|
||||
exec --no-startup-id termite --title tmux -e tmux attach
|
||||
exec --no-startup-id i3-sensible-terminal --title=tmux -e 'tmux attach'
|
||||
exec --no-startup-id volti
|
||||
exec --no-startup-id xautolock -time 10 -corners "----" -locker 'i3lock -t -c 000000 -i ~/Images/screenlock'
|
||||
exec --no-startup-id xfce4-power-manager
|
||||
|
||||
2
scripts/.bin/myfloatingemacs
Executable file
2
scripts/.bin/myfloatingemacs
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
myemacs -nc -frame-parameters='(quote (name . "floatingwin"))' "$@"
|
||||
@ -6,9 +6,10 @@ set hintchars=hjklasdfgyuiopqwertnmzxcvb
|
||||
|
||||
autocmd LocationChange .* js modes.passAllKeys = false
|
||||
autocmd LocationChange mail\\.google\\.com js modes.passAllKeys = true
|
||||
autocmd LocationChange talks\\.golang\\.org js modes.passAllKeys = true
|
||||
autocmd LocationChange docs\\.google\\.com js modes.passAllKeys = true
|
||||
autocmd LocationChange duckduckgo\\.com js modes.passAllKeys = true
|
||||
autocmd LocationChange .*.gsi\\.dit\\.upm\\.es js modes.passAllKeys = true
|
||||
autocmd LocationChange jupyter\\.cluster\\.gsi\\.dit\\.upm\\.es js modes.passAllKeys = true
|
||||
autocmd LocationChange 127.0.0.1|localhost js modes.passAllKeys = true
|
||||
|
||||
" Make Firefox run faster by using JIT
|
||||
|
||||
@ -78,6 +78,7 @@ fi
|
||||
alias fail="less +F"
|
||||
|
||||
# Docker goodies
|
||||
alias da="docker_start_attach"
|
||||
alias drm="docker rm"
|
||||
alias drun="docker run"
|
||||
alias drmi="docker rmi"
|
||||
@ -85,21 +86,52 @@ alias dps="docker ps"
|
||||
alias dpi="docker images"
|
||||
alias dc="docker-compose"
|
||||
alias dcr="compose-run"
|
||||
function da () {
|
||||
alias da="docker_start_attach"
|
||||
alias daa="docker_apply_all_containers"
|
||||
alias dci="docker_clean_images"
|
||||
alias dcc="docker_clean_containers"
|
||||
alias dac="docker_apply_containers"
|
||||
|
||||
function docker_start_attach () {
|
||||
docker start $1 && docker attach $1
|
||||
}
|
||||
|
||||
function drmia () {
|
||||
docker rmi $(docker images | grep "^<none>" | awk '{print $3}')
|
||||
}
|
||||
function dca () {
|
||||
cmd=$1
|
||||
shift
|
||||
docker $cmd $(docker ps -q $*)
|
||||
}
|
||||
|
||||
function newdev () {
|
||||
docker run -v $PWD:/usr/src/app -t -i --name $1 -h $1 balkian/devmachine
|
||||
}
|
||||
|
||||
function docker_apply_containers () {
|
||||
if [[ "$#" -lt 1 ]];
|
||||
then
|
||||
echo "Usage: $0 <filter> <action>"
|
||||
exit 1
|
||||
fi
|
||||
containers=$(docker ps -a | grep -v 'CONTAINER' | awk "/$1/{ print \$0}")
|
||||
echo -n $containers
|
||||
if [[ "$#" -gt 1 ]];
|
||||
then
|
||||
shift;
|
||||
echo $containers | awk '{print $1}' | xargs docker "$@"
|
||||
fi
|
||||
#| xargs docker rmi "$@"
|
||||
}
|
||||
|
||||
function docker_clean_containers () {
|
||||
docker rm $(docker ps -q --filter=status=exited)
|
||||
}
|
||||
|
||||
function docker_clean_images () {
|
||||
docker rmi $(docker images -a --filter=dangling=true -q)
|
||||
}
|
||||
|
||||
function docker_nuke () {
|
||||
docker rmi $(docker images -q)
|
||||
}
|
||||
|
||||
alias gsicluster='ssh balkian@shannon.gsi.dit.upm.es -p 1337'
|
||||
|
||||
function gsiclustercopy(){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user