summaryrefslogtreecommitdiffstats
path: root/jeschli/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'jeschli/2configs')
-rw-r--r--jeschli/2configs/IM.nix56
-rw-r--r--jeschli/2configs/default.nix72
-rw-r--r--jeschli/2configs/emacs.nix121
-rw-r--r--jeschli/2configs/git.nix78
-rw-r--r--jeschli/2configs/officevpn.nix19
-rw-r--r--jeschli/2configs/os-templates/CentOS-7-64bit.nix16
-rw-r--r--jeschli/2configs/retiolum.nix26
-rw-r--r--jeschli/2configs/steam.nix12
-rw-r--r--jeschli/2configs/tests/dummy-secrets/empty0
-rw-r--r--jeschli/2configs/urxvt.nix39
-rw-r--r--jeschli/2configs/vim.nix151
-rw-r--r--jeschli/2configs/virtualbox.nix23
-rw-r--r--jeschli/2configs/xdg.nix14
-rw-r--r--jeschli/2configs/xserver/Xmodmap.nix27
-rw-r--r--jeschli/2configs/xserver/Xresources.nix56
-rw-r--r--jeschli/2configs/xserver/default.nix130
-rw-r--r--jeschli/2configs/xserver/xserver.conf.nix40
-rw-r--r--jeschli/2configs/zsh.nix138
18 files changed, 0 insertions, 1018 deletions
diff --git a/jeschli/2configs/IM.nix b/jeschli/2configs/IM.nix
deleted file mode 100644
index 288134fa..00000000
--- a/jeschli/2configs/IM.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-with (import <stockholm/lib>);
-{ config, lib, pkgs, ... }:
-let
- tmux = pkgs.writeDashBin "tmux" ''
- export TERM=xterm-256color
- exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" ''
- set-option -g default-terminal screen-256color
- ''} "$@"
- '';
-in {
-
- services.bitlbee = {
- enable = true;
- portNumber = 6666;
- plugins = [
- pkgs.bitlbee-facebook
- pkgs.bitlbee-steam
- pkgs.bitlbee-discord
- ];
- libpurple_plugins = [ pkgs.telegram-purple ];
- };
-
- users.extraUsers.chat = {
- home = "/home/chat";
- uid = genid "chat";
- useDefaultShell = true;
- createHome = true;
- openssh.authorizedKeys.keys = with config.krebs.users; [
- jeschli.pubkey
- jeschli-bln.pubkey
- jeschli-brauerei.pubkey
- ];
- packages = [ tmux ];
- };
-
-
- systemd.services.chat = {
- description = "chat environment setup";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
-
- restartIfChanged = false;
-
- path = [
- pkgs.rxvt_unicode.terminfo
- ];
-
- serviceConfig = {
- User = "chat";
- RemainAfterExit = true;
- Type = "oneshot";
- ExecStart = "${tmux}/bin/tmux -2 new-session -d -s IM ${pkgs.weechat}/bin/weechat";
- ExecStop = "${tmux}/bin/tmux kill-session -t IM";
- };
- };
-}
diff --git a/jeschli/2configs/default.nix b/jeschli/2configs/default.nix
deleted file mode 100644
index 5aaabe24..00000000
--- a/jeschli/2configs/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-{
- imports = [
- ./vim.nix
- ./retiolum.nix
- ./zsh.nix
- <stockholm/lass/2configs/security-workarounds.nix>
- {
- environment.variables = {
- NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
- };
- }
- ];
-
- nixpkgs.config.allowUnfree = true;
-
- environment.systemPackages = with pkgs; [
- #stockholm
- git
- gnumake
- jq
- parallel
- proot
- populate
-
- # aliases
- (writeDashBin "irc" "ssh chat@enklave -t tmux a")
-
- #style
- most
- rxvt_unicode.terminfo
-
- #monitoring tools
- htop
- iotop
-
- #network
- iptables
- iftop
-
- #stuff for dl
- aria2
-
- #neat utils
- file
- kpaste
- krebspaste
- mosh
- pciutils
- psmisc
- # q
- # rs
- tmux
- untilport
- usbutils
- # logify
- goify
-
- #unpack stuff
- p7zip
- unzip
- unrar
-
- (pkgs.writeDashBin "sshn" ''
- ${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"
- '')
- ];
-
- krebs.enable = true;
- networking.hostName = config.krebs.build.host.name;
-}
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
deleted file mode 100644
index 4f5b690f..00000000
--- a/jeschli/2configs/emacs.nix
+++ /dev/null
@@ -1,121 +0,0 @@
-{ config, pkgs, ... }:
-
-let
- packageRepos = ''
- (require 'package) ;; You might already have this line
- (let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
- (not (gnutls-available-p))))
- (url (concat (if no-ssl "http" "https") "://melpa.org/packages/")))
- (add-to-list 'package-archives (cons "melpa" url) t)
- (add-to-list 'package-archives
- '("org" . "http://orgmode.org/elpa/") t)
- )
- (when (< emacs-major-version 24)
- ;; For important compatibility libraries like cl-lib
- (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
- (package-initialize)
- '';
-
- evilMode = ''
- ;; Evil Mode
- (require 'evil)
- (evil-mode 1)
- ;; (require 'evil-org)
- ;; (add-hook 'org-mode-hook 'evil-org-mode)
- ;; (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
- ;; (require 'evil-org-agenda)
- ;; (evil-org-agenda-set-keys)
- '';
-
- goMode = ''
- (add-to-list 'exec-path "~/go/bin")
- (add-hook 'go-mode-hook
- (lambda ()
- (setq-default)
- (setq tab-width 2)
- (setq standard-indent 2)
- (setq indent-tabs-mode nil)))
- '';
-
- ido = ''
- (require 'ido)
- (ido-mode t)
- '';
-
- windowCosmetics = ''
- (menu-bar-mode -1)
- (tool-bar-mode -1) ; Disable the button bar atop screen
- (scroll-bar-mode -1) ; Disable scroll bar
- (toggle-scroll-bar -1)
- (setq inhibit-startup-screen t) ; Disable startup screen with graphics
- (setq-default indent-tabs-mode nil) ; Use spaces instead of tabs
- (setq default-tab-width 2) ; Two spaces is a tab
- (setq tab-width 2) ; Four spaces is a tab
- (setq visible-bell nil) ; Disable annoying visual bell graphic
- (setq ring-bell-function 'ignore) ; Disable super annoying audio bell
- '';
-
- orgMode = ''
- (add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\|txt\\)$" . org-mode))
- (global-set-key "\C-cl" 'org-store-link)
- (global-set-key "\C-ca" 'org-agenda)
- (global-set-key "\C-cb" 'org-iswitchb)
- (global-set-key "\C-c L" 'org-insert-link-global)
- (global-set-key "\C-c o" 'org-open-at-point-global)
- (setq org-link-frame-setup '((file . find-file))) ; open link in same frame.
- (if (boundp 'org-user-agenda-files)
- (setq org-agenda-files org-user-agenda-files)
- (setq org-agenda-files (quote ("~/projects/notes")))
- )
- '';
-
- theme = ''
- (load-theme 'monokai-alt t)
- '';
-
- recentFiles = ''
- (recentf-mode 1)
- (setq recentf-max-menu-items 25)
- (global-set-key "\C-x\ \C-r" 'recentf-open-files)
- '';
-
- dotEmacs = pkgs.writeText "dot-emacs" ''
- ${evilMode}
- ${goMode}
- ${ido}
- ${packageRepos}
- ${orgMode}
- ${recentFiles}
- ${theme}
- ${windowCosmetics}
- '';
-
- emacsWithCustomPackages = (pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [
- epkgs.melpaPackages.ag
- epkgs.melpaPackages.evil
- epkgs.melpaStablePackages.magit
- epkgs.melpaPackages.nix-mode
- epkgs.melpaPackages.go-mode
- epkgs.melpaPackages.haskell-mode
- epkgs.melpaPackages.google-this
- epkgs.melpaPackages.monokai-alt-theme
- epkgs.melpaPackages.rust-mode
- ]);
-
- myEmacs = pkgs.writeDashBin "my-emacs" ''
- exec ${emacsWithCustomPackages}/bin/emacs -q -l ${dotEmacs} "$@"
- '';
-
- myEmacsWithDaemon = pkgs.writeDashBin "my-emacs-daemon" ''
- exec ${emacsWithCustomPackages}/bin/emacs -q -l ${dotEmacs} --daemon
- '';
-
- myEmacsClient = pkgs.writeDashBin "meclient" ''
- exec ${emacsWithCustomPackages}/bin/emacsclient --create-frame
- '';
-
-in {
- environment.systemPackages = [
- myEmacs myEmacsWithDaemon myEmacsClient
- ];
-}
diff --git a/jeschli/2configs/git.nix b/jeschli/2configs/git.nix
deleted file mode 100644
index a2602278..00000000
--- a/jeschli/2configs/git.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-let
-
- out = {
- services.nginx.enable = true;
- krebs.git = {
- enable = true;
- cgit = {
- settings = {
- root-title = "public repositories at ${config.krebs.build.host.name}";
- root-desc = "keep calm and engage";
- };
- enable = true;
- };
- repos = mapAttrs (_: s: removeAttrs s ["collaborators"]) repos;
- rules = rules;
- };
-
- krebs.iptables.tables.filter.INPUT.rules = [
- { predicate = "-i retiolum -p tcp --dport 80"; target = "ACCEPT"; }
- ];
- };
-
- repos = public-repos;
-
- rules = concatMap make-rules (attrValues repos);
-
- public-repos = mapAttrs make-public-repo {
- stockholm = {
- cgit.desc = "Bonbon aus Git - die ganze Nacht";
- };
- krebs-page = {
- cgit.desc = "Die Krebs Page";
- };
- xmonad-stockholm = {
- cgit.desc = "XMonad Stockholm";
- };
- };
-
- make-public-repo = name: { cgit ? {}, ... }: {
- inherit cgit name;
- public = true;
- hooks = {
- post-receive = pkgs.git-hooks.irc-announce {
- channel = "#xxx";
- nick = config.krebs.build.host.name;
- refs = [
- "refs/heads/master"
- ];
- server = "irc.r";
- verbose = true;
- };
- };
- };
-
- make-rules =
- with git // config.krebs.users;
- repo:
- singleton {
- user = [ jeschli jeschli-brauerei];
- repo = [ repo ];
- perm = push "refs/*" [ non-fast-forward create delete merge ];
- } ++
- optional repo.public {
- user = attrValues config.krebs.users;
- repo = [ repo ];
- perm = fetch;
- } ++
- optional (length (repo.collaborators or []) > 0) {
- user = repo.collaborators;
- repo = [ repo ];
- perm = fetch;
- };
-
-in out
diff --git a/jeschli/2configs/officevpn.nix b/jeschli/2configs/officevpn.nix
deleted file mode 100644
index eb0477d5..00000000
--- a/jeschli/2configs/officevpn.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- nixpkgs.config.packageOverrides = pkgs: {
- openvpn = pkgs.openvpn.override { pkcs11Support = true; useSystemd = false;};
- };
-
- environment.systemPackages = with pkgs; [
- opensc
- openvpn
- yubikey-manager
- ];
-
- services.pcscd.enable = true;
-
- # To start the vpn manually execute
- # $ openvpn --config clien.ovpn
-}
-
diff --git a/jeschli/2configs/os-templates/CentOS-7-64bit.nix b/jeschli/2configs/os-templates/CentOS-7-64bit.nix
deleted file mode 100644
index fb34e94e..00000000
--- a/jeschli/2configs/os-templates/CentOS-7-64bit.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-_:
-
-{
- imports = [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ];
-
- boot.loader.grub = {
- device = "/dev/sda";
- splashImage = null;
- };
- boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
-
- fileSystems."/" = {
- device = "/dev/sda1";
- fsType = "ext4";
- };
-}
diff --git a/jeschli/2configs/retiolum.nix b/jeschli/2configs/retiolum.nix
deleted file mode 100644
index f2260965..00000000
--- a/jeschli/2configs/retiolum.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
- krebs.tinc.retiolum = {
- enable = true;
- connectTo = [
- "prism"
- "gum"
- "ni"
- "dishfire"
- "enklave"
- ];
- };
-
- nixpkgs.config.packageOverrides = pkgs: {
- tinc = pkgs.tinc_pre;
- };
-
- networking.firewall.allowedTCPPorts = [ 80 655 ];
- networking.firewall.allowedUDPPorts = [ 655 ];
-
- environment.systemPackages = [
- pkgs.tinc
- ];
-}
diff --git a/jeschli/2configs/steam.nix b/jeschli/2configs/steam.nix
deleted file mode 100644
index 06a068a3..00000000
--- a/jeschli/2configs/steam.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
- nixpkgs.config.steam.java = true;
- environment.systemPackages = with pkgs; [
- steam
- ];
- hardware.opengl.driSupport32Bit = true;
-
- #ports for inhome streaming
-}
diff --git a/jeschli/2configs/tests/dummy-secrets/empty b/jeschli/2configs/tests/dummy-secrets/empty
deleted file mode 100644
index e69de29b..00000000
--- a/jeschli/2configs/tests/dummy-secrets/empty
+++ /dev/null
diff --git a/jeschli/2configs/urxvt.nix b/jeschli/2configs/urxvt.nix
deleted file mode 100644
index 4049a47a..00000000
--- a/jeschli/2configs/urxvt.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-{
- options.jeschliFontSize = mkOption {
- type = types.int;
- default = 12;
- };
- config = {
- services.urxvtd.enable = true;
- krebs.xresources.enable = true;
- krebs.xresources.resources.urxvt = ''
- *foreground: rgb:a8/a8/a8
- *background: rgb:00/00/00
- *faceName: DejaVu Sans Mono
- *faceSize: ${toString config.jeschliFontSize}
- *color0: rgb:00/00/00
- *color1: rgb:a8/00/00
- *color2: rgb:00/a8/00
- *color3: rgb:a8/54/00
- *color4: rgb:26/8b/d2
- *color5: rgb:a8/00/a8
- *color6: rgb:00/a8/a8
- *color7: rgb:a8/a8/a8
- *color8: rgb:54/54/54
- *color9: rgb:fc/54/54
- *color10: rgb:54/fc/54
- *color11: rgb:fc/fc/54
- *color12: rgb:54/54/fc
- *color13: rgb:fc/54/fc
- *color14: rgb:54/fc/fc
- *color15: rgb:fc/fc/fc
-
- URxvt*scrollBar: false
- URxvt*urgentOnBell: true
- URxvt*font: xft:DejaVu Sans Mono:pixelsize=${toString config.jeschliFontSize}
- URXvt*faceSize: ${toString config.jeschliFontSize}
- '';
- };
-}
diff --git a/jeschli/2configs/vim.nix b/jeschli/2configs/vim.nix
deleted file mode 100644
index 586016f6..00000000
--- a/jeschli/2configs/vim.nix
+++ /dev/null
@@ -1,151 +0,0 @@
-{ config, pkgs, ... }:
-
-with import <stockholm/lib>;
-let
- customPlugins.vim-javascript = pkgs.vimUtils.buildVimPlugin {
- name = "vim-javascript";
- src = pkgs.fetchFromGitHub {
- owner = "pangloss";
- repo = "vim-javascript";
- rev = "1.2.5.1";
- sha256 = "08l7ricd3j5h2bj9i566byh39v9n5wj5mj75f2c8a5dsc732b2k7";
- };
- };
- customPlugins.vim-jsx = pkgs.vimUtils.buildVimPlugin {
- name = "vim-jsx";
- src = pkgs.fetchFromGitHub {
- owner = "mxw";
- repo = "vim-jsx";
- rev = "5b968dfa512c57c38ad7fe420f3e8ab75a73949a";
- sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
- };
- };
- customPlugins.vim-fileline = pkgs.vimUtils.buildVimPlugin {
- name = "file-line-1.0";
- src = pkgs.fetchFromGitHub {
- owner = "bogado";
- repo = "file-line";
- rev = "1.0";
- sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
- };
- };
-in {
- environment.systemPackages = [
- (pkgs.vim_configurable.customize {
- name = "vim";
- vimrcConfig.customRC = let
- colorscheme = ''colorscheme molokai'';
- highlightTrailingWhiteSpaces = ''
- au Syntax * syn match Garbage containedin=ALL /\s\+$/
- '';
- setStatements = ''
- set autowrite
- set clipboard=unnamedplus
- set listchars=trail:¶
- set mouse=a
- set nocompatible
- set path+=**
- set ruler
- set undodir=$HOME/.vim/undo "directory where the undo files will be stored
- set undofile "turn on the feature
- set wildignore+=*.o,*.class,*.hi,*.dyn_hi,*.dyn_o
- set wildmenu
- '';
- remapStatements = ''
- imap jk <Esc>
- map gr :GoRun<Enter> " Map gr to execute go run
- map tt :GoTest<Enter> " Map tt to execute go test
- map nf :NERDTreeToggle<CR>
- nnoremap <C-TAB> <c-w><c-w>
- nnoremap <S-TAB> :bnext<CR>
- noremap x "_x
- vmap v v
- '';
- settingsForGo = ''
- let g:go_decls_includes = "func,type"
- let g:go_def_mode = 'godef'
- let g:go_fmt_command = "goimports"
- let g:go_highlight_extra_types = 1
- let g:go_highlight_fields = 1
- let g:go_highlight_functions = 1
- let g:go_highlight_methods = 1
- let g:go_highlight_types = 1
- let g:go_list_type = "quickfix"
- let g:go_metalinter_autosave = 1
- let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
- let g:go_snippet_case_type = "camelcase"
- let g:go_test_timeout = '10s'
- let g:jsx_ext_required = 0
- let g:molokai_original = 1
- let g:rehash256 = 1
- '';
- settingsForElm = ''
- let g:polyglot_disabled = ['elm']
- let g:elm_detailed_complete = 1
- let g:elm_format_autosave = 1
- let g:elm_syntastic_show_warnings = 1
- '';
- in ''
- ${colorscheme}
- ${highlightTrailingWhiteSpaces}
- ${remapStatements}
- ${setStatements}
- ${settingsForElm}
- ${settingsForGo}
- " dont expand tabs in go files and show it with four whitespaces.
- autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
- '';
- vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
- vimrcConfig.vam.pluginDictionaries = [
- { names = [
- "ctrlp"
- "easymotion"
- "elm-vim"
- "vim-fileline"
- "molokai"
- "nerdtree"
- "snipmate"
- "surround"
- "Syntastic"
- "undotree"
- ];
- }
- { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
- { names = [ "vim-go" ]; ft_regex = "^go\$"; } # wanted: nsf/gocode
- { names = [ "vim-javascript" ]; ft_regex = "^js\$"; }
- { names = [ "vim-jsx" ]; ft_regex = "^js\$"; }
- ];
- })
- ];
-
- # set up the directories up if they are not there.
-# Needs to be changed.
-# vim = let
-# dirs = {
-# backupdir = "$HOME/.cache/vim/backup";
-# swapdir = "$HOME/.cache/vim/swap";
-# undodir = "$HOME/.cache/vim/undo";
-# };
-# files = {
-# viminfo = "$HOME/.cache/vim/info";
-# };
-#
-# mkdirs = let
-# dirOf = s: let out = concatStringsSep "/" (init (splitString "/" s));
-# in assert out != ""; out;
-# alldirs = attrValues dirs ++ map dirOf (attrValues files);
-# in unique (sort lessThan alldirs);
-# in
-# pkgs.symlinkJoin {
-# name = "vim";
-# paths = [
-# (pkgs.writeDashBin "vim" ''
-# set -efu
-# (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
-# exec ${pkgs.vim}/bin/vim "$@"
-# '')
-# pkgs.vim
-# ];
-# };
-
-}
diff --git a/jeschli/2configs/virtualbox.nix b/jeschli/2configs/virtualbox.nix
deleted file mode 100644
index c9bb8c41..00000000
--- a/jeschli/2configs/virtualbox.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-
-let
- mainUser = config.users.extraUsers.jeschli;
-
-in {
- #services.virtualboxHost.enable = true;
- virtualisation.virtualbox.host.enable = true;
-
- users.extraUsers = {
- virtual = {
- name = "virtual";
- description = "user for running VirtualBox";
- home = "/home/virtual";
- useDefaultShell = true;
- extraGroups = [ "vboxusers" "audio" ];
- createHome = true;
- };
- };
- security.sudo.extraConfig = ''
- ${mainUser.name} ALL=(virtual) NOPASSWD: ALL
- '';
-}
diff --git a/jeschli/2configs/xdg.nix b/jeschli/2configs/xdg.nix
deleted file mode 100644
index 18bac9b3..00000000
--- a/jeschli/2configs/xdg.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
- environment.variables.XDG_RUNTIME_DIR = "/run/xdg/$LOGNAME";
-
- systemd.tmpfiles.rules = let
- forUsers = flip map users;
- isUser = { name, group, ... }:
- name == "root" || hasSuffix "users" group;
- users = filter isUser (mapAttrsToList (_: id) config.users.users);
- in forUsers (u: "d /run/xdg/${u.name} 0700 ${u.name} ${u.group} -");
-}
diff --git a/jeschli/2configs/xserver/Xmodmap.nix b/jeschli/2configs/xserver/Xmodmap.nix
deleted file mode 100644
index d2b1b260..00000000
--- a/jeschli/2configs/xserver/Xmodmap.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-pkgs.writeText "Xmodmap" ''
- !keycode 66 = Caps_Lock
- !remove Lock = Caps_Lock
- clear Lock
-
- ! caps lock
- keycode 66 = Mode_switch
-
- keycode 13 = 4 dollar EuroSign cent
- keycode 30 = u U udiaeresis Udiaeresis
- keycode 32 = o O odiaeresis Odiaeresis
- keycode 38 = a A adiaeresis Adiaeresis
- keycode 39 = s S ssharp
-
- keycode 33 = p P Greek_pi Greek_PI
- keycode 46 = l L Greek_lambda Greek_LAMBDA
-
- keycode 54 = c C cacute Cacute
-
- ! BULLET OPERATOR
- keycode 17 = 8 asterisk U2219
- keycode 27 = r R r U211D
-''
diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix
deleted file mode 100644
index ebe7159f..00000000
--- a/jeschli/2configs/xserver/Xresources.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-pkgs.writeText "Xresources" /* xdefaults */ ''
- Xcursor.theme: aero-large-drop
- Xcursor.size: 128
-
- URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
- URxvt*eightBitInput: false
- URxvt*font: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
- URxvt*boldFont: -*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1
- URxvt*scrollBar: false
- URxvt*background: #050505
- URxvt*foreground: #d0d7d0
- URxvt*cursorColor: #f042b0
- URxvt*cursorColor2: #f0b000
- URxvt*cursorBlink: off
- URxvt*jumpScroll: true
- URxvt*allowSendEvents: false
- URxvt*charClass: 33:48,37:48,45-47:48,64:48,38:48,61:48,63:48
- URxvt*cutNewline: False
- URxvt*cutToBeginningOfLine: False
- URxvt*font: xft:Monospace:size=12
- URxvt*font: xft:Monospace:size=12:bold
- URxvt*color0: #232342
- URxvt*color3: #c07000
- URxvt*color4: #4040c0
- URxvt*color7: #c0c0c0
- URxvt*color8: #707070
- URxvt*color9: #ff6060
- URxvt*color10: #70ff70
- URxvt*color11: #ffff70
- URxvt*color12: #7070ff
- URxvt*color13: #ff50ff
- URxvt*color14: #70ffff
- URxvt*color15: #ffffff
-
- URxvt*iso14755: False
-
- URxvt*urgentOnBell: True
- URxvt*visualBell: True
-
- ! ref https://github.com/muennich/urxvt-perls
- URxvt*perl-ext: default,url-select
- URxvt*keysym.M-u: perl:url-select:select_next
- URxvt*url-select.underline: true
- URxvt*colorUL: #4682B4
- URxvt.perl-lib: ${pkgs.urxvt_perls}/lib/urxvt/perl
- URxvt*saveLines: 10000
-
- root-urxvt*background: #230000
- root-urxvt*foreground: #e0c0c0
- root-urxvt*BorderColor: #400000
- root-urxvt*color0: #800000
-''
diff --git a/jeschli/2configs/xserver/default.nix b/jeschli/2configs/xserver/default.nix
deleted file mode 100644
index 44c35ca3..00000000
--- a/jeschli/2configs/xserver/default.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-{ config, pkgs, ... }@args:
-with import <stockholm/lib>;
-let
- cfg = {
- cacheDir = cfg.dataDir;
- configDir = "/var/empty";
- dataDir = "/run/xdg/${cfg.user.name}/xmonad";
- user = config.krebs.users.jeschli;
- };
-in {
-
- environment.systemPackages = [
- pkgs.font-size
- pkgs.gitAndTools.qgit
- pkgs.mpv
- pkgs.sxiv
- pkgs.xdotool
- pkgs.xsel
- pkgs.zathura
- ];
-
- fonts.fonts = [
- pkgs.xlibs.fontschumachermisc
- ];
-
- # TODO dedicated group, i.e. with a single user [per-user-setuid]
- # TODO krebs.setuid.slock.path vs /run/wrappers/bin
- krebs.setuid.slock = {
- filename = "${pkgs.slock}/bin/slock";
- group = "wheel";
- envp = {
- DISPLAY = ":${toString config.services.xserver.display}";
- USER = cfg.user.name;
- };
- };
-
- systemd.services.display-manager.enable = false;
-
- systemd.services.xmonad = {
- wantedBy = [ "multi-user.target" ];
- requires = [ "xserver.service" ];
- environment = {
- DISPLAY = ":${toString config.services.xserver.display}";
-
- XMONAD_CACHE_DIR = cfg.cacheDir;
- XMONAD_CONFIG_DIR = cfg.configDir;
- XMONAD_DATA_DIR = cfg.dataDir;
-
- XMONAD_STARTUP_HOOK = pkgs.writeDash "xmonad-startup-hook" ''
- ${pkgs.xorg.xhost}/bin/xhost +LOCAL: &
- ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
- ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
- ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
- ${config.services.xserver.displayManager.sessionCommands}
- if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" ""
- fi
- export DBUS_SESSION_BUS_ADDRESS
- ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY DBUS_SESSION_BUS_ADDRESS
- wait
- '';
-
- # XXX JSON is close enough :)
- XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [
- "dashboard" # we start here
- "stockholm"
- "pycharm"
- "chromium"
- "iRC"
- "git"
- "hipbird"
- ]);
- };
- serviceConfig = {
- SyslogIdentifier = "xmonad";
- ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${toString [
- "\${XMONAD_CACHE_DIR}"
- "\${XMONAD_CONFIG_DIR}"
- "\${XMONAD_DATA_DIR}"
- ]}";
- ExecStart = "${pkgs.xmonad-jeschli}/bin/xmonad";
- ExecStop = "${pkgs.xmonad-jeschli}/bin/xmonad --shutdown";
- User = cfg.user.name;
- WorkingDirectory = cfg.user.home;
- };
- };
-
- systemd.services.xserver = {
- after = [
- "systemd-udev-settle.service"
- "local-fs.target"
- "acpid.service"
- ];
- reloadIfChanged = true;
- environment = {
- XKB_BINDIR = "${pkgs.xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
- XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
- LD_LIBRARY_PATH = concatStringsSep ":" (
- [ "${pkgs.xorg.libX11}/lib" "${pkgs.xorg.libXext}/lib" ]
- ++ concatLists (catAttrs "libPath" config.services.xserver.drivers));
- };
- serviceConfig = {
- SyslogIdentifier = "xserver";
- ExecReload = "${pkgs.coreutils}/bin/echo NOP";
- ExecStart = toString [
- "${pkgs.xorg.xorgserver}/bin/X"
- ":${toString config.services.xserver.display}"
- "vt${toString config.services.xserver.tty}"
- "-config ${import ./xserver.conf.nix args}"
- "-logfile /dev/null -logverbose 0 -verbose 3"
- "-nolisten tcp"
- "-xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb"
- ];
- };
- };
-
- systemd.services.urxvtd = {
- wantedBy = [ "multi-user.target" ];
- reloadIfChanged = true;
- serviceConfig = {
- SyslogIdentifier = "urxvtd";
- ExecReload = "${pkgs.coreutils}/bin/echo NOP";
- ExecStart = "${pkgs.rxvt_unicode}/bin/urxvtd";
- Restart = "always";
- RestartSec = "2s";
- StartLimitBurst = 0;
- User = cfg.user.name;
- };
- };
-}
diff --git a/jeschli/2configs/xserver/xserver.conf.nix b/jeschli/2configs/xserver/xserver.conf.nix
deleted file mode 100644
index 6f34e015..00000000
--- a/jeschli/2configs/xserver/xserver.conf.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-let
- cfg = config.services.xserver;
-in
-
-pkgs.stdenv.mkDerivation {
- name = "xserver.conf";
-
- xfs = optionalString (cfg.useXFS != false)
- ''FontPath "${toString cfg.useXFS}"'';
-
- inherit (cfg) config;
-
- buildCommand =
- ''
- echo 'Section "Files"' >> $out
- echo $xfs >> $out
-
- for i in ${toString config.fonts.fonts}; do
- if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
- for j in $(find $i -name fonts.dir); do
- echo " FontPath \"$(dirname $j)\"" >> $out
- done
- fi
- done
-
- for i in $(find ${toString cfg.modules} -type d); do
- if test $(echo $i/*.so* | wc -w) -ne 0; then
- echo " ModulePath \"$i\"" >> $out
- fi
- done
-
- echo 'EndSection' >> $out
-
- echo "$config" >> $out
- '';
-}
diff --git a/jeschli/2configs/zsh.nix b/jeschli/2configs/zsh.nix
deleted file mode 100644
index 0f6775ef..00000000
--- a/jeschli/2configs/zsh.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
- environment.systemPackages = [ pkgs.fzf ];
- programs.zsh = {
- enable = true;
- shellInit = ''
- #disable config wizard
- zsh-newuser-install() { :; }
- '';
- interactiveShellInit = ''
- setopt autocd extendedglob
- bindkey -e
-
- #history magic
- bindkey "" up-line-or-local-history
- bindkey "" down-line-or-local-history
-
- up-line-or-local-history() {
- zle set-local-history 1
- zle up-line-or-history
- zle set-local-history 0
- }
- zle -N up-line-or-local-history
- down-line-or-local-history() {
- zle set-local-history 1
- zle down-line-or-history
- zle set-local-history 0
- }
- zle -N down-line-or-local-history
-
- setopt share_history
- setopt hist_ignore_dups
- # setopt inc_append_history
- bindkey '^R' history-incremental-search-backward
-
- #C-x C-e open line in editor
- autoload -z edit-command-line
- zle -N edit-command-line
- bindkey "^X^E" edit-command-line
-
- #fzf inclusion
- source ${pkgs.fzf}/share/fzf/completion.zsh
- source ${pkgs.fzf}/share/fzf/key-bindings.zsh
-
- #completion magic
- autoload -Uz compinit
- compinit
- zstyle ':completion:*' menu sel