From b510522ae532cb952db252f79bafb5c93c4ba501 Mon Sep 17 00:00:00 2001
From: Johannes Hendrik Gerard van der Weide <hertog@fsfe.org>
Date: Wed, 21 Feb 2024 14:11:02 +0100
Subject: [PATCH] Attempting to fix infinite recursion

---
 flake.nix                | 4 +++-
 hertog/home.nix          | 2 +-
 programs/sway/sway.nix   | 6 +++---
 programs/sway/waybar.nix | 2 +-
 programs/sway/wofi.nix   | 2 +-
 programs/zsh.nix         | 2 +-
 system/environment.nix   | 2 +-
 system/services.nix      | 2 +-
 system/xserver.nix       | 2 +-
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0ceeef2..d2b6b5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,12 +36,14 @@
   in {
     # Laptop NixOS configuration
     nixosConfigurations = {
-      default = lib.nixosSystem {
+      puter = lib.nixosSystem {
         inherit system;
         modules = [
+	  nixos-hardware.nixosModules.framework-11th-gen-intel
 	  ./system
 	  ./programs
 	  ./hertog/user.nix
+	  nix-flatpak.nixosModules.nix-flatpak
           home-manager.nixosModules.home-manager {
             home-manager = {
               useGlobalPkgs = true;
diff --git a/hertog/home.nix b/hertog/home.nix
index ed7ca66..3e5af90 100644
--- a/hertog/home.nix
+++ b/hertog/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs }:
+{ pkgs, inputs, ... }:
 
 {
   programs.home-manage.enable = true;
diff --git a/programs/sway/sway.nix b/programs/sway/sway.nix
index 25c6382..c71705d 100644
--- a/programs/sway/sway.nix
+++ b/programs/sway/sway.nix
@@ -1,6 +1,6 @@
-{ config, lib }:
+{ pkgs, config }:
 let
-  config = import ../../theming/colorScheme.nix;
+  config.colorScheme = import ../../theming/colorScheme.nix;
   modifierKey = config.wayland.windowManager.sway.config.modifier;
 in
 {
@@ -18,7 +18,7 @@ in
         {command = "swaybg -i /etc/nixos/theming/background.svg";}
         {command = "keepassxc /home/hertog/Documents/Belangrijk/Wachtwoorden.kdbx";}
       ];
-      keybindings = lib.mkOptionDefault {
+      keybindings = pkgs.lib.mkOptionDefault {
         "XF86MonBrightnessUp" = "exec light -A 5";
         "XF86MonBrightnessDown" = "exec light -U 5";
         "XF86AudioMute" = "exec pamixer -t";
diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix
index de768a7..00c4651 100644
--- a/programs/sway/waybar.nix
+++ b/programs/sway/waybar.nix
@@ -1,6 +1,6 @@
 { config }:
 let
-  config = import ../../theming/colorScheme.nix;
+  config.colorScheme = import ../../theming/colorScheme.nix;
 in
 {
   programs.waybar = {
diff --git a/programs/sway/wofi.nix b/programs/sway/wofi.nix
index 208e7db..529aa60 100644
--- a/programs/sway/wofi.nix
+++ b/programs/sway/wofi.nix
@@ -1,6 +1,6 @@
 { config }:
 let
-  config = import ../../theming/colorScheme.nix;
+  config.colorScheme = import ../../theming/colorScheme.nix;
 in
 {
   programs.wofi = {
diff --git a/programs/zsh.nix b/programs/zsh.nix
index 6767490..f289c75 100644
--- a/programs/zsh.nix
+++ b/programs/zsh.nix
@@ -10,7 +10,7 @@
     shellAliases = {
       ll = "ls -l";
       please = "sudo";
-      update = "sudo nixos-rebuild switch --flake /etc/nixos/#laptop";
+      update = "sudo nixos-rebuild switch --flake /etc/nixos/#puter";
       vim = "nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";
       vimUpdate = "nix run --refresh git+https://git.saragerretsen.nl/Hertog/HertogVim";
       sudovim = "sudo nix run git+https://git.saragerretsen.nl/Hertog/HertogVim";
diff --git a/system/environment.nix b/system/environment.nix
index 892ece6..f5d0102 100644
--- a/system/environment.nix
+++ b/system/environment.nix
@@ -1,4 +1,4 @@
-{ pkgs, nix-flatpak }:
+{ pkgs, nix-flatpak, ... }:
 let
   mini-text = pkgs.callPackage ../../Programs/MiniText { };
   hyperplane = pkgs.callPackage ../../Programs/Hyperplane { };
diff --git a/system/services.nix b/system/services.nix
index 95a4fda..6daa889 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, ... }:
 
 {
   security = {
diff --git a/system/xserver.nix b/system/xserver.nix
index 841e2d4..d16e704 100644
--- a/system/xserver.nix
+++ b/system/xserver.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, ... }:
 
 {
   services.xserver = {