This commit is contained in:
mjallen18
2025-12-01 17:13:37 -06:00
parent 2bf51abad5
commit 6a99106ca4
12 changed files with 177 additions and 120 deletions

View File

@@ -0,0 +1,18 @@
{
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled disabled;
in
{
home.username = "root";
services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
};
}

View File

@@ -0,0 +1,18 @@
{
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled disabled;
in
{
home.username = "root";
services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
};
}

View File

@@ -0,0 +1,18 @@
{
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled disabled;
in
{
home.username = "root";
services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
};
}

View File

@@ -0,0 +1,18 @@
{
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled disabled;
in
{
home.username = "root";
services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
};
}

View File

@@ -0,0 +1,18 @@
{
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled disabled;
in
{
home.username = "root";
services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
};
}

View File

@@ -0,0 +1,18 @@
{
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled disabled;
in
{
home.username = "root";
services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
};
}

View File

@@ -0,0 +1,18 @@
{
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled disabled;
in
{
home.username = "root";
services = {
nextcloud-client = lib.mkForce disabled;
kdeconnect = {
enable = false;
indicator = false;
};
};
}

View File

@@ -12,7 +12,6 @@ in
{
imports = [
./options.nix
./theme.nix
];
config = mkIf cfg.enable {

View File

@@ -1,75 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib;
let
cfg = config.mjallen.programs.hyprland;
# Pull from global theme options
themeSize = "standard"; # "standard" | "compact"
themeAccent = "default"; # "default" | ... | "all"
themeTweak = "normal"; # "normal" | "rimless" | "float" | "black"
themeColor = "dark"; # "light" | "dark"
iconThemeVariant = "default"; # "default" | ... | "all"
iconScheme = "nord"; # "default" | "nord" | "dracula" | ...
# GTK
gtkTheme = "Colloid-dark-standard";
gtkThemePkg = pkgs.colloid-gtk-theme.override {
sizeVariants = [ themeSize ];
colorVariants = [ themeColor ];
themeVariants = [ themeAccent ];
tweaks = [ themeTweak ];
};
# Icons
iconTheme = "Colloid-nord-dark";
iconThemePkg = pkgs.colloid-icon-theme.override {
schemeVariants = [ iconScheme ];
colorVariants = [ iconThemeVariant ];
};
in
{
config = mkIf cfg.enable {
# dconf = {
# enable = true;
# settings = {
# "org/gnome/desktop/interface".color-scheme = mkForce "prefer-dark";
# # "org/gnome/desktop/interface".cursor-theme = cursorTheme;
# "org/gnome/desktop/interface".gtk-theme = gtkTheme;
# "org/gnome/desktop/interface".icon-theme = iconTheme;
# };
# };
# gtk = {
# enable = true;
# cursorTheme = {
# name = cursorTheme;
# package = cursorThemePkg;
# };
# theme = {
# name = gtkTheme;
# package = gtkThemePkg;
# };
# iconTheme = {
# name = iconTheme;
# package = iconThemePkg;
# };
# gtk3.extraConfig = {
# gtk-application-prefer-dark-theme = true;
# };
# gtk4.extraConfig = {
# gtk-application-prefer-dark-theme = true;
# };
# };
};
}

View File

@@ -14,7 +14,7 @@ in
{
programs = {
nix-index-database.comma.enable = true;
zsh.enable = lib.mkDefault true;
zsh.enable = lib.mkForce true;
gnupg.agent = {
enable = lib.mkDefault true;
enableSSHSupport = lib.mkDefault true;

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{
programs = {
zsh.enable = lib.mkDefault true;
zsh.enable = lib.mkForce true;
gnupg.agent = {
enable = lib.mkDefault true;
enableSSHSupport = lib.mkDefault true;

View File

@@ -69,51 +69,58 @@ in
users = {
mutableUsers = cfg.mutableUsers;
groups.${cfg.group}.gid = lib.mkForce (if cfg.group != "wheel" then cfg.gid else 1);
users.${cfg.name} = {
inherit (cfg)
name
uid
linger
packages
password
hashedPassword
hashedPasswordFile
;
users = {
root = {
isSystemUser = true;
isNormalUser = false;
shell = lib.mkForce pkgs.zsh;
};
${cfg.name} = {
inherit (cfg)
name
uid
linger
packages
password
hashedPassword
hashedPasswordFile
;
extraGroups = [
"wheel"
"keys"
"networkmanager"
"ratbagd"
"scanner"
"systemd-journal"
"mpd"
"audio"
"video"
"input"
"plugdev"
"lp"
"tss"
"power"
"nix"
"i2c"
"media"
"nscd"
"avahi"
"podman"
"libvirtd"
]
++ cfg.extraGroups;
extraGroups = [
"wheel"
"keys"
"networkmanager"
"ratbagd"
"scanner"
"systemd-journal"
"mpd"
"audio"
"video"
"input"
"plugdev"
"lp"
"tss"
"power"
"nix"
"i2c"
"media"
"nscd"
"avahi"
"podman"
"libvirtd"
]
++ cfg.extraGroups;
group = cfg.group;
home = "/home/${cfg.name}";
isNormalUser = true;
shell = lib.mkForce pkgs.zsh;
group = cfg.group;
home = "/home/${cfg.name}";
isNormalUser = true;
shell = lib.mkForce pkgs.zsh;
# SSH keys - combine user-specific and common keys
openssh.authorizedKeys.keys = cfg.sshKeys ++ (lib.optionals cfg.enableCommonSshKeys commonSshKeys);
}
// cfg.extraOptions;
# SSH keys - combine user-specific and common keys
openssh.authorizedKeys.keys = cfg.sshKeys ++ (lib.optionals cfg.enableCommonSshKeys commonSshKeys);
}
// cfg.extraOptions;
};
};
assertions = [
{