summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--Xresources/.Xresources53
-rw-r--r--emacs/.doom.d/config.el (renamed from doom.d/config.el)0
-rw-r--r--emacs/.doom.d/config.local.el0
-rw-r--r--emacs/.doom.d/init.el (renamed from doom.d/init.el)0
-rw-r--r--emacs/.doom.d/init.local.el0
-rw-r--r--emacs/.doom.d/packages.el (renamed from doom.d/packages.el)0
-rw-r--r--emacs/.doom.d/packages.local.el0
m---------emacs/.emacs.d0
-rw-r--r--old/Xresources (renamed from Xresources)0
-rw-r--r--old/Xresources-aji (renamed from Xresources-aji)0
-rw-r--r--old/Xresources-orange (renamed from Xresources-orange)0
-rw-r--r--old/Xresources-pincer (renamed from Xresources-pincer)0
-rw-r--r--test-vm.nix5
m---------zgen0
-rw-r--r--zsh/.zshenv4
-rw-r--r--zsh/.zshrc (renamed from zsh/dot-zshrc)0
-rw-r--r--zsh/dot-zshenv5
18 files changed, 64 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index 2874323..86e21b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "zsh/zsh/pure"]
path = zsh/.zsh/pure
url = https://github.com/sindresorhus/pure.git
+[submodule "emacs/.emacs.d"]
+ path = emacs/.emacs.d
+ url = https://github.com/hlissner/doom-emacs
diff --git a/Xresources/.Xresources b/Xresources/.Xresources
new file mode 100644
index 0000000..9501ece
--- /dev/null
+++ b/Xresources/.Xresources
@@ -0,0 +1,53 @@
+*customization: -color
+urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true:hinting=true
+!urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true
+! urxvt*font: xft:fira code:pixelsize=22:antialias=true:hinting=true
+!urxvt*letterSpace: -5
+!urxvt*font: xft:fira code:pixelsize=22:antialias=true
+!urxvt*font: xft:inconsolata:size=18:antialias=true
+urxvt*scrollBar: false
+URxvt*termName: xterm-256color
+Xterm*termName: xterm-256color
+
+Xcursor.size: 24
+
+Xft.lcdfilter: lcddefault
+Xft.dpi: 96
+Xft.antialias: true
+Xft.rgba: rgb
+Xft.hinting: true
+Xft.hintstyle: hintslight
+
+
+URxvt.keysym.M-c: perl:clipboard:copy
+URxvt.keysym.M-v: perl:clipboard:paste
+URxvt.saveLines: 40000
+
+URxvt.perl-ext-common: default,matcher,resize-font,clipboard
+URxvt.clipboard.autocopy: true
+URxvt.resize-font.smaller: C-Down
+URxvt.resize-font.bigger: C-Up
+URxvt.iso14755: false
+URxvt.iso14755_52: false
+URxvt.url-launcher: /usr/bin/xdg-open
+URxvt.matcher.button: 1
+
+urxvt*foreground: white
+urxvt*background: black
+
+*color0: #2E3436
+*color1: #a40000
+*color2: #4E9A06
+*color3: #C4A000
+*color4: #3465A4
+*color5: #75507B
+*color6: #ce5c00
+*color7: #babdb9
+*color8: #555753
+*color9: #EF2929
+*color10: #8AE234
+*color11: #FCE94F
+*color12: #729FCF
+*color13: #AD7FA8
+*color14: #fcaf3e
+*color15: #EEEEEC
diff --git a/doom.d/config.el b/emacs/.doom.d/config.el
index 676f9d4..676f9d4 100644
--- a/doom.d/config.el
+++ b/emacs/.doom.d/config.el
diff --git a/emacs/.doom.d/config.local.el b/emacs/.doom.d/config.local.el
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/emacs/.doom.d/config.local.el
diff --git a/doom.d/init.el b/emacs/.doom.d/init.el
index 4a887c9..4a887c9 100644
--- a/doom.d/init.el
+++ b/emacs/.doom.d/init.el
diff --git a/emacs/.doom.d/init.local.el b/emacs/.doom.d/init.local.el
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/emacs/.doom.d/init.local.el
diff --git a/doom.d/packages.el b/emacs/.doom.d/packages.el
index 95c7e51..95c7e51 100644
--- a/doom.d/packages.el
+++ b/emacs/.doom.d/packages.el
diff --git a/emacs/.doom.d/packages.local.el b/emacs/.doom.d/packages.local.el
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/emacs/.doom.d/packages.local.el
diff --git a/emacs/.emacs.d b/emacs/.emacs.d
new file mode 160000
+Subproject bba035a1a2000f1df9ee907040e1eccbee5bc94
diff --git a/Xresources b/old/Xresources
index 0653342..0653342 100644
--- a/Xresources
+++ b/old/Xresources
diff --git a/Xresources-aji b/old/Xresources-aji
index 61ee782..61ee782 100644
--- a/Xresources-aji
+++ b/old/Xresources-aji
diff --git a/Xresources-orange b/old/Xresources-orange
index 0169c37..0169c37 100644
--- a/Xresources-orange
+++ b/old/Xresources-orange
diff --git a/Xresources-pincer b/old/Xresources-pincer
index d90a24d..d90a24d 100644
--- a/Xresources-pincer
+++ b/old/Xresources-pincer
diff --git a/test-vm.nix b/test-vm.nix
index 359e081..343c73f 100644
--- a/test-vm.nix
+++ b/test-vm.nix
@@ -61,7 +61,10 @@ in
'';
serviceConfig = {
User = "orbekk";
+ Type = "oneshot";
+ RemainAfterExit = true;
};
- wantedBy = ["default.target" "display-manager.service"];
+ requiredBy = ["default.target" ];
+ before = ["display-manager.service"];
};
}
diff --git a/zgen b/zgen
-Subproject 09f542515e20ac655a4aa429cf9604fe698ccf4
+Subproject 0b669d2d0dcf788b4c81a7a30b4fa41dfbf7d1a
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644
index 0000000..37adc73
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,4 @@
+export EDITOR=nvim
+export TERMINAL=urxvt
+export EMACSDIR=$HOME/.emacs.d
+PATH="$HOME/bin:$HOME/.emacs.d/bin:$PATH"
diff --git a/zsh/dot-zshrc b/zsh/.zshrc
index bc1bb37..bc1bb37 100644
--- a/zsh/dot-zshrc
+++ b/zsh/.zshrc
diff --git a/zsh/dot-zshenv b/zsh/dot-zshenv
deleted file mode 100644
index 6c6fb69..0000000
--- a/zsh/dot-zshenv
+++ /dev/null
@@ -1,5 +0,0 @@
-export EDITOR=nvim
-export TERMINAL=urxvt
-
-typeset -U path PATH
-path=("$HOME/bin" "$path[@]")