Bladeren bron

Symlink config

And reorganize template files in sections
DricomDragon 4 jaren geleden
bovenliggende
commit
3449abcfa4
32 gewijzigde bestanden met toevoegingen van 43 en 27 verwijderingen
  1. 1 0
      Install/Templates/config/README.md
  2. 0 0
      Install/Templates/config/alacritty/alacritty.yml
  3. 0 0
      Install/Templates/config/fish/README.md
  4. 0 0
      Install/Templates/config/fish/config.fish
  5. 0 0
      Install/Templates/config/fish/functions/fish_prompt.fish
  6. 0 0
      Install/Templates/config/fish/functions/fish_right_prompt.fish
  7. 0 0
      Install/Templates/config/fish/functions/fish_title.fish
  8. 0 0
      Install/Templates/config/fish/functions/gg.fish
  9. 0 0
      Install/Templates/config/fish/functions/purpose.fish
  10. 0 0
      Install/Templates/config/fish/functions/updatevim.fish
  11. 0 0
      Install/Templates/config/gitignore
  12. 0 0
      Install/Templates/config/i3/config
  13. 0 0
      Install/Templates/config/i3status/config
  14. 0 0
      Install/Templates/config/screenrc
  15. 0 0
      Install/Templates/examples/config.php
  16. 0 0
      Install/Templates/examples/examples.desktop
  17. 0 0
      Install/Templates/examples/htop_screenrc
  18. 36 0
      Install/Templates/examples/laptop-screenrc
  19. 0 0
      Install/Templates/examples/mediawiki/LocalSettings.php
  20. 0 0
      Install/Templates/examples/postgres_kanboard.sql
  21. 0 0
      Install/Templates/examples/sources.list
  22. 0 0
      Install/Templates/examples/ssh/config
  23. 0 0
      Install/Templates/examples/sshd_config
  24. 0 0
      Install/Templates/examples/vimrc
  25. 0 0
      Install/Templates/system/10-keyboard.conf
  26. 0 0
      Install/Templates/system/99-steam-controller-perms.rules
  27. 1 0
      Install/Templates/X11/xorg.conf
  28. 1 0
      Install/Templates/keyboard
  29. 3 8
      Install/basic-custom
  30. 1 7
      Install/dev-custom
  31. 0 1
      Install/server-custom
  32. 0 11
      Install/ui-custom

+ 1 - 0
Install/Templates/config/README.md

@@ -0,0 +1 @@
+Must rely at `~/.config`

Install/Templates/alacritty/alacritty.yml → Install/Templates/config/alacritty/alacritty.yml


Install/Templates/fish/README.md → Install/Templates/config/fish/README.md


Install/Templates/fish/config.fish → Install/Templates/config/fish/config.fish


Install/Templates/fish/functions/fish_prompt.fish → Install/Templates/config/fish/functions/fish_prompt.fish


Install/Templates/fish/functions/fish_right_prompt.fish → Install/Templates/config/fish/functions/fish_right_prompt.fish


Install/Templates/fish/functions/fish_title.fish → Install/Templates/config/fish/functions/fish_title.fish


Install/Templates/fish/functions/gg.fish → Install/Templates/config/fish/functions/gg.fish


Install/Templates/fish/functions/purpose.fish → Install/Templates/config/fish/functions/purpose.fish


Install/Templates/fish/functions/updatevim.fish → Install/Templates/config/fish/functions/updatevim.fish


Install/Templates/gitignore → Install/Templates/config/gitignore


Install/Templates/i3/config → Install/Templates/config/i3/config


Install/Templates/i3status/config → Install/Templates/config/i3status/config


Install/Templates/screenrc → Install/Templates/config/screenrc


Install/Templates/config.php → Install/Templates/examples/config.php


Install/Templates/examples.desktop → Install/Templates/examples/examples.desktop


Install/Templates/htop_screenrc → Install/Templates/examples/htop_screenrc


+ 36 - 0
Install/Templates/examples/laptop-screenrc

@@ -0,0 +1,36 @@
+# GNU Screen - main configuration file 
+# All other .screenrc files will source this file to inherit settings.
+# Author: Christian Wills - cwills.sys@gmail.com
+
+# Allow bold colors - necessary for some reason
+attrcolor b ".I"
+
+# Tell screen how to set colors. AB = background, AF=foreground
+termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm'
+
+# Enables use of shift-PgUp and shift-PgDn
+termcapinfo xterm|xterms|xs|rxvt ti@:te@
+
+# Erase background with current bg color
+defbce "on"
+
+# Enable 256 color term
+term xterm-256color
+
+# Cache 30000 lines for scroll back
+defscrollback 30000
+
+# Energy information
+backtick 101 30 15 /usr/bin/acpi
+
+hardstatus alwayslastline 
+# Very nice tabbed colored hardstatus line
+hardstatus string '%{= Kd} %{= Kd}%-w%{= Kr}[%{= KW}%n %t%{= Kr}]%{= Kd}%+w %-= %{KG} %H%{KW}|%{KY}%101`%{KW}|%D %M %d %Y%{= Kc} %C%A%{-}'
+
+# change command character from ctrl-a to ctrl-b (emacs users may want this)
+escape ^Hh
+
+# Hide hardstatus: ctrl-a f 
+bind f eval "hardstatus ignore"
+# Show hardstatus: ctrl-a F
+bind F eval "hardstatus alwayslastline"

Install/Templates/mediawiki/LocalSettings.php → Install/Templates/examples/mediawiki/LocalSettings.php


Install/Templates/postgres_kanboard.sql → Install/Templates/examples/postgres_kanboard.sql


Install/Templates/sources.list → Install/Templates/examples/sources.list


Install/Templates/ssh/config → Install/Templates/examples/ssh/config


Install/Templates/sshd_config → Install/Templates/examples/sshd_config


Install/Templates/vimrc → Install/Templates/examples/vimrc


Install/Templates/10-keyboard.conf → Install/Templates/system/10-keyboard.conf


Install/Templates/99-steam-controller-perms.rules → Install/Templates/system/99-steam-controller-perms.rules


+ 1 - 0
Install/Templates/X11/xorg.conf

@@ -1,3 +1,4 @@
+# File to put in `/etc/X11/` folder
 Section "Device"
     Identifier  "0x42"
     Driver      "intel"

+ 1 - 0
Install/Templates/keyboard

@@ -1,4 +1,5 @@
 # KEYBOARD CONFIGURATION FILE
+# Must be at `/etc/default/`
 
 # Consult the keyboard(5) manual page.
 

+ 3 - 8
Install/basic-custom

@@ -1,16 +1,11 @@
 #!/usr/bin/fish
 
-# Customize screen
-
-## Customize pluged in device
-cp --link Templates/screenrc ~/.screenrc
-
-# Install fish customization
-mkdir --parents ~/.config/fish
-cp --recursive --link ./Templates/fish/* ~/.config/fish/
+# Link configuration
+ln --symbolic Templates/config $HOME/.config
 
 # Export environment variables
 set --export --universal JHE 'jovian-hersemeule.eu'
 set --export --universal EDITOR 'vi -e'
 set --export --universal VISUAL vim
 set --export --universal TERMINAL alacritty
+set --export --universal SCREENRC $HOME/.config/screenrc

+ 1 - 7
Install/dev-custom

@@ -12,7 +12,7 @@ git config --global user.name "DricomDragon"
 git config --global core.editor "vim"
 git config --global push.followTags true
 git config --global diff.tool vimdiff
-git config --global core.excludesfile '~/.gitignore'
+git config --global core.excludesfile '~/.config/gitignore'
 
 # Git two-ways merge tool (look for whiteinge/diffconflicts in vimrc)
 git config --global merge.tool diffconflicts
@@ -20,9 +20,3 @@ git config --global mergetool.diffconflicts.cmd 'vim -c DiffConflicts "$MERGED"
 git config --global mergetool.diffconflicts.trustExitCode true
 git config --global mergetool.keepBackup false
 
-# Copy global gitignore
-cp --link ./Templates/gitignore ~/.gitignore
-
-# Create GitWork
-mkdir --parents ~/GitWork/DricomDragon ~/GitWork/CNI ~/GitWork/TestOrg ~/GitWork/BotFactory
-

+ 0 - 1
Install/server-custom

@@ -4,5 +4,4 @@
 
 ## Config server
 sudo cp ./Templates/sshd_config /etc/ssh/
-cp ./Templates/authorized_keys /home/jovian/.ssh/
 

+ 0 - 11
Install/ui-custom

@@ -1,15 +1,4 @@
 #!/usr/bin/fish
 
-# Install i3 config
-# You must have installed the i3 package before
-mkdir --parents ~/.config/i3
-cp --link ./Templates/i3/config ~/.config/i3/
-mkdir --parents ~/.config/i3status
-cp --link ./Templates/i3status/config ~/.config/i3status/
-
-# Customize alacritty configuration
-mkdir --parents $HOME/.config/alacritty
-cp --link Templates/alacritty/alacritty.yml $HOME/.config/alacritty/
-
 # Set default app for Mime-type
 xdg-mime default atril.desktop application/pdf