Added var for sddm/tui fixed css formatting

On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   hosts/default/variables.nix
	modified:   hosts/zaneyos-oem/variables.nix
	modified:   modules/core/default.nix
	modified:   modules/home/nvf.nix
This commit is contained in:
Don Williams 2025-06-23 23:34:41 -05:00
commit 0401e33491
5 changed files with 62 additions and 24 deletions

View file

@ -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

View file

@ -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 = "<ESC>";
desc = "Exit insert mode";
}
{
key = "<leader>nh";
mode = [ "n" ];
mode = ["n"];
action = ":nohl<CR>";
desc = "Clear search highlights";
}
{
key = "<leader>ff";
mode = [ "n" ];
mode = ["n"];
action = "<cmd>Telescope find_files<cr>";
desc = "Search files by name";
}
{
key = "<leader>lg";
mode = [ "n" ];
mode = ["n"];
action = "<cmd>Telescope live_grep<cr>";
desc = "Search files by contents";
}
{
key = "<leader>fe";
mode = [ "n" ];
mode = ["n"];
action = "<cmd>Neotree toggle<cr>";
desc = "File browser toggle";
}
{
key = "<C-h>";
mode = [ "i" ];
mode = ["i"];
action = "<Left>";
desc = "Move left in insert mode";
}
{
key = "<C-j>";
mode = [ "i" ];
mode = ["i"];
action = "<Down>";
desc = "Move down in insert mode";
}
{
key = "<C-k>";
mode = [ "i" ];
mode = ["i"];
action = "<Up>";
desc = "Move up in insert mode";
}
{
key = "<C-l>";
mode = [ "i" ];
mode = ["i"];
action = "<Right>";
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;