5 files changed, 513 insertions, 0 deletions

diff --git a/sif.nix b/sif.nix
new file mode 100644
index 00000000..1df1a1bf
--- /dev/null
+++ b/sif.nix
@@ -0,0 +1,439 @@
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ ./sif/hw.nix
+      ./sif/boot.nix
+      ./users.nix
+      ./custom/zsh.nix
+      ./custom/tinc/def.nix
+      ./custom/tinc/yggdrasil.nix
+      ./custom/uucp.nix
+      ./custom/borgbackup.nix
+      ./custom/uucp-mediaclient.nix
+      ./custom/uucp-notifyclient.nix
+      ./custom/notify-users.nix
+      ./utils/nix/module.nix
+    ];
+
+  networking = {
+    hostName = "sif";
+    domain = "midgard.yggdrasil";
+
+    hosts = {
+      "127.0.0.1" = [ "sif.midgard.yggdrasil" "sif" ];
+      "::1" = [ "sif.midgard.yggdrasil" "sif" ];
+    };
+    
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ 22 # ssh
+                        ];
+    };
+
+    networkmanager = {
+      enable = true;
+      dhcp = "internal";
+    };
+
+    dhcpcd.enable = false;
+  };
+
+  powerManagement.enable = true;
+
+  i18n = {
+    consoleFont = "lat9w-16";
+    consoleKeyMap = "dvp";
+    defaultLocale = "en_US.UTF-8";
+  };
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  time.timeZone = "Europe/Berlin";
+
+  environment.systemPackages = with pkgs; [
+    git rebuild-system
+  ];
+
+  nixpkgs.config.packageOverrides = pkgs: rec {
+    libfprint = pkgs.stdenv.mkDerivation rec {
+      name = "libfprint-${version}";
+      version = "vfs0090-f8323a0";
+
+      src = pkgs.fetchFromGitHub {
+        owner = "3v1n0";
+        repo = "libfprint";
+        rev = "f8323a0d3e0616f2822547902306992efd3572e7";
+        sha256 = "0y0lkwgw1lx4frm1kxz0hj11x93dby7vxkjly0ck7w7z96nn8bnm";
+      };
+
+      buildInputs = with pkgs; [ libusb pixman glib nss nspr gdk_pixbuf openssl ];
+      nativeBuildInputs = with pkgs; [ pkgconfig libtool automake autoconf ];
+
+      preConfigure = ''
+        NOCONFIGURE=true ./autogen.sh
+      '';
+
+      configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
+    };
+
+    fprintd = pkgs.stdenv.lib.overrideDerivation pkgs.fprintd (oldAttrs: {
+      configureFlags = oldAttrs.configureFlags or [] ++ ["--sysconfdir=/etc" "--localstatedir=/var"];
+      installFlags = oldAttrs.installFlags or [] ++ ["sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}"];
+    });
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  services = {
+    fprintd.enable = true;
+
+    vnstat.enable = true;
+
+    logind.extraConfig = ''
+      HandleLidSwitch=hybrid-sleep
+      LidSwitchIgnoreInhibited=no
+    '';
+
+    openssh = {
+      enable = true;
+    };
+
+    atd = {
+      enable = true;
+      allowEveryone = true;
+    };
+
+    xserver = {
+      enable = true;
+      
+      layout = "us";
+      xkbVariant = "dvp";
+      xkbOptions = "compose:caps";
+      
+      displayManager.lightdm = {
+        enable = true;
+      };
+
+      desktopManager = {
+        default = "none";
+        xterm.enable = false;
+      };
+
+      windowManager = {
+        default = "xmonad";
+        xmonad = {
+          enable = true;
+          extraPackages = haskellPackages: (with haskellPackages;
+            [ xmonad-contrib hostname libnotify aeson temporary parsec network]
+          );
+        };
+      };
+
+      wacom.enable = true;
+      multitouch.enable = true;
+      libinput.enable = true;
+
+      dpi = 282;
+    };
+
+    yggdrasilTinc = {
+      enable = true;
+      connect = true;
+      name = "sif";
+      interfaceConfig = {
+        macAddress = "5c:93:21:c3:61:39";
+      };
+    };
+
+    uucp = {
+      enable = true;
+      nodeName = "hel";
+      remoteNodes = {
+        "odin" = {
+          publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKcDj49TqmflGTmtGBqDawxmCBWW1txj61CZ7KT0hTHK uucp@odin"];
+          hostnames = ["odin.asgard.yggdrasil"];
+        };
+        "ymir" = {
+          publicKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir"];
+          hostnames = ["ymir.yggdrasil.li" "ymir.niflheim.yggdrasil"];
+        };
+      };
+      
+      defaultCommands = lib.mkForce [];
+
+      media-client = {
+        remoteNodes = [ "odin" ];
+        notify.users = [ "gkleen" ];
+      };
+
+      notify-client = {
+        remoteNodes = {
+          odin = {};
+        };
+      };
+    };
+
+    notify-users = [ "gkleen" ];
+    
+    postfix = {
+      enable = true;
+      enableSmtp = true;
+      enableSubmission = false;
+      setSendmail = true;
+      networksStyle = "host";
+      hostname = "hel.midgard.yggdrasil";
+      destination = [];
+      relayHost = "uucp:ymir";
+      recipientDelimiter = "+";
+      masterConfig = {
+        uucp = {
+          type = "unix";
+          private = true;
+          privileged = true;
+          chroot = false;
+          command = "pipe";
+          args = [ "flags=Fqhu" "user=uucp" ''argv=${config.security.wrapperDir}/uux -z -a $sender - $nexthop!rmail ($recipient)'' ];
+        };
+        sshsendmail = {
+          type = "unix";
+          private = true;
+          privileged = true;
+          chroot = false;
+          command = "pipe";
+          args = [ "flags=Fq" "user=postfix_ssh" ''argv=${pkgs.openssh}/bin/ssh -F /var/db/postfix_ssh/ssh.config $nexthop sendmail -f $sender -G $recipient'' ];
+        };
+      };
+      transport = ''
+        odin.asgard.yggdrasil uucp:odin
+      '';
+      config = {
+        always_bcc = "gkleen+sent@odin.asgard.yggdrasil";
+      
+        default_transport = "uucp:ymir";
+
+        inet_interfaces = "loopback-only";
+      
+        authorized_submit_users = ["!uucp" "static:anyone"];
+        message_size_limit = "0";
+
+        sender_dependent_default_transport_maps = ''regexp:${pkgs.writeText "sender_relay" ''
+          /@math(ematik)?\.(lmu|uni-muenchen)\.de$/ sshsendmail:math60.mathinst.loc
+          /@(cip|stud)\.ifi\.(lmu|uni-muenchen)\.de$/ smtp:smtp.ifi.lmu.de
+          /@ifi\.(lmu|uni-muenchen)\.de$/ smtp:smtpin1.ifi.lmu.de:587
+          /@(campus\.)?lmu\.de$/ smtp:postout.lrz.de
+        ''}'';
+
+        smtp_sasl_auth_enable = true;
+        smtp_sender_dependent_authentication = true;
+        smtp_sasl_tls_security_options = "noanonymous";
+        smtp_sasl_mechanism_filter = ["plain"];
+        smtp_tls_security_level = "dane";
+        smtp_sasl_password_maps = "texthash:/var/db/postfix/sasl_passwd";
+        smtp_cname_overrides_servername = false;
+        smtp_always_send_ehlo = true;
+
+        smtp_tls_loglevel = "1";
+        smtp_dns_support_level = "dnssec";
+      };
+    };
+
+    upower = {
+      enable = true;
+    };
+
+    locate = {
+      enable = true;
+      interval = "hourly";
+      locate = pkgs.mlocate;
+      localuser = null;
+      prunePaths = ["/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool"];
+    };
+  };
+
+  users = {
+    mutableUsers = false;
+  
+    extraUsers.root = { inherit (import ./users/gkleen.nix) shell hashedPassword; };
+
+    extraUsers.gkleen.extraGroups = [ "media" "networkmanager" ];
+    extraUsers.gkleen.packages = with pkgs; [
+      steam
+    ];
+
+    extraUsers.postfix_ssh = {
+      isSystemUser = true;
+      home = "/var/db/postfix_ssh";
+    };
+
+    extraGroups = {
+      network = {};
+    };
+  };
+
+  security = {
+    sudo.extraConfig = ''
+      Cmnd_Alias  SYSCTRL = /run/current-system/sw/sbin/shutdown, /run/current-system/sw/sbin/reboot, /run/current-system/sw/sbin/halt, /run/current-system/sw/bin/systemctl
+      %wheel ALL=(ALL) NOPASSWD: SYSCTRL
+    '';
+
+    wrappers = { "mount".source = "${pkgs.utillinux.bin}/bin/mount";
+                 "umount".source = "${pkgs.utillinux.bin}/bin/umount";
+                 "newgrp".source = "${pkgs.shadow}/bin/newgrp";
+                 "sg".source = "${pkgs.shadow}/bin/sg";
+               };
+
+    polkit = {
+      enable = true;
+      extraConfig = ''
+        polkit.addRule(function(action, subject) {
+          if (    action.id == "org.freedesktop.systemd1.manage-units"
+               && subject.isInGroup("wheel")
+             ) {
+            return polkit.Result.YES;
+          }
+        });
+
+        polkit.addRule(function(action, subject) {
+          if ((action.id == "org.blueman.rfkill.setstate" ||
+               action.id == "org.blueman.network.setup" ||
+               action.id == "org.freedesktop.NetworkManager.settings.modify.system"
+              ) && subject.local
+              && subject.active && subject.isInGroup("network")
+             ) {
+            return polkit.Result.YES;
+          }
+        });
+      '';
+    };
+  };
+
+  hardware = {
+    pulseaudio = {
+      enable = true;
+      package = with pkgs; pulseaudioFull;
+    };
+
+    bluetooth = {
+      enable = true;   
+      extraConfig = ''
+        [General]
+        Enable=Source,Sink,Media,Socket
+      '';
+    };
+
+    trackpoint = {
+      enable = true;
+      emulateWheel = true;
+      sensitivity = 255;
+      speed = 255;
+    };
+
+    brightnessctl.enable = true;
+  };
+
+  sound.enable = true;
+
+  nix = {
+    useSandbox = true;
+    autoOptimiseStore = true;
+    daemonNiceLevel = 10;
+    daemonIONiceLevel = 3;
+  };
+
+  environment.etc."fprintd.conf".source = "${pkgs.fprintd}/etc/fprintd.conf";
+  environment.etc."X11/xorg.conf.d/50-wacom.conf".source = lib.mkForce ./sif/wacom.conf;
+
+  systemd.services."kill-user@" = {
+    serviceConfig = {
+      Type = "oneshot";
+      ExecStart = "${pkgs.systemd}/bin/loginctl kill-user %I";
+    };
+  };
+  systemd.targets."sleep" = {
+    after = [ "kill-user@uucp.service" ];
+    wants = [ "kill-user@uucp.service" ];
+  };
+
+
+  systemd.user.services."pulseaudio".enable = lib.mkForce false;
+  systemd.user.services."ssh-agent".enable = lib.mkForce false;
+  systemd.user.sockets."pulseaudio".enable = lib.mkForce false;
+
+  systemd.services."ac-plugged" = {
+    description = "Inhibit handling of lid-switch and sleep";
+
+    path = with pkgs;
+             [ systemd coreutils ];
+
+    script = ''
+      exec systemd-inhibit --what=handle-lid-switch:sleep --why="AC is connected" --mode=block sleep infinity
+    '';
+  
+    serviceConfig = {
+      Type = "simple";
+    };
+  };
+
+  services.udev.extraRules = with pkgs; ''
+    SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", RUN+="${systemd}/bin/systemctl --no-block stop ac-plugged.service"
+    SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="${systemd}/bin/systemctl --no-block start ac-plugged.service"
+  '';
+
+  services.borgbackup = {
+    snapshots = "btrfs";
+    prefix = "yggdrasil.midgard.sif.";
+    targets = {
+      "munin" = {
+        repo = "borg.munin:borg";
+        paths = [ "/home/gkleen" ];
+        prune = {
+          "home-gkleen" =
+            [ "--keep-within" "24H"
+              "--keep-daily" "31"
+              "--keep-monthly" "12"
+              "--keep-yearly" "-1"
+            ];
+        };
+      };
+    };
+  };
+
+  services.btrfs.autoScrub = {
+    enable = true;
+    fileSystems = [ "/" "/home" ];
+    interval = "weekly";
+  };
+
+  systemd.services."nix-daemon".serviceConfig = {
+    MemoryAccounting = true;
+    MemoryHigh = "50%";
+    MemoryMax = "75%";
+  };
+
+  systemd.services."nixos-upgrade" = {
+    path = with pkgs; [ git ];
+    preStart = ''
+      git -C /etc/nixos fetch --recurse-submodules
+      git -C /etc/nixos reset --hard origin/master
+    '';
+  };
+
+  services.compton = {
+    enable = true;
+    backend = "glx";
+    vSync = true;
+    settings = {
+      glx-swap-method = 3;
+      xrender-sync = true;
+      xrender-sync-fence = true;
+    };
+  };
+
+  services.journald.extraConfig = ''
+    SystemMaxUse=100M
+  '';
+
+  system.stateVersion = "20.03"; # Did you read the comment?
+}
+
diff --git a/sif/boot.nix b/sif/boot.nix
new file mode 100644
index 00000000..00d42b99
--- /dev/null
+++ b/sif/boot.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+{
+  boot = {
+    initrd = {
+      luks.devices = [
+        { name = "nvm0"; device = "/dev/disk/by-uuid/fe641e81-0812-4181-a5f6-382ebba509bb"; }
+        { name = "nvm1"; device = "/dev/disk/by-uuid/43df1ba8-1728-4193-8855-920a82d4494a"; }
+      ];
+      kernelModules = [ "dm-snapshot" ];
+      availableKernelModules = [ "fbcon" "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+    };
+  };
+
+
+  # Use the systemd-boot EFI boot loader.
+  loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+    timeout = null;
+  };
+
+  plymouth.enable = true;
+
+  kernelParams = [ "intel_pstate=no_hwp" "quiet" ];
+}
diff --git a/sif/hw.nix b/sif/hw.nix
new file mode 100644
index 00000000..17293c90
--- /dev/null
+++ b/sif/hw.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f094bf06-66f9-40a8-9ab2-2b54d05223d2";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B3A2-D029";
+      fsType = "vfat";
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/9e932072-3c56-4a9c-8da7-3163d2a8bf28";
+      fsType = "btrfs";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/50f3f856-cc17-4614-846a-34a14d5006ec"; }
+    ];
+
+  nix.maxJobs = lib.mkDefault 12;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  # High-DPI console
+  i18n.consoleFont = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
+
+  hardware.cpu.intel.updateMicrocode = true;
+}
diff --git a/sif/wacom.conf b/sif/wacom.conf
new file mode 100644
index 00000000..864409f1
--- /dev/null
+++ b/sif/wacom.conf
@@ -0,0 +1,15 @@
+Section "InputClass"
+        Identifier "Wacom USB device class"
+        MatchUSBID "056a:*"
+        MatchDevicePath "/dev/input/event*"
+        Driver "wacom"
+EndSection
+
+Section "InputClass"
+        Identifier      "calibration"
+        MatchProduct    "Wacom USB device class"
+        Option  "MinX"  "58"
+        Option  "MaxX"  "30982"
+        Option  "MinY"  "87"
+        Option  "MaxY"  "17328"
+EndSection
\ No newline at end of file
diff --git a/yggdrasil b/yggdrasil
-Subproject 5da484d0a81d9b35ceaa2da44c2dfc6bb9ad292
+Subproject f9b7f232d15afba865e94ca66e28ca375670009