From de9a953896b582fb4984ca1bc92e0338f640fd94 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Aug 2016 19:14:46 +0200 Subject: [PATCH 01/11] k 3 l: update mors ssh key --- krebs/3modules/lass/ssh/mors.rsa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/lass/ssh/mors.rsa b/krebs/3modules/lass/ssh/mors.rsa index 172fd2dda..3aa18bcf9 100644 --- a/krebs/3modules/lass/ssh/mors.rsa +++ b/krebs/3modules/lass/ssh/mors.rsa @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXlNVcVPDYJcmfF5wqJNnjU5bznHEMShhpGuTNj+ljhiFJ7Mwd4+OsSiWfvumrh5MHV4oVH1aqRgQWDKRTb/G7pRh/8Xbmz+28WKn802Q7HOHmgXTqwuURQe05cV88nS1O5IbHIWszEM1P+NcmI1obvXT5VkPq8kL84qLWIm2JtdtjsoUc1Nh5PjManu2G40KvFB25cscviFYOi8voP2LZkTDhz0k4ciTqZXDbtcWOppzWKBwY+zqTPxagREBvQVeC7hwF4jQwpwKRJPJKHConqiN36unWtZ8IPhgYlt4sC88wmPaMM/UiaNzw4O2CqAwu/0j+M4n/eBErVKmrhMCfZ5/yOStH4nzS3a/LjqcKo9V/Mo3G75HKwe4Z0E6UTkhYEDqMmUwpYUVX/JGwfNu0CAJsjxwBKG8M2iPFC3MRmpb9Fn/Cmi8cyX7d8VKuB3/JFu1TrqSMK3s0P58/QKJwFudUBkwjs+YilRf7VNMPiRXSD3N6sSao3Ktt9P6CzPwM+x34maNv8SvGRz1IKAZ2Vk13lqHd5lF6RAUO6k3MsKMzAFCKAluSCAAjNQ7RDxkh1CrMLg36azXkTARyEOwZCt8fPkcS62Vp5+AFe+OfvfkpSfshZq66z1RVut/yteRPC7TL9Q164BNxNElTGA2HZUYkGtUFPcP2/McA/BkL5Q== lass@mors From cdaa911344c96610ee327716f576c1eb061a9277 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Aug 2016 19:15:29 +0200 Subject: [PATCH 02/11] l 2 nixpkgs: a75c0d9 -> 671cc4e --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 576447542..10bc3e9cb 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/lassulus/nixpkgs; - ref = "a75c0d9342ecb86dedd11f61a4e6f59ecc42d151"; + ref = "671cc4ea1562bfeaa3d32ac21588bd0b6c4346bd"; }; } From 4a3bee7aa8a3218ca8a319695bc66520220ce93d Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 00:03:38 +0200 Subject: [PATCH 03/11] l: import retiolum.nix explicit --- lass/1systems/cloudkrebs.nix | 5 ++--- lass/1systems/dishfire.nix | 2 +- lass/1systems/echelon.nix | 5 ++--- lass/1systems/helios.nix | 1 + lass/1systems/mors.nix | 1 + lass/1systems/prism.nix | 2 +- lass/1systems/shodan.nix | 1 + lass/1systems/uriel.nix | 2 +- lass/2configs/default.nix | 1 - 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index 5aa35f5a7..e65b13d00 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -7,10 +7,9 @@ let in { imports = [ ../. - ../2configs/os-templates/CAC-CentOS-7-64bit.nix - ../2configs/default.nix - ../2configs/exim-retiolum.nix ../2configs/retiolum.nix + ../2configs/os-templates/CAC-CentOS-7-64bit.nix + ../2configs/exim-retiolum.nix ../2configs/git.nix ../2configs/realwallpaper.nix ../2configs/privoxy-retiolum.nix diff --git a/lass/1systems/dishfire.nix b/lass/1systems/dishfire.nix index ec9f53694..9c77f909d 100644 --- a/lass/1systems/dishfire.nix +++ b/lass/1systems/dishfire.nix @@ -3,8 +3,8 @@ { imports = [ ../. + ../2configs/retiolum.nix - ../2configs/default.nix #../2configs/exim-retiolum.nix ../2configs/git.nix { diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index 8d944ed40..da8864011 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -7,10 +7,9 @@ let in { imports = [ ../. - ../2configs/os-templates/CAC-CentOS-7-64bit.nix - ../2configs/default.nix - ../2configs/exim-retiolum.nix ../2configs/retiolum.nix + ../2configs/os-templates/CAC-CentOS-7-64bit.nix + ../2configs/exim-retiolum.nix ../2configs/realwallpaper.nix ../2configs/privoxy-retiolum.nix ../2configs/git.nix diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix index 53026a6fb..49547607a 100644 --- a/lass/1systems/helios.nix +++ b/lass/1systems/helios.nix @@ -6,6 +6,7 @@ with config.krebs.lib; { imports = [ ../. + ../2configs/retiolum.nix ../2configs/exim-retiolum.nix ../2configs/browsers.nix ../2configs/programs.nix diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 92a1b51e9..d3878d305 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -3,6 +3,7 @@ { imports = [ ../. + ../2configs/retiolum.nix ../2configs/hw/tp-x220.nix ../2configs/baseX.nix ../2configs/exim-retiolum.nix diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 812cdb844..3c5538424 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -12,7 +12,7 @@ let in { imports = [ ../. - ../2configs/default.nix + ../2configs/retiolum.nix ../2configs/exim-smarthost.nix ../2configs/downloading.nix ../2configs/ts3.nix diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix index 96d64bda3..af98c6968 100644 --- a/lass/1systems/shodan.nix +++ b/lass/1systems/shodan.nix @@ -4,6 +4,7 @@ with builtins; { imports = [ ../. + ../2configs/retiolum.nix ../2configs/hw/tp-x220.nix ../2configs/baseX.nix ../2configs/git.nix diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 6b56419d7..16c39280d 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -4,6 +4,7 @@ with builtins; { imports = [ ../. + ../2configs/retiolum.nix ../2configs/baseX.nix ../2configs/exim-retiolum.nix ../2configs/browsers.nix @@ -12,7 +13,6 @@ with builtins; ../2configs/bird.nix ../2configs/git.nix ../2configs/chromium-patched.nix - ../2configs/retiolum.nix ../2configs/bitlbee.nix ../2configs/weechat.nix ../2configs/skype.nix diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index dbb2a853a..cc848c39e 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -8,7 +8,6 @@ with config.krebs.lib; ../2configs/gc.nix ../2configs/mc.nix ../2configs/nixpkgs.nix - ../2configs/retiolum.nix ../2configs/vim.nix ../2configs/zsh.nix ./backups.nix From 2cc7326aa6aa0a5199a65792099799c2d0d7ca06 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 08:36:58 +0200 Subject: [PATCH 04/11] l 2 vim: change from nvim to vim --- lass/2configs/vim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 9eed08635..2bbec6ab1 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -123,7 +123,7 @@ let vim = pkgs.writeDashBin "vim" '' set -efu (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs}) - exec ${pkgs.neovim}/bin/nvim "$@" + exec ${pkgs.vim}/bin/vim "$@" ''; vimrc = pkgs.writeText "vimrc" '' From 1238a9b5c7e81db309cb9fb1257c1c5743d21c75 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 08:37:22 +0200 Subject: [PATCH 05/11] l 1 helios: update guest config --- lass/1systems/helios.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix index 49547607a..fcbe3cfcf 100644 --- a/lass/1systems/helios.nix +++ b/lass/1systems/helios.nix @@ -21,27 +21,33 @@ with config.krebs.lib; # imports = [ # ../2configs/baseX.nix # ]; - # networking.wireless.enable = true; #} { # gnome3 for suja imports = [ ../2configs/default.nix ]; + time.timeZone = "Europe/Berlin"; services.xserver.enable = true; - services.xserver.desktopManager.gnome3.enable = true; - users.users.suja = { - uid = genid "suja"; - home = "/home/suja"; + services.xserver.desktopManager.xfce.enable = true; + networking.wireless.enable = true; + users.users.ferret = { + uid = genid "ferret"; + home = "/home/ferret"; group = "users"; createHome = true; useDefaultShell = true; extraGroups = [ ]; + hashedPassword = "$6$SaneLuyep90p8BPn$0IDbvLgNbRGZL96obWavanTmY6IkBG84vs2b/2oqlpbmTZH3retOYbQKF1uVqu6dD0ZGF4eBq9tqPbwUjRyY00"; }; environment.systemPackages = with pkgs; [ firefox chromium + oraclejre8 + maven + arandr + libreoffice ]; } #{ From f949ea1e555d7132e9a4dcaf708d659bf6bc1289 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 08:38:07 +0200 Subject: [PATCH 06/11] l 1 prism: add android-weechat key --- lass/1systems/prism.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 3c5538424..47e8a68b4 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -157,6 +157,7 @@ in { users.users.chat.openssh.authorizedKeys.keys = [ "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHF9tijlMoEevRZCG1AggukxWggfxPHUwg6Ye113ODG6PZ2m98oSmnsjixDy4GfIJjy+8HBbkwS6iH+fsNk86QtAgFNMjBl+9YvEzNRBzcyCqdOkZFvvZvV2oYA7I15il4ln62PDPKjEIS3YPhZPSwc6GhrlsFTnIG56NF/93IhF7R/FA== JuiceSSH" config.krebs.users.lass-uriel.pubkey + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDQ8DJhHAqmdrB2+qkV/OuKjR4QDXUww2TWItyDrs+/6F58WacMozgaZr2goA5JQJ5d19nC3LzYb4yLGguADsp987I6cAu5iXPT5PHKc0eRWDN+AGlpTgUtN1BvVrnJZaUJrR9WlHhFYlkOkzAsB15fKYciVWsyxBCVZ+3oiTEjs2L/sfbrgailWqHIUWDftUnJx8EFmSUVZ2GZWklMcgBo0FJD1i0x5u2dQGguNY+28DzQmKgUMS+xD/uUZvrFIWr9I6CBqhsuHJo8n85BT3B3QdG8ARLt5FKPr5L3My6UjlxOkKrDNLjJFjERFCsuIxnrO3tQhvKXQYlOyskHokocYSdcIq8svghJLA3kmRYIjHjZ4y1BNENsk79WyYNMAi5y+A0Evmu+g3ks/DiW3vI/Sw/D3Uc7ilbImpaoL5qUC4+WZM3J2b3Z1AU5D1QiojpKkB9Qt1bokCm8hrRCG9ZDKqAD6IqmI1ARRjfgA4zKwKUhmMqG4p55YGGVf9OeK0rXgX0Z2InyFXeBaU2aBcDfdKD/65w5MnC9CsJnjELdd4r9u2ugTPExzOo3WUlNuOTB1WoZ8CiY2OVGle/E/MzKUDfGuIFhUsFeX0YcLHPbo+mesISNUPaeadSuMuHE8W4FOeEq51toBo/gkxgjtqqWMOd9SxnDQTMBKq3L/w7nEQ== lass@mors" ]; } { From 2e73b7e7051ea923888831d9da20343dddf9eab9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 08:38:28 +0200 Subject: [PATCH 07/11] l 2 baseX: add synaptics config --- lass/2configs/baseX.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index dce7dae40..a78f52b83 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -88,4 +88,9 @@ in { HandleLidSwitch=ignore ''; + services.xserver.synaptics = { + enable = true; + twoFingerScroll = true; + accelFactor = "0.035"; + }; } From a9409471de543053a179b46735a5ed591dd68b7f Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 08:39:03 +0200 Subject: [PATCH 08/11] l 2 default: remove oboslete workaround --- lass/2configs/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index cc848c39e..5575b7e7b 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -205,11 +205,4 @@ with config.krebs.lib; networking.dhcpcd.extraConfig = '' noipv4ll ''; - - #CVE-2016-0777 and CVE-2016-0778 workaround - #https://www.qualys.com/2016/01/14/cve-2016-0777-cve-2016-0778/openssh-cve-2016-0777-cve-2016-0778.txt - programs.ssh.extraConfig = '' - UseRoaming no - ''; - } From b73c93c0a4826c076c30d51c3ee1dc9323c179f1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 08:40:01 +0200 Subject: [PATCH 09/11] l 2 mail: add default value for from= --- lass/2configs/mail.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 7c050005b..c637b08fb 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -44,6 +44,7 @@ let set nm_record_tags = "-inbox me archive" set virtual_spoolfile=yes # enable virtual folders set sendmail="${msmtp}/bin/msmtp" # enables parsing of outgoing mail + set from="lassulus@lassul.us" set use_from=yes set envelope_from=yes From a545159c08c6a748299111184ba5a34b40d7af67 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 08:41:10 +0200 Subject: [PATCH 10/11] l 2 nixpkgs: 671cc4e -> c5cbda2 & fix indent --- lass/2configs/nixpkgs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 10bc3e9cb..902af61a7 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -2,7 +2,7 @@ { krebs.build.source.nixpkgs.git = { - url = https://github.com/lassulus/nixpkgs; - ref = "671cc4ea1562bfeaa3d32ac21588bd0b6c4346bd"; - }; + url = https://github.com/nixos/nixpkgs; + ref = "c5cbda24147de441906871238138eb7fc90282db"; + }; } From 57a413567b71270de4357ae6317dc390abe0b6ea Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Aug 2016 12:00:34 +0200 Subject: [PATCH 11/11] l 1 helios: remove obsolete import --- lass/1systems/helios.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix index fcbe3cfcf..26ad316ce 100644 --- a/lass/1systems/helios.nix +++ b/lass/1systems/helios.nix @@ -24,9 +24,6 @@ with config.krebs.lib; #} { # gnome3 for suja - imports = [ - ../2configs/default.nix - ]; time.timeZone = "Europe/Berlin"; services.xserver.enable = true; services.xserver.desktopManager.xfce.enable = true;