From cac8297fa42721e09d96614c1b16ab17d2c383d0 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 29 Aug 2019 06:22:37 -0700
Subject: reorganize some depo nix files

---
 depo/hikuj-zupip/configuration.nix | 47 +++++++++++++-------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

(limited to 'depo/hikuj-zupip')

diff --git a/depo/hikuj-zupip/configuration.nix b/depo/hikuj-zupip/configuration.nix
index 9de29aa..b313a36 100644
--- a/depo/hikuj-zupip/configuration.nix
+++ b/depo/hikuj-zupip/configuration.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-
   networking = {
     hostName = "lithium";
     hosts = {
@@ -23,6 +22,21 @@
 
   };
 
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.enableContainers = true;
+
+  boot.initrd.luks.devices = [
+    {
+      name = "root";
+      device = "/dev/disk/by-uuid/a0160f25-e0e3-4af0-8236-3e298eac957a";
+      preLVM = true;
+    }
+  ];
+
+  powerManagement.enable = false;
+
   time.timeZone = "America/Los_Angeles";
 
   fonts.fonts = with pkgs; [
@@ -77,9 +91,7 @@
   };
 
   # https://github.com/NixOS/nixpkgs/issues/53985
-  systemd.services.gitlab-runner.path = [
-    "/run/wrappers"
-  ];
+  systemd.services.gitlab-runner.path = ["/run/wrappers"];
 
   services = {
     pcscd.enable = true;
@@ -110,24 +122,11 @@
 
     printing.enable = true;
 
-    tarsnap = {
-      enable = false;
-      archives = {
-        ben-home = {
-          directories = [
-          ];
-        };
-      };
-    };
-
     xserver = {
       enable = true;
       layout = "us";
-
       xkbOptions = "caps:ctrl_modifier";
-
       displayManager.sddm.enable = true;
-
       desktopManager = {
         kodi.enable = true;
         plasma5.enable = true;
@@ -189,20 +188,6 @@
     };
   };
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.initrd.luks.devices = [
-    {
-      name = "root";
-      device = "/dev/disk/by-uuid/a0160f25-e0e3-4af0-8236-3e298eac957a";
-      preLVM = true;
-    }
-  ];
-
-  powerManagement.enable = false;
-
   nix = {
     gc = {
       automatic = true;
-- 
cgit v1.2.3