瀏覽代碼

Merge branch 'i3-enhanced'

DricomDragon 5 年之前
父節點
當前提交
519bb549eb
共有 7 個文件被更改,包括 24 次插入21 次删除
  1. 3 1
      Install/README.md
  2. 10 0
      Install/Templates/10-keyboard.conf
  3. 0 15
      Install/Templates/i3/config
  4. 1 1
      Install/Templates/keyboard
  5. 5 1
      Install/dvp-install
  6. 2 2
      Install/i3-install
  7. 3 1
      Install/ui-install

+ 3 - 1
Install/README.md

@@ -28,9 +28,11 @@ execute `localtime_set`
 
 ## UI installation
 
+execute `ui-install`
+
 execute `i3-install`
 
-execute `ui-install`
+execute `dvp-install`
 
 manually sync with firefox
 

+ 10 - 0
Install/Templates/10-keyboard.conf

@@ -0,0 +1,10 @@
+# Enable dvorak and compose key for X11
+# Should be at `/etc/X11/xorg.conf.d/`
+
+Section "InputClass"
+    Identifier "system-keyboard"
+    MatchIsKeyboard "on"
+    Option "XkbLayout" "us"
+    Option "XkbVariant" "dvp"
+    Option "XkbOptions" "compose:ralt"
+EndSection

+ 0 - 15
Install/Templates/i3/config

@@ -1,14 +1,6 @@
 # i3 config file (v4)
 #
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
-#
-# This config file uses keycodes (bindsym) and was written for the QWERTY
-# layout.
-#
-# To get a config file with the same key positions, but for your current
-# layout, use the i3-config-wizard
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
 
 set $mod Mod4
 
@@ -20,13 +12,6 @@ font pango:monospace 8
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
 #font pango:DejaVu Sans Mono 8
 
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
 # use these keys for focus, movement, and resize directions when reaching for
 # the arrows is not convenient
 set $up k

+ 1 - 1
Install/Templates/keyboard

@@ -5,6 +5,6 @@
 XKBMODEL="pc105"
 XKBLAYOUT="us"
 XKBVARIANT="dvp"
-XKBOPTIONS="compose:less"
+XKBOPTIONS="compose:ralt"
 
 BACKSPACE="guess"

+ 5 - 1
Install/dvp-install

@@ -1,6 +1,10 @@
 #!/bin/usr/fish
 
-# Install programming dvorak keyboard
+# Install programming dvorak keyboard in terminal
 ## !!! CHECK YOUR XKMODEL !!!
 ## Set programming dvorak layout everywhere
 sudo cp Templates/keyboard /etc/default/keyboard
+
+# Install programming dvorak keyboard in X11
+sudo mkdir -p /etc/X11/xorg.conf.d/
+sudo cp Templates/10-keyboard.conf /etc/X11/xorg.conf.d/

+ 2 - 2
Install/i3-install

@@ -1,6 +1,6 @@
 #!/bin/usr/fish
-
-sudo apt install i3
+# Install i3 config
+# You must have installed the i3 package before
 
 mkdir ~/.i3
 cp ./Templates/i3/config ~/.i3/

+ 3 - 1
Install/ui-install

@@ -2,4 +2,6 @@
 
 # Graphic environment installation
 
-sudo apt install redshift ;
+## Windows manager
+## Install config with another script
+sudo apt install i3 ;