From fbda89db58763f1720b7cef468e77060ab9e624e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Hangh=C3=B8j=20Iversen?= Date: Wed, 20 Feb 2019 23:40:23 +0100 Subject: [PATCH] Mainly move things around --- X11/Xresources | 3 +++ {Xresources => X11}/general | 0 {Xresources => X11}/theme/custom | 0 {Xresources => X11}/theme/monokai-dark | 0 {Xresources => X11}/theme/solarized-dark | 0 {Xresources => X11}/theme/solarized-light | 0 {Xresources => X11}/urxvt | 0 {xinit => X11}/xinitrc | 2 +- Xresources/init | 4 ---- environment.d/environment.conf | 2 ++ git.config | 7 ------- git/config | 1 - git-projects.yaml => git/git-projects.yaml | 0 install.hs | 1 - xinitrc | 12 ------------ zsh/config | 3 +-- zsh/profile | 3 --- 17 files changed, 7 insertions(+), 31 deletions(-) create mode 100644 X11/Xresources rename {Xresources => X11}/general (100%) rename {Xresources => X11}/theme/custom (100%) rename {Xresources => X11}/theme/monokai-dark (100%) rename {Xresources => X11}/theme/solarized-dark (100%) rename {Xresources => X11}/theme/solarized-light (100%) rename {Xresources => X11}/urxvt (100%) rename {xinit => X11}/xinitrc (91%) delete mode 100644 Xresources/init delete mode 100644 git.config rename git-projects.yaml => git/git-projects.yaml (100%) delete mode 100755 xinitrc delete mode 100644 zsh/profile diff --git a/X11/Xresources b/X11/Xresources new file mode 100644 index 0000000..f6002a3 --- /dev/null +++ b/X11/Xresources @@ -0,0 +1,3 @@ +#include "general" +#include "urxvt" +#include "theme/monokai-dark" diff --git a/Xresources/general b/X11/general similarity index 100% rename from Xresources/general rename to X11/general diff --git a/Xresources/theme/custom b/X11/theme/custom similarity index 100% rename from Xresources/theme/custom rename to X11/theme/custom diff --git a/Xresources/theme/monokai-dark b/X11/theme/monokai-dark similarity index 100% rename from Xresources/theme/monokai-dark rename to X11/theme/monokai-dark diff --git a/Xresources/theme/solarized-dark b/X11/theme/solarized-dark similarity index 100% rename from Xresources/theme/solarized-dark rename to X11/theme/solarized-dark diff --git a/Xresources/theme/solarized-light b/X11/theme/solarized-light similarity index 100% rename from Xresources/theme/solarized-light rename to X11/theme/solarized-light diff --git a/Xresources/urxvt b/X11/urxvt similarity index 100% rename from Xresources/urxvt rename to X11/urxvt diff --git a/xinit/xinitrc b/X11/xinitrc similarity index 91% rename from xinit/xinitrc rename to X11/xinitrc index 7b3d979..7b603a8 100755 --- a/xinit/xinitrc +++ b/X11/xinitrc @@ -6,7 +6,7 @@ nm-applet & # emacs --daemon setxkbmap -option grp:win_space_toggle -layout us,dk -xrdb -merge ~/.Xresources +xrdb -merge $XDG_CONFIG_HOME/X11/Xresources # This is now controlled from systemd - should consider using a proper # session manager. # acpid diff --git a/Xresources/init b/Xresources/init deleted file mode 100644 index 49dc12c..0000000 --- a/Xresources/init +++ /dev/null @@ -1,4 +0,0 @@ -#include ".config/Xresources/general" -#include ".config/Xresources/urxvt" -#include ".config/Xresources/theme/monokai-dark" - diff --git a/environment.d/environment.conf b/environment.d/environment.conf index d82946b..3c56afb 100644 --- a/environment.d/environment.conf +++ b/environment.d/environment.conf @@ -13,3 +13,5 @@ EDITOR="emacsclient -c -a ''" HISTFILE="$XDG_DATA_HOME/zsh/history" HISTSIZE=100000 SAVEHIST=100000 +XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc +XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc \ No newline at end of file diff --git a/git.config b/git.config deleted file mode 100644 index 646ffce..0000000 --- a/git.config +++ /dev/null @@ -1,7 +0,0 @@ -[user] - email = fhi.1990@gmail.com - name = Frederik Hanghøj Iversen - signkey = 7B95683D8994C3BFF599784A6A3245752F02B908 - signingkey = 7B95683D8994C3BFF599784A6A3245752F02B908 -[core] - excludesfile = /home/fredefox/.config/git/ignore diff --git a/git/config b/git/config index a7f2fb2..046ee71 100644 --- a/git/config +++ b/git/config @@ -3,7 +3,6 @@ email = fhi.1990@gmail.com [core] excludesfile = /home/fredefox/.config/git/ignore - editor = emacs -nw [github] user = fredefox [gitlab] diff --git a/git-projects.yaml b/git/git-projects.yaml similarity index 100% rename from git-projects.yaml rename to git/git-projects.yaml diff --git a/install.hs b/install.hs index d8bf22c..9f5c47f 100755 --- a/install.hs +++ b/install.hs @@ -52,7 +52,6 @@ getLinks home = std <> absolute ] absolute = [ ".emacs.d" |> ".config/emacs" - , ".gitconfig" |> ".config/git/config" , ".urxvt" |> ".config/urxvt" , ".xinitrc" |> ".config/xinit/xinitrc" , ".xsession" |> ".xinitrc" diff --git a/xinitrc b/xinitrc deleted file mode 100755 index f0b4c40..0000000 --- a/xinitrc +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# Daemons -# Perhaps this sort of thing belongs elsewhere? -nm-applet - - -setxkbmap -option grp:win_space_toggle -layout us,dk -xrdb -merge ~/.Xresources - -# Nice for urxvt, not so nice for emacs: -# autocutsel -f diff --git a/zsh/config b/zsh/config index 86174aa..1b86c7c 100644 --- a/zsh/config +++ b/zsh/config @@ -1,7 +1,6 @@ # Begin compinstall zstyle :compinstall filename '/home/fredefox/.zshrc' -autoload -Uz compinit -compinit -d "$XDG_DATA_HOME/zsh/zcompdump-$HOST-$ZSH_VERSION" +autoload -Uz compinit -d "$XDG_DATA_HOME/zsh/zcompdump-$HOST-$ZSH_VERSION" # End compinstall setopt appendhistory extendedglob diff --git a/zsh/profile b/zsh/profile deleted file mode 100644 index 1b09f69..0000000 --- a/zsh/profile +++ /dev/null @@ -1,3 +0,0 @@ -if [ -d "$HOME/.config/environment" ] ; then - source $HOME/.config/environment -fi