From 4967fbe29eaaecc01bb1965d32dac6a8029fb723 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@gmail.com>
Date: Thu, 19 Oct 2023 22:24:33 +0200
Subject: [PATCH] Touchups

---
 nixos/flake.lock                                 |  6 +++---
 nixos/flake.nix                                  |  3 ++-
 nixos/hosts/Tibo-NixFat/default.nix              | 12 +++---------
 nixos/modules-old/default.nix                    |  6 ------
 nixos/modules/services/desktop/gnome/default.nix |  3 +++
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 0bc894e..6b5bbae 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697226376,
-        "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=",
+        "lastModified": 1697655685,
+        "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5",
+        "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c",
         "type": "github"
       },
       "original": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 4b07dfd..f2ec5c5 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -35,7 +35,8 @@
       inherit self inputs;
 
       channelsConfig = {
-        allowUnfree = true;
+        allowUnfree.allowUnfreePredicate = pkg: builtins.elem (utils.lib.getName pkg) [
+        ];
       };
 
       sharedOverlays = [
diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index 0e382b5..4e7467f 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -13,7 +13,6 @@
       home-manager.enable = true;
       sops.enable = true;
       ssh.enable = true;
-      zellij.enable = true;
     };
     services = {
       desktop.gnome.enable = true;
@@ -66,6 +65,9 @@
       lidSwitchExternalPower = "lock";
       lidSwitchDocked = "ignore";
     };
+
+    # Touchpad
+    xserver.libinput.enable = true;
   };
 
   system.stateVersion = "23.05";
@@ -94,12 +96,4 @@
     # no need to redefine it in your config for now)
     #media-session.enable = true;
   };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver = {
-    libinput.enable = true;
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
 }
diff --git a/nixos/modules-old/default.nix b/nixos/modules-old/default.nix
index cab2f2d..8073084 100644
--- a/nixos/modules-old/default.nix
+++ b/nixos/modules-old/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./apps
-    ./shells
   ];
   
   # Nix Flakes
@@ -27,9 +26,4 @@
     # font = "Lat2-Terminus16";
     useXkbConfig = true; # use xkbOptions in tty.
   };
-
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "altgr-intl";
-  };
 }
diff --git a/nixos/modules/services/desktop/gnome/default.nix b/nixos/modules/services/desktop/gnome/default.nix
index 415211b..186155e 100644
--- a/nixos/modules/services/desktop/gnome/default.nix
+++ b/nixos/modules/services/desktop/gnome/default.nix
@@ -8,6 +8,9 @@ in {
   config = lib.mkIf cfg.enable {
     services.xserver = {
       enable = true;
+      layout = "us";
+      xkbVariant = "altgr-intl";
+
       excludePackages = with pkgs; [
         xterm
       ];