hosts/gampo/configuration.nix

@@ -1,3 +1,6 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
 {
   config,
   pkgs,
@@ -6,13 +9,11 @@
 }: {
   imports = [
     inputs.sops-nix.nixosModules.sops
-    ./hardware-configuration.nix
+    ./system/hardware-configuration.nix
-    ./services
+    ./services.nix
-    ../../modules/opentablet.nix
-    ../../modules/sops.nix
     ../../modules/system.nix
-    ../../programs/flatpak.nix
+    ../../modules/sops.nix
-    ../../programs/hyprland.nix
+    ../../modules/opentablet.nix
     ../../programs/steam.nix
   ];
 
@@ -39,8 +40,6 @@
     sound.enable = true;
   };
 
-  modules.hyprland.enable = true;
-
   security.rtkit.enable = true;
 
   # List packages installed in system profile. To search, run:

hosts/gampo/services.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./gnome.nix
+    ./services/gnome.nix
   ];
 
   services = {

hosts/marpa/configuration.nix

@@ -60,6 +60,7 @@
   security.rtkit.enable = true;
 
   nix.settings.trusted-users = ["root" "phundrak"];
+  nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
     clinfo # AMD

users/modules/gpg.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{pkgs, ...}:{
   programs.gpg = {
     enable = true;
     mutableKeys = true;