Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'prism/master'

Browse Source
This commit is contained in:
makefu 2016-08-24 12:13:58 +02:00
commit 07bea34ab2
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
14 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/lass/ssh/mors.rsa
View File

@ -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

5
lass/1systems/cloudkrebs.nix
View File

@ -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

2
lass/1systems/dishfire.nix
View File

@ -3,8 +3,8 @@
{
imports = [
../.
../2configs/retiolum.nix
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/default.nix
#../2configs/exim-retiolum.nix
../2configs/git.nix
{

5
lass/1systems/echelon.nix
View File

@ -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

20
lass/1systems/helios.nix
View File

@ -6,6 +6,7 @@ with config.krebs.lib;
{
imports = [
../.
../2configs/retiolum.nix
../2configs/exim-retiolum.nix
../2configs/browsers.nix
../2configs/programs.nix
@ -20,27 +21,30 @@ 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
];
}
#{

1
lass/1systems/mors.nix
View File

@ -3,6 +3,7 @@
{
imports = [
../.
../2configs/retiolum.nix
../2configs/hw/tp-x220.nix
../2configs/baseX.nix
../2configs/exim-retiolum.nix

3
lass/1systems/prism.nix
View File

@ -12,7 +12,7 @@ let
in {
imports = [
../.
../2configs/default.nix
../2configs/retiolum.nix
../2configs/exim-smarthost.nix
../2configs/downloading.nix
../2configs/ts3.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"
];
}
{

1
lass/1systems/shodan.nix
View File

@ -4,6 +4,7 @@ with builtins;
{
imports = [
../.
../2configs/retiolum.nix
../2configs/hw/tp-x220.nix
../2configs/baseX.nix
../2configs/git.nix

2
lass/1systems/uriel.nix
View File

@ -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

5
lass/2configs/baseX.nix
View File

@ -88,4 +88,9 @@ in {
HandleLidSwitch=ignore
'';
services.xserver.synaptics = {
enable = true;
twoFingerScroll = true;
accelFactor = "0.035";
};
}

8
lass/2configs/default.nix
View File

@ -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
@ -206,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
'';
}

1
lass/2configs/mail.nix
View File

@ -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

6
lass/2configs/nixpkgs.nix
View File

@ -2,7 +2,7 @@
{
krebs.build.source.nixpkgs.git = {
url = https://github.com/lassulus/nixpkgs;
ref = "a75c0d9342ecb86dedd11f61a4e6f59ecc42d151";
};
url = https://github.com/nixos/nixpkgs;
ref = "c5cbda24147de441906871238138eb7fc90282db";
};
}

2
lass/2configs/vim.nix
View File

@ -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" ''