From 60d6a1eae914709331061615db10b4d4b7c25bcd Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 26 Oct 2018 12:03:18 +0200 Subject: j brauerei: add and cleanup old shellAliases --- jeschli/1systems/brauerei/config.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index e419e35b..b3142601 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -32,11 +32,16 @@ nixpkgs.config.allowUnfree = true; environment.shellAliases = { - n = "nix-shell"; - stocki = pkgs.writeDash "deploy" '' - cd ~/stockholm - exec nix-shell -I stockholm="$PWD" --run 'deploy --system="brauerei"' - ''; + # git aliases + ga = "git add"; + gch = "git checkout"; + gco = "git commit"; + gp = "git push"; + gr = "git rebase"; + gs = "git status"; + # nix aliases + ns = "nix-shell"; + # krops deploy = pkgs.writeDash "deploy" '' set -eu export SYSTEM="$1" -- cgit v1.2.3 From 8b9808e208d6f9e8a9a0ddf34e633c84f1951481 Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 26 Oct 2018 12:04:49 +0200 Subject: j brauerei: add/cleanup systemPackages --- jeschli/1systems/brauerei/config.nix | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index b3142601..54ac6461 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -50,15 +50,17 @@ }; environment.systemPackages = with pkgs; [ - # system helper + # system helper + acpi ag - curl copyq + curl dmenu git i3lock keepass networkmanagerapplet + pavucontrol rsync terminator tmux @@ -66,16 +68,17 @@ # editors emacs # internet - thunderbird chromium + firefox google-chrome + thunderbird # programming languages elixir elmPackages.elm exercism - go gcc ghc + go python35 python35Packages.pip (vagrant.override { @@ -89,23 +92,24 @@ }); }; }) - # go tools - golint - gotools - # rust - cargo - rustc # dev tools gnumake + jetbrains.goland jetbrains.pycharm-professional jetbrains.webstorm - jetbrains.goland # document viewer evince zathura + # go tools + golint + gotools + # rust + cargo + rustc + # orga tools + taskwarrior # xorg xorg.xbacklight - taskwarrior ]; # Some programs need SUID wrappers, can be configured further or are -- cgit v1.2.3 From 0d344f3bd964d0af91ec978ea9300c1ce1713744 Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 26 Oct 2018 12:05:30 +0200 Subject: j brauerei: enable docker --- jeschli/1systems/brauerei/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 54ac6461..6f4dbf66 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -123,6 +123,8 @@ # Enable the OpenSSH daemon. services.openssh.enable = true; + virtualisation.docker.enable = true; + services.xserver = { # Don't install feh into systemPackages -- cgit v1.2.3 From 16c5e5ce48a113048449bc0aeec0f821c10812bf Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 26 Oct 2018 12:06:31 +0200 Subject: j brauerei: add christopher to dev user --- jeschli/1systems/brauerei/config.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 6f4dbf66..4c07da6e 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -160,6 +160,7 @@ config.krebs.users.lass.pubkey "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDB0d0JA20Vqn7I4lCte6Ne2EOmLZyMJyS9yIKJYXNLjbLwkQ4AYoQKantPBkTxR75M09E7d3j5heuWnCjWH45TrfQfe1EOSSC3ppCI6C6aIVlaNs+KhAYZS0m2Y8WkKn+TT5JLEa8yybYVN/RlZPOilpj/1QgjU6CQK+eJ1k/kK+QFXcwN82GDVh5kbTVcKUNp2tiyxFA+z9LY0xFDg/JHif2ROpjJVLQBJ+YPuOXZN5LDnVcuyLWKThjxy5srQ8iDjoxBg7dwLHjby5Mv41K4W61Gq6xM53gDEgfXk4cQhJnmx7jA/pUnsn2ZQDeww3hcc7vRf8soogXXz2KC9maiq0M/svaATsa9Ul4hrKnqPZP9Q8ScSEAUX+VI+x54iWrnW0p/yqBiRAzwsczdPzaQroUFTBxrq8R/n5TFdSHRMX7fYNOeVMjhfNca/gtfw9dYBVquCvuqUuFiRc0I7yK44rrMjjVQRcAbw6F8O7+04qWCmaJ8MPlmApwu2c05VMv9hiJo5p6PnzterRSLCqF6rIdhSnuOwrUIt1s/V+EEZXHCwSaNLaQJnYL0H9YjaIuGz4c8kVzxw4c0B6nl+hqW5y5/B2cuHiumnlRIDKOIzlv8ufhh21iN7QpIsPizahPezGoT1XqvzeXfH4qryo8O4yTN/PWoA+f7o9POU7L6hQ== lhebendanz@nixos" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEZgHR1ZPDBMUjGWar/QmI2GiUkZM8pAXRyBDh8j3hGlxlS+0lsBV6bTAI5F13iyzTC4pCuEuDO2OlFB0scwjcOATci8phd8jTjOIDodqDaeQZXbshyuUBfyiAV6q0Sc+cUDV3D6GhzigH3t8EiQmvXmUGm916yFotT12o0dm83SCOh1nAf9ZveC1Hz/eEUTvgWvIb58OdUR5F/S5OVBnIIJZ8tcp0BP9lyjjJCcANWkYJlwaVcNNb0UarCRhvRtptFj+e/EPqQxSCaS2QcxW4zBsQ6C81TFf7WrdH+pwtFg0owlWsxv547sRLLiPf2h2YuQgSoAaW24N0SHhUqvOXd+JyaYw7MAF8Qh3jHm2iJQRgXNuIN0msFi1alwAevilL2mnfAt2biQ9sS9g+CVvQCwX3mg09E4Y3UmFLzvsJafD9meKVrjnDCcXySeAfts59eFmwKtMQ0qrEWaclzUiA6Ay3uD1zma8x1XELGTf8nxnXCGl8s2i2APn7y1Tcwep69DlENWSaReF5zBLIkCtIUDd+8xBFTF3yu5CpyRrRMKGa0QX/MtsQl4SGJWadOTwpM8joIbrIVfKkTNB2McxAjvo0iaRoBDm409gi2Ycy+NSoUV/KAIUG7OysAQZ62hr+E/Kw1ocJCIVI+9vzKx/EnEIHkCSwhYKl5393W7CShVJjJUcKcZddqX2smSShXq8rXPzhIHk1dAVn5Ff/vGZT9z9R0QN3z6Oa9QN5t5TjTdUDToqHTudqOpDxPl2c2yXK9wV+aoHFoML9AmbzTT1U1mKU7GXSoFACiKNzhDzkovyJGpWRyvisX5t75IfuVqvGGI8n3u8OhPMdyyOHRylVaciDzBMZ00xnIHB+dJG9IeYaMm9bW1Li4Jo0CWnogo2+olfHPMLijBuu+bsa5Kp6kFkccJYR/xqcSq0lVXkpGm692JI4dnMGjchipXEGh1gXof9jXHemMMBwjpLFGty+D0r5KdA33m+mIqc9hi0ShquA9nA7E1IxDlgE0gQg+P5ZOeeIN7q54AQmT8iCCCRyne2Kw57XxaGgZoLfj7VjjaeRlzBUglmtyq8B7/c0J3y41vt9Hxhj4sKD+vufZu+M9E6E936KsJlIi+3U0PtopM/b8L4jcH1JYpPljapsys8wkJZ1ymHf6Kj/0FHyi1V+GvquiVrlFN+aHECIzNlCiSMO4MqfPUO1A+s9zkG2ZgPNNv+LoZqnokjbmKM4kdxexMxaL/Eo9Nd/bzdYiFYXlllEL7Uox+yV0N3loQ2juh4zn+ctCnwHi+V9X4l4rB8amW96WrXiJ/WqEK2UO8St8dcQWhCsUUm2OawSrbYYZw5HhJwz/Rhz2UsdSc56s5OUiQLJqpILYvCnqSLlF4iZdRSdDQNpKn+le3CeGUl5UUuvK2BpKGrbPKx0i/2ZSEMxNA5GnDMx/NyiNyDBcoPu/XOlNi8VWsEbCtoTQRamvqHjOmNcPrxCxds+TaF8c0wMR720yj5sWq8= jeschli@nixos" + "ssh-rsa AAAAB4NzaC1yc2EAAAADAQABAAACAQC1x9+OtNfwv6LxblnLHeBElxoxLfaYUyvqMrBgnrlkaPjylPv711bvPslnt+YgdPsZQLCoQ2t5f0x0j7ZOMYE9eyRrnr67ITO+Od05u3eCypWOZulekkDL0ZDeYdvoZKOWnbKWnQVRfYuLOEL/g5/9E7MLtIdID8e98b/qHzs/+wmuuDR3zHCNic0BKixgET/EgFvLWezWxJ6D/TTv/5sDAfrC+RUN8ad14sxjKIkS3nkAlm8bhrCxQKaHLUcCJWiweW0gPWYSlp64VHS5lchvqCJlPYQdx0XbwolvlLYru0w74ljLbi3eL35GFFyHSeEjQ73EtVwo53uVKTy7SAORU7JNg6xL9H3ChOLOknN9oHs1K7t/maMsATle0HAFcTuaOhELUmHM8dCJh3nPVWIkzHQ4o3fyaogrpt7/V5j6R1/Ozn7P9n4OdqrjiaWqHlz/XHeYNNWte+a0EW+NubC83yS0Cu3uhZ36C3RET2vNM25CyYOBn4ccClAozayQIb6Cif0tCafMRPgkSlogQd8+SqNZpTnmtllIT3VnT5smgrufy6HETDkrHjApDrsqLtMCFY83RFwt4QLv/L93O7IsGifzmEfD9qD7YBSMNs8ihBIUXPk9doHXvYS506YroxWOxe/C0rzzbaogxQT6JMd1ozfXitRD9v7iBIFAT4Kzjw== christopher.kilian@dcso.de" ]; }; -- cgit v1.2.3 From 921483a7e64692d95bd9e7656d6439fc39695e21 Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 2 Nov 2018 09:36:02 +0100 Subject: j refactor: remove comments --- jeschli/1systems/brauerei/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 0edf2367..047da871 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -1,4 +1,3 @@ -# Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, lib, ... }: { imports = [ -- cgit v1.2.3 From fa84ae1d229da9206feec2ea2ceffa9d3d788a58 Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 2 Nov 2018 09:37:31 +0100 Subject: j brauerei: add new aliases --- jeschli/1systems/brauerei/config.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 047da871..8e96cb8a 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -31,10 +31,15 @@ nixpkgs.config.allowUnfree = true; environment.shellAliases = { + # emacs aliases + ed = "emacsclient"; + edc = "emacsclient --create-frame"; # git aliases ga = "git add"; gch = "git checkout"; gco = "git commit"; + gf = "git fetch"; + gm = "git merge"; gp = "git push"; gr = "git rebase"; gs = "git status"; -- cgit v1.2.3 From 17039f28bc669ccf2a45a9fbdcb76a6b72c0ca97 Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 2 Nov 2018 09:38:58 +0100 Subject: j brauerei: remove comments --- jeschli/1systems/brauerei/config.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 8e96cb8a..6ef52e2f 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -130,9 +130,6 @@ virtualisation.docker.enable = true; services.xserver = { - - # Don't install feh into systemPackages - # refs desktopManager.session = lib.mkForce []; displayManager.lightdm.enable = lib.mkForce false; displayManager.job.execCmd = lib.mkForce "derp"; @@ -143,7 +140,6 @@ dpi = 144; -# videoDrivers = [ "nvidia" ]; synaptics = { enable = true; twoFingerScroll = true; -- cgit v1.2.3 From 423e2fd2d90eb89dd1a26b6a08deb79836c1d34c Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 29 Jan 2019 19:28:21 +0100 Subject: j brauerei: add jeschli-xmonad and option to choose gnome3, xfce. +emacs as service --- jeschli/1systems/brauerei/config.nix | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 6ef52e2f..6b1e9eda 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -1,12 +1,12 @@ { config, pkgs, lib, ... }: +let + xmonad-jeschli = pkgs.callPackage { inherit config; }; +in { imports = [ ./hardware-configuration.nix - - - ]; @@ -126,25 +126,29 @@ # Enable the OpenSSH daemon. services.openssh.enable = true; + services.emacs.enable = true; virtualisation.docker.enable = true; services.xserver = { - desktopManager.session = lib.mkForce []; - displayManager.lightdm.enable = lib.mkForce false; - displayManager.job.execCmd = lib.mkForce "derp"; - enable = true; - display = lib.mkForce 11; - tty = lib.mkForce 11; - dpi = 144; + desktopManager = { + xfce.enable = true; + gnome3.enable = true; + }; - synaptics = { - enable = true; - twoFingerScroll = true; - accelFactor = "0.035"; + windowManager = { + session = [{ + name = "xmonad"; + start = '' + ${xmonad-jeschli}/bin/xmonad & + waitPID=$! + ''; + } + ]; }; + }; users.extraUsers.jeschli = { # TODO: define as krebs.users -- cgit v1.2.3 From 65dac8da5b213bd659a606043dfe483e74bb8f7d Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 29 Jan 2019 19:30:20 +0100 Subject: j brauerei: remove git aliases --- jeschli/1systems/brauerei/config.nix | 9 --------- 1 file changed, 9 deletions(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 6b1e9eda..e8702dd8 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -34,15 +34,6 @@ in # emacs aliases ed = "emacsclient"; edc = "emacsclient --create-frame"; - # git aliases - ga = "git add"; - gch = "git checkout"; - gco = "git commit"; - gf = "git fetch"; - gm = "git merge"; - gp = "git push"; - gr = "git rebase"; - gs = "git status"; # nix aliases ns = "nix-shell"; # krops -- cgit v1.2.3 From 0c6bfdde88a5292b1929f20b3c8c3605f91a6b13 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 29 Jan 2019 19:31:09 +0100 Subject: j brauerei: refactor: rearrange block --- jeschli/1systems/brauerei/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index e8702dd8..877d4f7e 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -42,7 +42,7 @@ in export SYSTEM="$1" $(nix-build $HOME/stockholm/jeschli/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy) ''; - }; + }; environment.systemPackages = with pkgs; [ # system helper -- cgit v1.2.3 From b44967f69582f54081c756480e8012dcee361204 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 29 Jan 2019 19:31:42 +0100 Subject: j brauerei: add tokei --- jeschli/1systems/brauerei/config.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 877d4f7e..d342acb6 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -105,6 +105,15 @@ in taskwarrior # xorg xorg.xbacklight + # tokei + tokei = overrideDerivation super.tokei (old: { + patches = old.patches or [] ++ [ + (self.fetchurl { + url = https://github.com/4z3/tokei/commit/c27529c.patch; + sha256 = "1rdw8bk379cav603ryrb57yfkvk2z8wavfw9prfh01agk3ml693x"; + }) + ]; + }); ]; # Some programs need SUID wrappers, can be configured further or are -- cgit v1.2.3 From 4a9e9eee620a436820fc9aa0d2b1c8549b440a8f Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 5 Feb 2019 19:19:09 +0100 Subject: j brauerei: remove commented dead code --- jeschli/1systems/brauerei/config.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index d342acb6..f7f54529 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -7,6 +7,9 @@ in ./hardware-configuration.nix +# +# +# ]; @@ -147,8 +150,17 @@ in ''; } ]; - }; +# xmonad = { +# enable = true; +# enableContribAndExtras = true; +# extraPackages = haskellPackages: [ +# haskellPackages.xmonad-contrib +# haskellPackages.xmonad-extras +# haskellPackages.xmonad +# ]; +# } + }; }; users.extraUsers.jeschli = { # TODO: define as krebs.users -- cgit v1.2.3 From d9f9d2d0d6c356568b6f92c10bc959206e78fc87 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 5 Feb 2019 19:19:29 +0100 Subject: j brauerei: remove not working tokei override --- jeschli/1systems/brauerei/config.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index f7f54529..7ac4cc2c 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -109,14 +109,7 @@ in # xorg xorg.xbacklight # tokei - tokei = overrideDerivation super.tokei (old: { - patches = old.patches or [] ++ [ - (self.fetchurl { - url = https://github.com/4z3/tokei/commit/c27529c.patch; - sha256 = "1rdw8bk379cav603ryrb57yfkvk2z8wavfw9prfh01agk3ml693x"; - }) - ]; - }); + tokei ]; # Some programs need SUID wrappers, can be configured further or are -- cgit v1.2.3 From 86fe3366393f6dc14a40f76a40abcd56736a5a92 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 26 Feb 2019 21:48:20 +0100 Subject: j brauerei: -rustc (provoided by rustup) --- jeschli/1systems/brauerei/config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 7ac4cc2c..f0f8b9ef 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -103,7 +103,9 @@ in gotools # rust cargo - rustc + rustracer + rustup + vscode # orga tools taskwarrior # xorg -- cgit v1.2.3 From 33e85b86d86e535200651b61406535feec4bad5f Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 26 Feb 2019 21:50:30 +0100 Subject: j brauerei: -xmomad (is part of windowManager sessionnow ) --- jeschli/1systems/brauerei/config.nix | 9 --------- 1 file changed, 9 deletions(-) (limited to 'jeschli/1systems/brauerei/config.nix') diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index f0f8b9ef..ecf40a61 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -145,15 +145,6 @@ in ''; } ]; -# xmonad = { -# enable = true; -# enableContribAndExtras = true; -# extraPackages = haskellPackages: [ -# haskellPackages.xmonad-contrib -# haskellPackages.xmonad-extras -# haskellPackages.xmonad -# ]; -# } }; }; -- cgit v1.2.3