From b9e206af24b1369c55fd04da24e6a84c51881404 Mon Sep 17 00:00:00 2001 From: Lilith Date: Wed, 12 Mar 2025 16:09:36 +0100 Subject: [PATCH] refactor2 --- home/default.nix | 4 ++-- hosts/lilith-pc/default.nix | 2 +- system/core/default.nix | 5 +++++ system/core/wayland.nix | 24 ------------------------ system/optional/stylix.nix | 4 ++-- 5 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 system/core/wayland.nix diff --git a/home/default.nix b/home/default.nix index efcd1025..29ee2364 100644 --- a/home/default.nix +++ b/home/default.nix @@ -7,14 +7,14 @@ home-manager.users."lilith" = { imports = [ # ags.homeManagerModules.default - matshell.homeManagerModules.default + # matshell.homeManagerModules.default sops-nix.homeManagerModules.sops # ./ags # ToDo: get codin :3 ./hyprland ./rofi.nix ./dunst.nix - ./matshell.nix + # ./matshell.nix ./env.nix diff --git a/hosts/lilith-pc/default.nix b/hosts/lilith-pc/default.nix index b518c993..9853416e 100644 --- a/hosts/lilith-pc/default.nix +++ b/hosts/lilith-pc/default.nix @@ -5,7 +5,7 @@ desktop.enable = true; gaming.enable = true; nfs.client.enable = true; - stylix.enable = true; + auto_styling.enable = true; diff --git a/system/core/default.nix b/system/core/default.nix index 24c34874..151cf84f 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -10,5 +10,10 @@ ./nix.nix ./packages.nix ./persistence.nix + ./sops.nix + ./ssh.nix + ./syncthing.nix + ./users.nix + ./zsh.nix ]; } diff --git a/system/core/wayland.nix b/system/core/wayland.nix deleted file mode 100644 index 57faec4d..00000000 --- a/system/core/wayland.nix +++ /dev/null @@ -1,24 +0,0 @@ -{...}: { - hardware.graphics.enable = true; - - security.polkit.enable = true; - security.pam.services.hyprlock = {}; - - services.dbus.enable = true; - - programs.hyprland.enable = true; - - services.greetd = { - enable = true; - settings = { - default_session = { - user = "lilith"; - command = "Hyprland"; - }; - initial_session = { - user = "lilith"; - command = "Hyprland"; - }; - }; - }; -} diff --git a/system/optional/stylix.nix b/system/optional/stylix.nix index 9b442b4a..296e4ce4 100644 --- a/system/optional/stylix.nix +++ b/system/optional/stylix.nix @@ -1,9 +1,9 @@ {stylix, pkgs, config, lib, ...}: { imports = [ stylix.nixosModules.stylix ]; - options.stylix.enable = lib.mkEnableOption "Enable Stylix"; + options.auto_styling.enable = lib.mkEnableOption "Enable Stylix"; - config = lib.mkIf config.stylix.enable { + config = lib.mkIf config.auto_styling.enable { stylix = { enable = true;