Merge remote-tracking branch 'ni/master'

4 files changed, 104 insertions, 4 deletions

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 71302d594..001ad0bc4 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -26,8 +26,9 @@ with import <stockholm/lib>;
     chromium
     firefoxWrapper
     networkmanagerapplet
-    pidginotr
-    pidgin-with-plugins
+    (pkgs.pidgin-with-plugins.override {
+      plugins = [ pkgs.pidginotr ];
+    })
   ];
 
   fileSystems = {
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 10d7b2197..6c22971bf 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -57,8 +57,9 @@ with import <stockholm/lib>;
     gimp
     iptables
     libreoffice
-    pidginotr
-    pidgin-with-plugins
+    (pkgs.pidgin-with-plugins.override {
+      plugins = [ pkgs.pidginotr ];
+    })
     skype
     slock
     tinc_pre
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
new file mode 100644
index 000000000..b564383d7
--- /dev/null
+++ b/tv/1systems/querel/config.nix
@@ -0,0 +1,95 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }: {
+
+  imports = [
+    <stockholm/krebs>
+    <stockholm/tv/2configs>
+    <stockholm/tv/3modules>
+    <stockholm/tv/2configs/retiolum.nix>
+  ];
+
+  krebs.build.host = config.krebs.hosts.querel;
+  krebs.build.user = mkForce config.krebs.users.itak;
+
+  boot.initrd.availableKernelModules = [ "ahci" ];
+  boot.initrd.luks = {
+    cryptoModules = [ "aes" "sha512" "xts" ];
+    devices.querel-luks1 = {
+      allowDiscards = true;
+      device = "/dev/sda2";
+    };
+  };
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    systemd-boot.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    firefoxWrapper
+    gimp
+    kate
+    libreoffice
+    (pkgs.pidgin-with-plugins.override {
+      plugins = [ pkgs.pidginotr ];
+    })
+    sxiv
+    texlive.combined.scheme-full
+    vim
+    zathura
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/mapper/querel-root";
+      fsType = "ext4";
+      options = [ "defaults" "discard" ];
+    };
+    "/home" = {
+      device = "/dev/mapper/querel-home";
+      fsType = "ext4";
+      options = [ "defaults" "discard" ];
+    };
+    "/boot" = {
+      device = "/dev/sda1";
+    };
+  };
+
+  hardware.enableRedistributableFirmware = true;
+  hardware.pulseaudio.enable = true;
+
+  i18n.defaultLocale = "de_DE.UTF-8";
+
+  networking.networkmanager.enable = true;
+
+  programs.ssh.startAgent = false;
+
+  services.printing = {
+    enable = true;
+  };
+
+  services.xserver.enable = true;
+  services.xserver.layout = "de";
+  services.xserver.xkbOptions = "eurosign:e";
+
+  services.xserver.synaptics = {
+    enable = true;
+    twoFingerScroll = true;
+  };
+
+  services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.displayManager.auto = {
+    enable = true;
+    user = "itak";
+  };
+
+  users.users.itak = {
+    inherit (config.krebs.users.itak) home uid;
+    isNormalUser = true;
+    extraGroups = [
+      "audio"
+      "video"
+      "networkmanager"
+    ];
+  };
+}
diff --git a/tv/1systems/querel/source.nix b/tv/1systems/querel/source.nix
new file mode 100644
index 000000000..74eab51e4
--- /dev/null
+++ b/tv/1systems/querel/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/tv/source.nix> {
+  name = "querel";
+}