3 커밋 1c8a5c9fba ... 5150fcd486

작성자 SHA1 메시지 날짜
  Liam 5150fcd486 Update 4 년 전
  Liam 704513d049 Remove recursively alias 6 년 전
  Liam eb6924c3bd Task functions 6 년 전
4개의 변경된 파일85개의 추가작업 그리고 36개의 파일을 삭제
  1. 51 1
      .bashrc
  2. 21 5
      .vimrc
  3. 13 3
      i3/config
  4. 0 27
      qutebrowser/config.py

+ 51 - 1
.bashrc

@@ -96,7 +96,7 @@ alias ll='ls -alF'
 alias la='ls -A'
 alias la='ls -A'
 alias l='ls -CF'
 alias l='ls -CF'
 
 
-#More aliases
+# Random tools
 alias ~='cd ~'
 alias ~='cd ~'
 alias etc='cd /etc'
 alias etc='cd /etc'
 alias i3c='vim ~/.config/i3/config'
 alias i3c='vim ~/.config/i3/config'
@@ -107,6 +107,19 @@ alias sensorc='sensors | grep 'Core''
 alias mvim='vim ~/work/2dTalro/main.lua'
 alias mvim='vim ~/work/2dTalro/main.lua'
 alias vimc='vim ~/.vimrc'
 alias vimc='vim ~/.vimrc'
 alias py='python3'
 alias py='python3'
+alias rmd='rm -R'
+
+# Folder aliases
+alias arp='cd /home/liam/work/Atherys/AtherysRoleplay/'
+alias ascript='cd /home/liam/work/Atherys/AtherysScript/'
+alias acode='cd /home/liam/work/Atherys/AtherysCode/'
+alias acore='cd /home/liam/work/Atherys/AtherysCore/'
+alias aquest='cd /home/liam/work/Atherys/AtherysQuests/'
+alias adocs='cd /home/liam/work/Atherys/AtherysDocs/'
+alias adoc='cd /home/liam/work/Atherys/AtherysDoclet/'
+alias alore='cd /home/liam/work/Atherys/AtherysLore/'
+alias anpc='cd /home/liam/work/Atherys/NPCs/'
+alias tal='cd /home/liam/work/Talro'
 
 
 #Git aliases
 #Git aliases
 alias gd='git diff'
 alias gd='git diff'
@@ -114,6 +127,11 @@ alias ga='git add'
 alias gst='git status'
 alias gst='git status'
 alias grm='git rm'
 alias grm='git rm'
 
 
+# fzf alias
+alias vom='vim $(fzf)'
+
+cheat() { curl cheat.sh/"$1"; }
+
 function rex {
 function rex {
 	(cd ~/home-programs/REXPaint-v1.03/; wine REXPaint.exe)
 	(cd ~/home-programs/REXPaint-v1.03/; wine REXPaint.exe)
 }
 }
@@ -138,6 +156,26 @@ function lastlog {
 }
 }
 export -f lastlog
 export -f lastlog
 
 
+TASKFILE="$HOME/.bashtask" #Hidden for neatness
+NC='\033[0m' # No Color
+LIGHTRED='\e[1;31m'
+LIGHTBLUE='\e[1;34m'
+if [ -f "$TASKFILE" ] && [ $(stat -c %s "$TASKFILE") != 0 ] #Check if file has content
+then
+    echo -e "    [${LIGHTRED}Tasks${NC}]     "
+    cat "$TASKFILE"
+    printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' "-"
+else
+    echo "No tasks!"
+    printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' "-"
+    touch "$TASKFILE"
+fi
+alias tasklist="bash"
+function taskadd() { echo "- $1" >> "$TASKFILE"; } #Example: taskadd "Go grocery shopping"
+function taskin() { sed -i "$1i- $2" "$TASKFILE"; } #Insert a task between items
+function taskrm() { sed -i "$1d" "$TASKFILE"; } #Example: taskrm 2 --> Removes second item in list
+function taskcl() { rm "$TASKFILE"; touch "$TASKFILE"; } #Delete and create a new taskfile
+
 # Add an "alert" alias for long running commands.  Use like so:
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
 #   sleep 10; alert
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
@@ -166,6 +204,18 @@ if [ -x /usr/bin/mint-fortune ]; then
      /usr/bin/mint-fortune
      /usr/bin/mint-fortune
 fi
 fi
 
 
+if [[ "$(ping 8.8.8.8 -c1)" == "" ]]; then
+	nmcli dev wifi connect BELL653 password 16AFA94DAA9E
+fi
+
+#if [[ "$SSH_AUTH_SOCK" = "" ]]; then
+    # on the first round, we do this...
+#	exec ssh-agent bash
+#else
+	# ... and when ssh-agent is running, we do this instead.
+#	ssh-add
+#fi
+
 # Coolness
 # Coolness
 export TERM=xterm-256color
 export TERM=xterm-256color
 #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
 #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!

+ 21 - 5
.vimrc

@@ -10,17 +10,21 @@ call vundle#begin()
 " let Vundle manage Vundle, required
 " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'VundleVim/Vundle.vim'
 
 
-" plugin on GitHub repo
-Plugin 'tpope/vim-fugitive'
-
 " Lightline
 " Lightline
 Plugin 'itchyny/lightline.vim'
 Plugin 'itchyny/lightline.vim'
 
 
-" Vimwiki
-Plugin 'vimwiki/vimwiki'
+" Calendar
+Plugin 'itchyny/calendar.vim'
 
 
 " Colorschemes
 " Colorschemes
 Plugin 'flazz/vim-colorschemes'
 Plugin 'flazz/vim-colorschemes'
+Plugin 'arcticicestudio/nord-vim'
+
+" fzf
+Plugin 'junegunn/fzf'
+
+" Markdown
+Plugin 'gabrielelana/vim-markdown'
 
 
 " Install L9 and avoid a Naming conflict if you've already installed a
 " Install L9 and avoid a Naming conflict if you've already installed a
 " different version somewhere else.
 " different version somewhere else.
@@ -32,14 +36,20 @@ filetype plugin indent on    " required
 " To ignore plugin indent changes, instead use:
 " To ignore plugin indent changes, instead use:
 "filetype plugin on
 "filetype plugin on
 
 
+" Vim-markdown configuration
+let g:vim_markdown_folding_disabled = 1
+set conceallevel=2
+
 " Stuff for lightline
 " Stuff for lightline
 set laststatus=2
 set laststatus=2
 set timeoutlen=1000 ttimeoutlen =0
 set timeoutlen=1000 ttimeoutlen =0
 
 
 " Aesthetic
 " Aesthetic
 set number
 set number
+set relativenumber
 colo molokai
 colo molokai
 set tabstop=4
 set tabstop=4
+set shiftwidth=4
 syntax on
 syntax on
 set nocompatible
 set nocompatible
 set scrolloff=8
 set scrolloff=8
@@ -77,5 +87,11 @@ imap <C-a> <esc>0i
 " map semi-colon to colon for quick commands
 " map semi-colon to colon for quick commands
 map ; :
 map ; :
 
 
+" map movement to move up single lines
+map j gj
+map k gk
+
+inoremap jk <esc>
+
 " Switch to the right window (the file)
 " Switch to the right window (the file)
 au VimEnter * wincmd l
 au VimEnter * wincmd l

+ 13 - 3
i3/config

@@ -60,6 +60,9 @@ bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 bindsym $mod+Right focus right
 
 
+#Screenshot
+bindsym $mod+Shift+s exec scrot -s 'screenshot_%Y%m%d_%H%M%S.png' -e 'mkdir -p ~/Pictures/screenshots && mv $f ~/Pictures/screenshots && xclip -selection clipboard -t image/png -i ~/Pictures/screenshots/`ls -1 -t ~/Pictures/screenshots | head -1`' 
+
 # move focused window
 # move focused window
 bindsym $mod+Shift+j move left
 bindsym $mod+Shift+j move left
 bindsym $mod+Shift+k move down
 bindsym $mod+Shift+k move down
@@ -127,6 +130,9 @@ bindsym $mod+0 workspace $ws10
 bindsym $mod+0x2e workspace next_on_output
 bindsym $mod+0x2e workspace next_on_output
 bindsym $mod+0x2c workspace prev_on_output
 bindsym $mod+0x2c workspace prev_on_output
 
 
+bindsym $mod+Shift+0x2e move window to output right
+bindsym $mod+Shift+0x2c move window to output left
+
 # move focused container to workspace
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace $ws1
 bindsym $mod+Shift+1 move container to workspace $ws1
 bindsym $mod+Shift+2 move container to workspace $ws2
 bindsym $mod+Shift+2 move container to workspace $ws2
@@ -141,16 +147,19 @@ bindsym $mod+Shift+0 move container to workspace $ws10
 
 
 # assigning workspaces
 # assigning workspaces
 assign [class="qutebrowser"] $ws3
 assign [class="qutebrowser"] $ws3
+assign [class="Firefox"] $ws3
 assign [class="Steam"] $ws5
 assign [class="Steam"] $ws5
 assign [class="kate"] $ws2
 assign [class="kate"] $ws2
 assign [class="jetbrains-idea-ce"] $ws2
 assign [class="jetbrains-idea-ce"] $ws2
 assign [class="Gimp"] $ws4
 assign [class="Gimp"] $ws4
 assign [class="net-minecraft-bootstrap-Bootstrap"] $ws6
 assign [class="net-minecraft-bootstrap-Bootstrap"] $ws6
 assign [class="Phoenix"] $ws6
 assign [class="Phoenix"] $ws6
+assign [class="Code"] $ws2
+assign [class="love"] $ws2
 
 
 #Brightness
 #Brightness
-bindsym XF86MonBrightnessUp exec xbacklight -inc 1
-bindsym XF86MonBrightnessDown exec xbacklight -dec 1
+bindsym XF86MonBrightnessUp exec xbacklight -inc 5
+bindsym XF86MonBrightnessDown exec xbacklight -dec 5
 
 
 # reload the configuration file
 # reload the configuration file
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+c reload
@@ -227,6 +236,7 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle 
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle 
 
 
 #Setup
 #Setup
-exec_always feh --randomize --bg-scale ~/Pictures/Backgrounds/Seafoam/*
+#exec_always ~/home-programs/i3-autodisplay
+exec_always ~/.config/i3/set-screens.sh
 exec terminator -p Breezy
 exec terminator -p Breezy
 exec i3 fullscreen toggle
 exec i3 fullscreen toggle

+ 0 - 27
qutebrowser/config.py

@@ -1,27 +0,0 @@
-# Autogenerated config.py
-# Documentation:
-#   qute://help/configuring.html
-#   qute://help/settings.html
-
-# Uncomment this to still load settings configured via autoconfig.yml
-# config.load_autoconfig()
-
-# Background color of unselected even tabs.
-# Type: QtColor
-
-bg_unselected = '#C45254'
-bg_selected = '#53C07C'
-c.colors.tabs.even.bg = bg_unselected
-
-# Background color of unselected odd tabs.
-# Type: QtColor
-c.colors.tabs.odd.bg = bg_unselected
-
-# Background color of selected even tabs.
-# Type: QtColor
-c.colors.tabs.selected.even.bg = bg_selected
-
-# Background color of selected odd tabs.
-# Type: QtColor
-c.colors.tabs.selected.odd.bg = bg_selected
-