From a468935722b85beef588ab313f2adfe0159564e2 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 19 Aug 2021 12:10:30 +0200
Subject: Basic flakeification

---
 configuration.nix | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'configuration.nix')

diff --git a/configuration.nix b/configuration.nix
index 868d6cf..73138f6 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,13 +1,9 @@
-{ config, pkgs, ... }:
-
-let
-  mypkgs = import <mypkgs> { };
-
-in {
+{ config, pkgs, pkgs-personal, hostname, ... }:
+{
   imports = [
     ./fish.nix
-    ./host/current.nix
     ./user/common.nix
+    (./host + ("/" + hostname + ".nix"))
   ];
 
   console.keyMap = "de";
@@ -20,7 +16,16 @@ in {
 
   nixpkgs.config.allowUnfree = true;
 
-  nix.allowedUsers = [ "common" ];
+  nix = {
+    package = pkgs.nixUnstable;
+
+    allowedUsers = [ "common" ];
+    trustedUsers = [ "root" "common" ];
+
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
 
   networking.nameservers = [
     "1.1.1.1"
@@ -43,14 +48,14 @@ in {
   };
 
   environment = {
-    systemPackages = [
-      pkgs.psmisc
-      pkgs.htop
-      pkgs.git
-      pkgs.p7zip
-      pkgs.silver-searcher
-      pkgs.renameutils
-      mypkgs.custom-neovim
+    systemPackages = with pkgs; [
+      psmisc
+      htop
+      git
+      p7zip
+      silver-searcher
+      renameutils
+      pkgs-personal.custom-neovim
     ];
 
     variables = {
-- 
cgit v1.2.3