diff --git a/CHANGELOG.md b/CHANGELOG.md index 801967c..b12f2db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,12 @@ ## ZaneyOS v2.3.3 -- Post GA Release Notes -** Updated: June 23nd, 2025 ** +** Updated: June 24th, 2025 ** +- Re-enabled `css` formatting in `nvf.nix` Thanks `mister_simon` for the fix +- Added variable `displayManager` in `hosts/hostname/variables.nix` +- Set to `sddm` will enable SDDM login manager themed by stylix +- Set to `tui` and you get the greetd text login as before - `hm-find` script wasn't imported so not built - Updated version to v2.3.3 - Added `uwsm` package and enabled it in Hyprland diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index fcb6e81..a79948c 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -3,6 +3,12 @@ gitUsername = "Tyler Kelley"; gitEmail = "tylerzanekelley@gmail.com"; + # Set Displau Manager + # `tui` for Text login + # `sddm` for graphical GUI + # SDDM background is set with stylixImage + displayManager = "sddm"; + # Hyprland Settings # ex: extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1"; # ex: extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1"; @@ -51,7 +57,7 @@ #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; #stylixImage = ../../wallpapers/Rainnight.jpg; - #stylixImage = ../../wallpapers/zamey-wallpaper.jpg; + #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; diff --git a/hosts/zaneyos-oem/variables.nix b/hosts/zaneyos-oem/variables.nix index ce01930..9b2521e 100644 --- a/hosts/zaneyos-oem/variables.nix +++ b/hosts/zaneyos-oem/variables.nix @@ -3,6 +3,12 @@ gitUsername = "Don Williams"; gitEmail = "don.e.williams@gmail.com"; + # Set Displau Manager + # `tui` for Text login + # `sddm` for graphical GUI + # SDDM background is set with stylixImage + displayManager = "sddm"; + # Hyprland Settings extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1"; @@ -25,14 +31,24 @@ # Enable Printing Support printEnable = false; + # Enable Thunar GUI File Manager + thunarEnable = true; + # Set Stylix Image + # This will set your color palette + # Default background + # Add new images to ~/zaneyos/wallpapers stylixImage = ../../wallpapers/mountainscapedark.jpg; #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; + #stylixImage = ../../wallpapers/Rainnight.jpg; + #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; + #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; + #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; # Set Waybar # Available options: - #waybarChoice = ../../modules/home/waybar/Jerry-simple.nix; + #waybarChoice= ../../modules/home/waybar/Jerry-simple.nix; #waybarChoice = ../../modules/home/waybar/Jerry-curved.nix; #waybarChoice = ../../modules/home/waybar/Jerry-waybar.nix; #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; @@ -45,7 +61,7 @@ # animations-dynamic.nix (ml4w project) # animations-moving.nix (ml4w project) animChoice = ../../modules/home/hyprland/animations-end4.nix; - - # Enable Thunar GUI File Manager - thunarEnable = true; + #animChoice = ../../modules/home/hyprland/animations-def.nix; + #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; + #animChoice = ../../modules/home/hyprland/animations-moving.nix; } diff --git a/modules/core/default.nix b/modules/core/default.nix index 8549360..e019bcb 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,20 +1,30 @@ -{inputs, ...}: { +{ + inputs, + host, + ... +}: let + # Import the host-specific variables.nix + vars = import ../../hosts/${host}/variables.nix; +in { imports = [ ./boot.nix ./doas.nix ./flatpak.nix ./fonts.nix - ./greetd.nix ./hardware.nix ./network.nix ./nfs.nix ./nh.nix ./packages.nix ./printing.nix - #./sddm.nix #Disabled for now until can set up per host variables + # Conditionally import the display manager module + ( + if vars.displayManager == "tui" + then ./greetd.nix + else ./sddm.nix + ) ./security.nix ./services.nix - #./starfish.nix Not sure why this is here, as it's in modules/home ./steam.nix ./stylix.nix ./syncthing.nix diff --git a/modules/home/nvf.nix b/modules/home/nvf.nix index 29b5beb..7ee8281 100644 --- a/modules/home/nvf.nix +++ b/modules/home/nvf.nix @@ -2,9 +2,8 @@ inputs, config, ... -}: -{ - imports = [ inputs.nvf.homeManagerModules.default ]; +}: { + imports = [inputs.nvf.homeManagerModules.default]; programs.nvf = { enable = true; @@ -52,55 +51,55 @@ keymaps = [ { key = "jk"; - mode = [ "i" ]; + mode = ["i"]; action = ""; desc = "Exit insert mode"; } { key = "nh"; - mode = [ "n" ]; + mode = ["n"]; action = ":nohl"; desc = "Clear search highlights"; } { key = "ff"; - mode = [ "n" ]; + mode = ["n"]; action = "Telescope find_files"; desc = "Search files by name"; } { key = "lg"; - mode = [ "n" ]; + mode = ["n"]; action = "Telescope live_grep"; desc = "Search files by contents"; } { key = "fe"; - mode = [ "n" ]; + mode = ["n"]; action = "Neotree toggle"; desc = "File browser toggle"; } { key = ""; - mode = [ "i" ]; + mode = ["i"]; action = ""; desc = "Move left in insert mode"; } { key = ""; - mode = [ "i" ]; + mode = ["i"]; action = ""; desc = "Move down in insert mode"; } { key = ""; - mode = [ "i" ]; + mode = ["i"]; action = ""; desc = "Move up in insert mode"; } { key = ""; - mode = [ "i" ]; + mode = ["i"]; action = ""; desc = "Move right in insert mode"; } @@ -110,7 +109,7 @@ spellcheck = { enable = true; - languages = [ "en" ]; + languages = ["en"]; programmingWordlist.enable = true; }; @@ -142,7 +141,10 @@ }; html.enable = true; lua.enable = true; - css.enable = false; + css = { + enable = true; + format.type = "prettierd"; + }; typst.enable = true; rust = { enable = true;