diff --git a/README.md b/README.md index 4b53b37..3bb7653 100644 --- a/README.md +++ b/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 diff --git a/common/base.nix b/common/base.nix index f550030..6da8fff 100644 --- a/common/base.nix +++ b/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 diff --git a/common/components/dm/sddm.nix b/common/components/de/sddm.nix similarity index 100% rename from common/components/dm/sddm.nix rename to common/components/de/sddm.nix diff --git a/common/components/dm/greetd.nix b/common/components/dm/greetd.nix deleted file mode 100644 index a3abf47..0000000 --- a/common/components/dm/greetd.nix +++ /dev/null @@ -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 - ]; -} diff --git a/common/components/packages-full.nix b/common/components/packages-full.nix index 50afaaf..c0670c0 100644 --- a/common/components/packages-full.nix +++ b/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" - ]; } diff --git a/common/full-install.nix b/common/full-install.nix index 9c1d10e..0773af0 100644 --- a/common/full-install.nix +++ b/common/full-install.nix @@ -3,5 +3,5 @@ ./components/sound.nix ./components/printing.nix ./components/packages-full.nix - ] + ]; } \ No newline at end of file diff --git a/hosts/new-new-phoenix/configuration.nix b/hosts/new-new-phoenix/configuration.nix index a6d54ff..36b3b04 100644 --- a/hosts/new-new-phoenix/configuration.nix +++ b/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