diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index 7654ea6..169671d 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -15,23 +15,14 @@ ]; desktop.niri.enable = true; - environment.memoryAllocator.provider = "mimalloc"; - locale.ukrainian.enable = true; - opentabletdriver.enable = false; - qmk-vial.enable = true; - security.basic.enable = true; - system.stateVersion = "25.05"; - time.timeZone = "Europe/Kyiv"; - virtual.libvirt.enable = true; - wireless = { bluetooth.enable = true; bluetooth.enableBlueman = true; diff --git a/hosts/dunamis/users.nix b/hosts/dunamis/users.nix index 69188d0..0b563ad 100644 --- a/hosts/dunamis/users.nix +++ b/hosts/dunamis/users.nix @@ -6,10 +6,7 @@ }: let sopSec = config.sops.secrets; in { - nix.settings.trusted-users = [ - "user" - "nix-ssh" - ]; + nix.settings.trusted-users = ["user" "nix-ssh"]; users.mutableUsers = false; users.users = { user = { diff --git a/hosts/dunamis/users/user/home-configuration.nix b/hosts/dunamis/users/user/home-configuration.nix index 8a91e5d..a8f2ea4 100644 --- a/hosts/dunamis/users/user/home-configuration.nix +++ b/hosts/dunamis/users/user/home-configuration.nix @@ -1,4 +1,5 @@ { + lib, inputs, osConfig, ... @@ -10,10 +11,7 @@ ./programs.nix ./flatpak.nix ]; - home = { - inherit (osConfig.system) stateVersion; - sessionPath = ["$HOME/.local/bin"]; - }; - - desktop.niri.enable = true; + inherit (osConfig) desktop; + home.stateVersion = osConfig.system.stateVersion; + home.sessionPath = ["$HOME/.local/bin"]; } diff --git a/modules/nixos/desktop/plasma.nix b/modules/nixos/desktop/plasma.nix index c5f17b9..889f7d7 100644 --- a/modules/nixos/desktop/plasma.nix +++ b/modules/nixos/desktop/plasma.nix @@ -12,14 +12,14 @@ in { options = { desktop.plasma = { enable = mkEnableOption "enable plasma desktop"; - sddmEnable = mkEnableOption "enable simple display manager"; + # sddmEnable = mkEnableOption "enable simple display manager"; }; }; config = mkIf cfg.enable { services = { desktopManager.plasma6.enable = true; displayManager.sddm = { - enable = cfg.sddmEnable; + enable = true; # cfg.sddmEnable; wayland.enable = true; }; };