diff --git a/flake.nix b/flake.nix index 9e16ae7..3268352 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ home-manager-unstable.url = "github:nix-community/home-manager"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; - cerulean.url = "github:cry128/cerulean/v0.2.4-alpha"; + cerulean.url = "github:cry128/cerulean/refactor/snowflake"; cerulean.inputs.systems.follows = "systems"; cerulean.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -33,10 +33,15 @@ inputs.home-manager.follows = "home-manager-unstable"; }; - mangowm = { + mango = { url = "github:mangowm/mango"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + + sddm-silent = { + url = "github:uiriansan/SilentSDDM"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; nixConfig = { diff --git a/groups/yezelhlev/default.nix b/groups/yezelhlev/default.nix index 579feb1..f185a88 100644 --- a/groups/yezelhlev/default.nix +++ b/groups/yezelhlev/default.nix @@ -15,7 +15,11 @@ variant = ""; }; # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; + services.displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + services.desktopManager.plasma6.enable = true; # Enable CUPS to print documents. @@ -64,10 +68,18 @@ flake = "/home/dea/dea-files"; # sets NH_OS_FLAKE variable for you }; - programs.mangowm = { + programs.mango = { enable = false; # TODO: enable mango after configuring }; + programs.silentSDDM = { + enable = true; + theme = "rei"; + backgrounds.dea = /${root}/assets/wallpapers/home.jpg; + profileIcons.dea = /${root}/assets/pfps/happy.jpg; + settings = { }; + }; + users.users.dea = { description = "dea"; isNormalUser = true; diff --git a/groups/yezelhlev/programs.nix b/groups/yezelhlev/programs.nix index c179b7c..c30e580 100644 --- a/groups/yezelhlev/programs.nix +++ b/groups/yezelhlev/programs.nix @@ -25,7 +25,6 @@ calcure # calendar app TODO: remove & fork calendar.vim # editors - lunarvim vscode # languages @@ -55,10 +54,10 @@ bottles # windows emulation # dependencies - qt5.qtbase # vivaldi + others + libsForQt5.qtbase # vivaldi + others libsForQt5.qtstyleplugin-kvantum # libs for Qt5 libsForQt5.qt5ct - libsForQt5.qt5.qtbase + qt5.qtbase hunspell # spellcheck for libreoffice hunspellDicts.uk_UA diff --git a/homes/modules/wm/default.nix b/homes/modules/wm/default.nix index 452c844..85a8041 100644 --- a/homes/modules/wm/default.nix +++ b/homes/modules/wm/default.nix @@ -3,7 +3,7 @@ { options = { deaFiles.wm = lib.mkOption { - type = lib.types.enum [lib.listDir ./ |> builtins.toString]; + type = lib.types.enum [(lib.listDir ./. |> builtins.toString)]; default = null; }; }; diff --git a/nixpkgs.nix b/nixpkgs.nix index 161619b..e0c3f76 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -2,10 +2,11 @@ inputs, system, ... -} @ args: { +}@args: +{ nixpkgs.channels = rec { base = spkgs; - spkgs= { + spkgs = { inherit system; source = inputs.nixpkgs; overlays = [ @@ -14,6 +15,9 @@ config = { allowUnfree = true; allowBroken = false; + permittedInsecurePackages = [ + "pnpm-10.29.2" + ]; }; }; @@ -28,6 +32,9 @@ config = { allowUnfree = true; allowBroken = false; + permittedInsecurePackages = [ + "pnpm-10.29.2" + ]; }; }; }; diff --git a/snow.nix b/snow.nix index 9690722..6687cea 100644 --- a/snow.nix +++ b/snow.nix @@ -6,7 +6,8 @@ args = {inherit inputs;}; modules = [ inputs.nix-flatpak.nixosModules.nix-flatpak - inputs.mangowm.nixosModules.mango + inputs.sddm-silent.nixosModules.default + inputs.mango.nixosModules.mango ]; groups = {