l

README.md

@@ -2,6 +2,8 @@
 
 ## File system structure
 
+this is outdated
+
 - `common`: stores all Nix files which are shared by all system configs
     - `de`: Desktop environments and their parameters
     - `hardware`: self-explenatory

common/base.nix

@@ -52,6 +52,19 @@
       outputs.overlays.modifications
       outputs.overlays.unstable-packages
     ];
+
+    # Unfree packages that can be installes regardless of the mchine's fre software policy
+    config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      # Steam
+      "steam"
+      "steam-original"
+      "steam-run"
+
+      # Nvidia drivers
+      "nvidia-x11"
+      "nvidia-settings"
+    ];
   };
 
   # Some programs need SUID wrappers, can be configured further or are

common/components/dm/greetd.nix

@@ -1,15 +0,0 @@
-{pkgs, ...}: {
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --time-format '%I:%M %p | %a • %h | %F' --cmd Hyprland";
-        user = "greeter";
-      };
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    greetd.tuigreet
-  ];
-}

common/components/packages-full.nix

@@ -32,17 +32,4 @@
     yazi
     vulnix # once im on stable
   ];
-
-  # Unfree packages that can be installes regardless of whether "allow-unfree.nix" is imported
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      # Steam
-      "steam"
-      "steam-original"
-      "steam-run"
-
-      # Nvidia drivers
-      "nvidia-x11"
-      "nvidia-settings"
-    ];
 }

common/full-install.nix

@@ -3,5 +3,5 @@
     ./components/sound.nix
     ./components/printing.nix
     ./components/packages-full.nix
-  ]
+  ];
 }

hosts/new-new-phoenix/configuration.nix

@@ -29,6 +29,7 @@ in {
     ../../common/components/de/hyprland.nix
 
     ../../common/programs/steam.nix
+    ../../common/services/adguardhome.nix
     ../../common/services/syncthing.nix
     ../../common/services/usbguard.nix