From df0699de0a718cdd8b98753b80f58e76e1e7eb2a Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 15 Dec 2017 21:30:33 +0100 Subject: l prism.r: enable git for all jeschlis --- lass/1systems/prism/config.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 87270b8b8..a318ce412 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -290,7 +290,11 @@ in { { krebs.git.rules = [ { - user = [ config.krebs.users.jeschli ]; + user = with config.krebs.users; [ + jeschli + jeschli-bln + jeschli-brauerei + ]; repo = [ config.krebs.git.repos.stockholm ]; perm = with git; push "refs/heads/staging/jeschli" [ fast-forward non-fast-forward create delete merge ]; } -- cgit v1.2.3 From 9ba0b86a7b7ce6fa6d6b5976f2c6778324a4ee02 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 15 Dec 2017 21:31:23 +0100 Subject: l helios.r: add /tmp --- lass/1systems/helios/config.nix | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'lass') diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix index b14ef2a3e..03a065d9c 100644 --- a/lass/1systems/helios/config.nix +++ b/lass/1systems/helios/config.nix @@ -20,20 +20,26 @@ with import ; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.kernelModules = [ "kvm-intel" ]; - fileSystems."/" = - { device = "/dev/pool/root"; - fsType = "btrfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1F60-17C6"; - fsType = "vfat"; - }; - - fileSystems."/home" = - { device = "/dev/pool/home"; - fsType = "btrfs"; - }; + fileSystems."/" = { + device = "/dev/pool/root"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/1F60-17C6"; + fsType = "vfat"; + }; + + fileSystems."/home" = { + device = "/dev/pool/home"; + fsType = "btrfs"; + }; + + fileSystems."/tmp" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = ["nosuid" "nodev" "noatime"]; + }; nix.maxJobs = lib.mkDefault 8; } -- cgit v1.2.3 From 9f152f2134ea0f48e9ba7db9d1d16773f26fabcd Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 15 Dec 2017 21:32:02 +0100 Subject: l dcso-dev: add rob --- lass/2configs/dcso-dev.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/dcso-dev.nix b/lass/2configs/dcso-dev.nix index 2b91f91d6..cbf853d64 100644 --- a/lass/2configs/dcso-dev.nix +++ b/lass/2configs/dcso-dev.nix @@ -16,8 +16,9 @@ in { openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey config.krebs.users.lass-android.pubkey - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDhQdDQFMxXOjbC+Avx3mlcFHqQpFUk/q9sO6ATA65jCV3YzN11vhZDDv54hABVS2h8TPXs7Lu3PCvK9qouASd2h4Ie9cExUmn50G/iwgFIODsCugVYBzVt1iwaAdwz1Hb9DKYXbVXanzVJjimmrrlQNvsyZg85lcnfyedpPX5ad+4FdSP68LHqEHC18LTitldR6V4P1omaKHlOtVpDgR/72tDgbtNZDBn3EU+TPk9OLTzjc6PinPw4iIvjEfiu14APwXpFDIqT7P7SjOEFpa0v/1z7dhxIy/Z9XbqyEdUfhv3PjZR5K2C+VzR7g6jVEVR2xFId51MpLv/Un4/lalbphBEw3I90Rr8tatOJiFhyrXbaKTcLqp1sIu05OxdPkm3hzfmLIhoKxhaIlXH7WQ9sAqxL1NAQ7O+J6yT4DMnwKzvpkkJjBaGtV84Pp1cccfNRH8XXID3FkWkrUpdgXWBpyLnRq4ilUJTajkU0GSdXkq8kLL3mWg9LPRTg3dmDj61ZB/qhjM61ppwHJvDRN9WI5HruXIU6nOQjh5yE2C/JZfLcsZD4Y1UDBy5/JSZrCVT2sQjFopkkYEkRCbX7oITHOH4iyRdxZkKWLUPboFrcmBpXO+owCEhO4JZrtfFWMC6qM++nrmiZWOrdIOIvdYHWluhKR2shlkisEKQP5pUqkw== markus.hihn@dcso.de" + config.krebs.users.jeschli-bln.pubkey "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1T5+2epslFARSnETdr4wdolA6ocJaD4H9tmz6BZFQKXlwIq+OMp+sSEdwYwW3Lu9+mNbBHPxVVJDWg/We9DXB0ezXPM5Bs1+FcehmkoGwkmgKaFCDt0sL+CfSnog/3wEkN21O/rQxVFqMmiJ7WUDGci6IKCFZ5ZjOsmmfHg5p3LYxU9xv33fNr2v+XauhrGbFtQ7eDz4kSywxN/aw73LN4d8em0V0UV8VPI3Qkw7MamDFwefA+K1TfK8pBzMeruU6N7HLuNkpkAp7kS+K4Zzd72aQtR37a5qMiFUbOxQ9B7iFypuPx0iu6ZwY1s/sM8t3kLmcDJ9O4FOTzlbpneet3as6iJ+Ckr/TlfKor2Tl5pWcXh2FXHoG8VUu5bYmIViJBrKihAlAQfQN0mJ9fdFTnCXVTtbYTy11s4eEVHgUlb7oSpgBnx5bnBONgApbsOX9zyoo8wz8KkZBcf1SQpkV5br8uUAHCcZtHuY6I3kKlv+8lJmgUipiYzMdTi7+dHa49gVEcEKL4ZnJ0msQkl4XT7JjKETLvumC4/TIqVuRu48wuYalkCR9OzxCsTXQ/msBJBztPdYLrEOXVb2HfzuCT+43UuMQ5rP/EoPy0TWQO9BaqfEXqvbOvWjVxj/GMvglQ2ChZTwHxwwTKB8qRVvJLnbZQwizQiSrkzjb6hRJfQ== u0_a165@localhost" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjtdqRxD0+UU7O8xogSqAQYd/Hrc79CTTKnvbhKy7jp2TVfxQpl81ndSH6DN6Cz90mu65C+DFGq43YtKTPqXmTn1+2wru71C2UOl6ZR0tmU7UELkRt4SJuFQLEgQCt3BWvXJPye6cKRRIlb+XZHWyVyCDxHo9EYO2GWI1wIP8mHMltKj65mobHY+R0CJNhhwlFURzTto8C30ejfVg2OW81qkNWqYtpdC9txLUlQ9/LBVKrafHGprmcBEp9qtecVgx8kxHpS7cuQNYoFcfljug4IyFO+uBfdbKqnGM5mra3huNhX3+AcQxKbLMlRgZD+jc47Xs+s5qSvWBou2ygd5T413k/SDOTCxDjidA+dcwzRo0qUWcGL201a5g+F0EvWv8rjre9m0lii6QKEoPyj60y3yfaIHeafels1Ia1FItjkBe8XydiXf7rKq8nmVRlpo8vl+vKwVuJY783tObHjUgBtXJdmnyYGiXxkxSrXa2mQhPz3KodK/QrnqCP27dURcMlp1hFF3LxFz7WtMCLW0yvDuUsuI2pdq0+zdt702wuwXVNIvbq/ssvX/CL8ryBLAogaxN9DN0vpjk+aXQLn11Zt99MgmnnqUgvOKQi1Quog/SxnSBiloKqB6aA10a28Uxoxkr0KAfhWhX3XPpfGMlbVj4GJuevLp0sGDVQT2biUQ== rhaist@RH-NB" ]; packages = with pkgs; [ emacs25-nox -- cgit v1.2.3 From b0a14795b53588788361d34faea13a8a41be018c Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 15 Dec 2017 21:33:56 +0100 Subject: l domsen: cleanup websites --- lass/2configs/websites/domsen.nix | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'lass') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 6fbd4d0df..9ece2af77 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -26,15 +26,6 @@ in { ./default.nix ./sqlBackup.nix (servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ]) - (servePage [ - "karlaskop.de" - "www.karlaskop.de" - ]) - (servePage [ "makeup.apanowicz.de" ]) - (servePage [ - "pixelpocket.de" - "www.pixelpocket.de" - ]) (servePage [ "habsys.de" "habsys.eu" @@ -48,22 +39,18 @@ in { "nirwanabluete.de" "aldonasiech.com" "ubikmedia.eu" - "facts.cloud" "youthtube.xyz" - "illucloud.eu" - "illucloud.de" - "illucloud.com" "joemisch.com" + "weirdwednesday.de" + "www.apanowicz.de" "www.nirwanabluete.de" "www.aldonasiech.com" "www.ubikmedia.eu" - "www.facts.cloud" "www.youthtube.xyz" - "www.illucloud.eu" - "www.illucloud.de" - "www.illucloud.com" "www.ubikmedia.de" + "www.weirdwednesday.de" + "aldona2.ubikmedia.de" "apanowicz.ubikmedia.de" "cinevita.ubikmedia.de" @@ -74,8 +61,6 @@ in { "nb.ubikmedia.de" "youthtube.ubikmedia.de" "weirdwednesday.ubikmedia.de" - "weirdwednesday.de" - "www.weirdwednesday.de" "freemonkey.ubikmedia.de" "jarugadesign.ubikmedia.de" ]) -- cgit v1.2.3 From bf9d3272d1185c57c9f0a5843a1212205da67a14 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 18 Dec 2017 01:04:32 +0100 Subject: l prism.r: add git to containers --- lass/1systems/prism/config.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index a318ce412..1cca76331 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -186,6 +186,7 @@ in { #hotdog containers.hotdog = { config = { ... }: { + environment.systemPackages = [ pkgs.git ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey @@ -201,6 +202,7 @@ in { #kaepsele containers.kaepsele = { config = { ... }: { + environment.systemPackages = [ pkgs.git ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = with config.krebs.users; [ lass.pubkey @@ -217,6 +219,7 @@ in { #onondaga containers.onondaga = { config = { ... }: { + environment.systemPackages = [ pkgs.git ]; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey -- cgit v1.2.3 From 2a441c59adcec203091401f5f6b72c5ac1e87c51 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 18 Dec 2017 01:05:30 +0100 Subject: l: get secrets from pass --- lass/source.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lass') diff --git a/lass/source.nix b/lass/source.nix index 710bfdf2d..66cdacea8 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -12,9 +12,12 @@ in url = https://github.com/nixos/nixpkgs; ref = "cb751f9"; }; - secrets.file = getAttr builder { - buildbot = toString ; - lass = "/home/lass/secrets/${name}"; + secrets = getAttr builder { + buildbot.file = toString ; + lass.pass = { + dir = "${getEnv "HOME"}/.password-store"; + name = "hosts/${name}"; + }; }; stockholm.file = toString ; } -- cgit v1.2.3 From 8f80cd6fb41f963362d8044187f38b54244c227a Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 18 Dec 2017 11:01:35 +0100 Subject: l nixpkgs: cb751f9 -> af7e479 --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/source.nix b/lass/source.nix index 66cdacea8..bf992d4d2 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "cb751f9"; + ref = "af7e479"; }; secrets = getAttr builder { buildbot.file = toString ; -- cgit v1.2.3 From 2500fb454b12782792cdd5945278bdcae1b0805d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 18 Dec 2017 18:52:35 +0100 Subject: l helios.r: ignore lidswitch --- lass/1systems/helios/config.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix index 03a065d9c..8bd9735a9 100644 --- a/lass/1systems/helios/config.nix +++ b/lass/1systems/helios/config.nix @@ -156,4 +156,7 @@ with import ; services.printing.drivers = [ pkgs.postscript-lexmark ]; + services.logind.extraConfig = '' + HandleLidSwitch=ignore + ''; } -- cgit v1.2.3 From 676c76dd8e0b5cbe3d1bdba49b21b1b5cfc578a1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 18 Dec 2017 18:53:15 +0100 Subject: l: hledger -> bank --- lass/2configs/baseX.nix | 2 +- lass/5pkgs/default.nix | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 0ff47407a..6f5533b0d 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -66,12 +66,12 @@ in { environment.systemPackages = with pkgs; [ acpi + bank dic dmenu gi git-preview gitAndTools.qgit - haskellPackages.hledger lm_sensors mpv-poll much diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 10df08e7f..a158cd3c6 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -21,6 +21,17 @@ xmonad-lass = import ./xmonad-lass.nix { inherit config pkgs; }; yt-next = pkgs.callPackage ./yt-next/default.nix {}; + bank = pkgs.writeDashBin "bank" '' + tmp=$(mktemp) + ${pkgs.pass}/bin/pass show hledger > $tmp + ${pkgs.hledger}/bin/hledger --file=$tmp "$@" + ${pkgs.pass}/bin/pass show hledger | if ${pkgs.diffutils}/bin/diff $tmp -; then + exit 0 + else + ${pkgs.coreutils}/bin/cat $tmp | ${pkgs.pass}/bin/pass insert -m hledger + fi + ${pkgs.coreutils}/bin/rm $tmp + ''; screengrab = pkgs.writeDashBin "screengrab" '' resolution="$(${pkgs.xorg.xrandr}/bin/xrandr | ${pkgs.gnugrep}/bin/grep '*' | ${pkgs.gawk}/bin/awk '{print $1}')" ${pkgs.ffmpeg}/bin/ffmpeg -f x11grab -r 25 -i :${toString config.services.xserver.display} -s $resolution -c:v huffyuv $1 -- cgit v1.2.3