From 43ab6b32103f41cda097a3d5f98cce41fdd3f8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 29 Mar 2022 00:21:16 +0200
Subject: [PATCH] feat(tahina): init as guest laptop

---
 configs/packages.nix                      |  6 +--
 flake.nix                                 | 11 +---
 lib/default.nix                           |  1 +
 packages/scripts/mpv-tv.nix               |  2 +-
 systems/tahina/configuration.nix          | 65 ++++++++++++++++++-----
 systems/tahina/hardware-configuration.nix | 49 +++++++++++------
 6 files changed, 92 insertions(+), 42 deletions(-)

diff --git a/configs/packages.nix b/configs/packages.nix
index c9fac74..3895540 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -23,15 +23,15 @@
   cslDirectory = pkgs.linkFarm "citation-styles" [
     (zoteroStyle {
       name = "chicago-author-date-de";
-      sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
+      sha256 = "sha256-ddMYk4A9DJQhx9ldkmF7PhwKuc7wUSr26uHHGAze9Ps=";
     })
     (zoteroStyle {
       name = "din-1505-2";
-      sha256 = "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq";
+      sha256 = "sha256-bXZbB850fek8J6wMVFL32ndI7F4wiKKr1qUC71ezreE=";
     })
     (zoteroStyle {
       name = "apa";
-      sha256 = "1878vxp0y0h05yzaghnd51n981623mxskw3lsdyzmffqhihvv111";
+      sha256 = "sha256-yq4fW6hQknycLjaj5fPbXLrQlGBp5myXiOSHBU90jEc=";
     })
   ];
 
diff --git a/flake.nix b/flake.nix
index 253d9c2..8c1601a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -108,11 +108,7 @@
     in
       toString (krops.packages.${system}.writeDeploy "deploy-${name}" {
         source = krops.lib.evalSource [(source name)];
-        target = "root@${host}:${
-          if host == "130.61.203.118"
-          then "22"
-          else toString sshPort
-        }";
+        target = "root@${host}:${toString sshPort}";
       });
   in {
     apps.${system} = let
@@ -123,10 +119,7 @@
           type = "app";
           program = deployScriptFor {
             inherit name;
-            host =
-              if name == "tahina"
-              then "130.61.203.118"
-              else "${name}.r";
+            host = "${name}.r";
           };
         };
       });
diff --git a/lib/default.nix b/lib/default.nix
index 3e0ef71..983e9c1 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -82,6 +82,7 @@ rec {
     manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
     toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
     zaatar.id = "CGHO6LK-ZJBAXBD-UWI7AH3-BXYARE6-EUIM7PE-O2FUCOM-VCCRNCM-IG34WQ7";
+    tahina.id = "UKJ2CBO-EQPKQL4-3QLRUSG-SSYR6AB-CCCUTKU-CLPYR7N-RUI5A6Y-JTL5NA4";
   };
 
   ignorePaths = [
diff --git a/packages/scripts/mpv-tv.nix b/packages/scripts/mpv-tv.nix
index 9afd903..c4c9409 100644
--- a/packages/scripts/mpv-tv.nix
+++ b/packages/scripts/mpv-tv.nix
@@ -4,7 +4,7 @@
 }: let
   streams-tsv = pkgs.fetchurl {
     url = "https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/iptv/kodi/kodi_tv.m3u";
-    sha256 = "1cw1gmb16vwh6qfw0z3wjjfgn0zg2qplnddqzva5b0xx2g2appla";
+    sha256 = "sha256-gbHV37Yo+D3TYfDXZyb9IX8aRsguZ3qG2SYlY8NsTL0=";
     postFetch = ''
       ${pkgs.gnused}/bin/sed '/#EXTM3U/d;/#EXTINF/s/.*,//g' $out | ${pkgs.coreutils}/bin/paste -d'\t' - - > $out.tmp
       mv $out.tmp $out
diff --git a/systems/tahina/configuration.nix b/systems/tahina/configuration.nix
index d9465fb..6181d43 100644
--- a/systems/tahina/configuration.nix
+++ b/systems/tahina/configuration.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   config,
   pkgs,
   ...
@@ -8,22 +7,64 @@
 in {
   imports = [
     ./hardware-configuration.nix
-    <niveum/configs/monitoring.nix>
-    <niveum/configs/nix.nix>
-    <niveum/configs/save-space.nix>
+    <niveum/configs/battery.nix>
     <niveum/configs/spacetime.nix>
-    <niveum/configs/sshd.nix>
     <niveum/modules/retiolum.nix>
+    <niveum/configs/sshd.nix>
+    {
+      console.keyMap = "de";
+      i18n.defaultLocale = "de_DE.UTF-8";
+      services.xserver = {
+        layout = "de";
+        libinput.enable = true;
+      };
+    }
+    {
+      nix.nixPath = ["/var/src"];
+    }
   ];
 
-  nix.nixPath = ["/var/src"];
-
-  networking = {
-    hostName = "tahina";
-    retiolum = retiolumAddresses.tahina;
+  users.users.xenos = {
+    name = "xenos";
+    password = "xenos";
+    isNormalUser = true;
+    extraGroups = ["networkmanager"];
   };
 
-  system.stateVersion = "22.05";
+  services.xserver = {
+    enable = true;
+    desktopManager.pantheon.enable = true;
+    displayManager = {
+      lightdm = {
+        enable = true;
+        greeters.pantheon.enable = true;
+      };
+      autoLogin = {
+        enable = true;
+        user = "xenos";
+      };
+    };
+  };
+  boot.plymouth.enable = true;
 
-  environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
+  environment.systemPackages = [
+    pkgs.libreoffice
+    pkgs.gimp
+    pkgs.inkscape
+    pkgs.firefox
+    pkgs.audacity
+    pkgs.pidgin
+  ];
+
+  networking = {
+    useDHCP = false;
+    interfaces = {
+      enp0s25.useDHCP = true;
+      wlo1.useDHCP = true;
+    };
+    retiolum = retiolumAddresses.tahina;
+    hostName = "tahina";
+  };
+
+  system.stateVersion = "21.11";
 }
diff --git a/systems/tahina/hardware-configuration.nix b/systems/tahina/hardware-configuration.nix
index 0f15acb..25a5999 100644
--- a/systems/tahina/hardware-configuration.nix
+++ b/systems/tahina/hardware-configuration.nix
@@ -6,27 +6,42 @@
   ...
 }: {
   imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sda";
-
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/d36baa44-9359-45d1-af5f-dbac52c6d75e";
-    fsType = "ext4";
+  boot = {
+    loader = {
+      systemd-boot = {
+        enable = true;
+        consoleMode = "max";
+      };
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci"];
+      kernelModules = ["dm-snapshot"];
+      luks.devices.luksmap.device = "/dev/disk/by-uuid/b7d66981-8cb7-4aad-a595-ee6574b312cf";
+    };
+    kernelModules = ["kvm-intel"];
+    extraModulePackages = [];
   };
 
-  swapDevices = [];
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/e9a8bd34-61eb-4317-888d-bd7d6248a906";
+    fsType = "xfs";
+  };
 
-  networking.useDHCP = lib.mkDefault false;
-  networking.interfaces.ens3.useDHCP = lib.mkDefault true;
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/9B2F-31E1";
+    fsType = "vfat";
+  };
 
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 2048;
+    }
+  ];
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }