diff --git a/README.org b/README.org index 81f7a1e..21d1459 100644 --- a/README.org +++ b/README.org @@ -6,7 +6,7 @@ I'm using: - [[https://github.com/Airblader/i3][i3-gaps]] - [[https://www.archlinux.org/][Arch Linux]] - [[https://github.com/nana-4/materia-theme][Materia Theme]] - - [[http://zsh.sourceforge.net][Z shell]] + - [[http://zsh.sourceforge.net][zsh]] ** TODOS: @@ -98,9 +98,20 @@ rm -rf ~/.*bash* # remove bash-stuff from your home directory.. don't do it if y *** Setting up Emacs I tried to make this as easy as possible. All packages should be installed automatically. -*** Setups -Setting up some programs. -**** "installing" the dotfiles. +*** Font setup +Full git [[https://github.com/powerline/fonts][here]]. +#+BEGIN_SRC sh +git clone # clone +git clone https://github.com/powerline/fonts.git --depth=1 +# install +cd fonts +./install.sh +# clean-up a bit +cd .. +rm -rf fonts +#+END_SRC + +*** "Installing" the dotfiles. Take a look at already existing files and delete them if necessary. #+BEGIN_SRC sh git clone https://github.com/TuDatTr/dotfiles .dotfiles && cd .dotfiles @@ -125,3 +136,4 @@ This project is license under the GPL-3.0 License - see LICENSE file for details - [[https://www.reddit.com/r/unixporn/][unixporn - the home for *NIX customisation!]] - [[https://uigradients.com][uiGradients - Beautiful colored gradients]] - [[http://terminal.sexy/][terminal.sexy - Terminal Color Scheme Designer]] + - [[https://github.com/powerline/fonts][powerline]] diff --git a/emacs/.emacs.d/config.org b/emacs/.emacs.d/config.org index 221f681..05985da 100644 --- a/emacs/.emacs.d/config.org +++ b/emacs/.emacs.d/config.org @@ -54,6 +54,15 @@ A list of installed packages and details about them. (use-package swiper) ;; (use-package yasnippet) is a dep #+END_SRC + +#+BEGIN_SRC emacs-lisp +(custom-set-variables + '(package-selected-packages + (quote + (powerline ledger-mode smartparens rainbow-mode rainbow-delimiters ox-twbs material-theme google-this flycheck eclim counsel auto-complete-auctex auto-complete auctex anaconda-mode use-package))) + '(truncate-lines t)) +#+END_SRC + * Themes Using the [[https://github.com/cpaulik/emacs-material-theme][Material]]-Theme. #+BEGIN_SRC emacs-lisp @@ -74,6 +83,8 @@ Changes the Emacs background to the terminals defaults. (Generally) '((".*" "~/.emacs-saves/" t))) #+END_SRC + + * Functions All the functions I use. ** Cut/Copy and Paste by Boruch Baum @@ -154,6 +165,16 @@ Function is not currently used since I still have to figure out how to make it w (unless (display-graphic-p (selected-frame)) (set-face-background 'default "unspecified-bg" (selected-frame)))) #+END_SRC + +Copy word +#+BEGIN_SRC emacs-lisp +(defun copy-word (&optinal arg) +"Copy words at point into kill-ring" +(interactive "P") +(copy-thing 'backward-word 'forward-word arg) +) +#+END_SRC + * Modes ** Window Modes #+BEGIN_SRC emacs-lisp @@ -199,6 +220,7 @@ Enable syntax highlighting in Org-mode. (setq org-src-fontify-natively t))) #+END_SRC +Enable Enable automatic translation of special characters #+BEGIN_SRC emacs-lisp (add-hook 'org-mode-hook @@ -258,25 +280,13 @@ Globaly highlight the current line in a slightly darker shade of grey. ** Ledger #+BEGIN_SRC emacs-lisp (custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. '(ledger-reports (quote - (("budget" "ledger -f MyBudget.ledger bal Brieftasche$ Girokonto$") + (("balance" "%(binary) -f %(ledger-file) bal Brieftasche Girokonto") ("bal" "%(binary) -f %(ledger-file) bal") ("reg" "%(binary) -f %(ledger-file) reg") ("payee" "%(binary) -f %(ledger-file) reg @%(payee)") ("account" "%(binary) -f %(ledger-file) reg %(account)")))) - '(package-selected-packages - (quote - (ledger-mode smartparens rainbow-mode rainbow-delimiters ox-twbs material-theme google-this flycheck eclim counsel auto-complete-auctex auto-complete auctex anaconda-mode use-package)))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. ) #+END_SRC @@ -289,6 +299,7 @@ Globaly highlight the current line in a slightly darker shade of grey. (define-key map (kbd "C-c M-w") 'copy-to-xclipboard) (define-key map (kbd "C-c C-w") 'cut-to-xclipboard) (define-key map (kbd "C-c M-y") 'paste-from-xclipboard) + (define-key map (kbd "C-c w") 'copy-word) map) "my-keys-minor-mode keymap.") diff --git a/i3/.config/i3/config b/i3/.config/i3/config index e30096e..b2dae01 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -118,6 +118,8 @@ exec --no-startup-id setxkbmap -option "ctrl:swapcaps" ############################################################################### ################################# Keybindings ################################# ############################################################################### +# shutdown +bindsym $mod+Shift+s exec poweroff # start a terminal bindsym $mod+Return exec termite @@ -142,26 +144,25 @@ bindsym $mod+b exec env GTK_THEME=Materia:light waterfox bindsym $mod+e exec pcmanfm bindsym $mod+m exec thunderbird -bindsym Print exec --no-startup-id i3-scrot -bindsym $mod+Print --release exec --no-startup-id i3-scrot -w -bindsym $mod+Shift+Print --release exec --no-startup-id i3-scrot -s -bindsym $mod+Shift+h exec xdg-open /usr/share/doc/manjaro/i3_help.pdf +bindsym Print exec --no-startup-id scrot +bindsym Shift+Print --release exec --no-startup-id scrot -f +bindsym control+Shift+Print --release exec --no-startup-id scrot -s bindsym $mod+Ctrl+x --release exec --no-startup-id xkill # change focus -bindsym $mod+j focus left -bindsym $mod+k focus down -bindsym $mod+l focus up -bindsym $mod+semicolon focus right +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right # move focused window -bindsym $mod+Shift+j move left -bindsym $mod+Shift+k move down -bindsym $mod+Shift+l move up -bindsym $mod+Shift+semicolon move right +bindsym $mod+Shift+h move left +bindsym $mod+Shift+j move down +bindsym $mod+Shift+k move up +bindsym $mod+Shift+l move right # split orientation -bindsym $mod+h split h;exec notify-send 'tile horizontally' +bindsym $mod+c split h;exec notify-send 'tile horizontally' bindsym $mod+v split v;exec notify-send 'tile vertically' bindsym $mod+q split toggle @@ -174,9 +175,6 @@ bindsym $mod+Shift+space floating toggle # change focus between tiling / floating windows bindsym $mod+space focus mode_toggle -# toggle sticky -bindsym $mod+Shift+s sticky toggle - # focus the parent container bindsym $mod+a focus parent @@ -199,10 +197,10 @@ bindsym $mod+Shift+r restart bindsym $mod+r mode "resize" mode "resize" { # These bindings trigger as soon as you enter the resize mode - bindsym j resize shrink width 5 px or 5 ppt + bindsym h resize shrink width 5 px or 5 ppt bindsym k resize grow height 5 px or 5 ppt - bindsym l resize shrink height 5 px or 5 ppt - bindsym semicolon resize grow width 5 px or 5 ppt + bindsym j resize shrink height 5 px or 5 ppt + bindsym l resize grow width 5 px or 5 ppt # exit resize mode: Enter or Escape bindsym $mod+g mode "default" diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config index 58ddd30..9b852ff 100644 --- a/polybar/.config/polybar/config +++ b/polybar/.config/polybar/config @@ -51,7 +51,7 @@ bottom = true radius = 6.0 fixed-center = true -background = ${colors.background} +background = #00000000 foreground = ${colors.foreground} line-size = 0 diff --git a/termite/.config/termite/config b/termite/.config/termite/config index 25e65e9..95552c2 100644 --- a/termite/.config/termite/config +++ b/termite/.config/termite/config @@ -1,9 +1,9 @@ [options] allow_bold = true -#audible_bell = false -#clickable_url = true -dynamic_title = true -font = Dejavu Sans Mono 12 +audible_bell = false +clickable_url = true +#dynamic_title = false +font = Droid Sans Mono for Powerline #fullscreen = true #geometry = 640x480 #icon_name = terminal diff --git a/zsh/.zshrc b/zsh/.zshrc index 12c2623..93a3a9a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -38,6 +38,7 @@ alias org="e ~/Nextcloud/orgs/man.org" alias neofetch="neofetch --block_range 0 16" alias diff="diff -s" alias budget="e ~/Nextcloud/orgs/Budget/MyBudget.ledger" +alias q="exit" source $ZSH/oh-my-zsh.sh # Variables