This commit is contained in:
mjallen18
2025-12-14 21:50:50 -06:00
parent 0012a019fc
commit 34539045e5
41 changed files with 164 additions and 251 deletions

View File

@@ -1,7 +1,7 @@
{ config, lib, ... }:
{ config, lib, namespace, ... }:
with lib;
let
cfg = config.mjallen.programs.btop;
cfg = config.${namespace}.programs.btop;
in
{
imports = [ ./options.nix ];

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{ lib, namespace, ... }:
with lib;
{
options.mjallen.programs.btop = {
options.${namespace}.programs.btop = {
enable = mkEnableOption "enable btop";
};
}

View File

@@ -2,11 +2,12 @@
config,
lib,
pkgs,
namespace,
...
}:
with lib;
let
cfg = config.mjallen.programs.hyprland;
cfg = config.${namespace}.programs.hyprland;
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${config.stylix.icons.dark}";
in
{
@@ -66,7 +67,7 @@ in
xsettingsd
xwayland
pkgs.mjallen.pipewire-python
pkgs.${namespace}.pipewire-python
]
++ (if cfg.notificationDaemon == "mako" then [ mako ] else [ dunst ])
++ (if cfg.launcher == "wofi" then [ wofi ] else [ rofi ])

View File

@@ -1,7 +1,7 @@
{ lib, pkgs, ... }:
{ lib, pkgs, namespace, ... }:
with lib;
{
options.mjallen.programs.hyprland = {
options.${namespace}.programs.hyprland = {
enable = mkEnableOption "enable hyprland";
primaryDisplay = mkOption {

View File

@@ -1,7 +1,7 @@
{ lib, config, ... }:
{ lib, config, namespace, ... }:
with lib;
let
cfg = config.mjallen.programs.kitty;
cfg = config.${namespace}.programs.kitty;
in
{
imports = [ ./options.nix ];

View File

@@ -4,7 +4,7 @@ let
inherit (lib.${namespace}) mkOpt;
in
{
options.mjallen.programs.kitty = {
options.${namespace}.programs.kitty = {
enable = mkEnableOption "enable kitty terminal";
};
}

View File

@@ -1,7 +1,7 @@
{ config, lib, ... }:
{ config, lib, namespace, ... }:
with lib;
let
cfg = config.mjallen.programs.mako;
cfg = config.${namespace}.programs.mako;
in
{
imports = [ ./options.nix ];

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{ lib, namespace, ... }:
with lib;
{
options.mjallen.programs.mako = {
options.${namespace}.programs.mako = {
enable = mkEnableOption "enable mako";
fontName = mkOption {

View File

@@ -2,11 +2,12 @@
config,
lib,
pkgs,
namespace,
...
}:
with lib;
let
cfg = config.mjallen.programs.nwg-dock;
cfg = config.${namespace}.programs.nwg-dock;
palette = import cfg.theme.file;
in
{

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{ lib, namespace, ... }:
with lib;
{
options.mjallen.programs.nwg-dock = {
options.${namespace}.programs.nwg-dock = {
enable = mkEnableOption "enable nwg-dock";
};
}

View File

@@ -2,11 +2,12 @@
config,
lib,
pkgs,
namespace,
...
}:
with lib;
let
cfg = config.mjallen.programs.nwg-drawer;
cfg = config.${namespace}.programs.nwg-drawer;
palette = import cfg.theme.file;
in
{

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{ lib, namespace, ... }:
with lib;
{
options.mjallen.programs.nwg-drawer = {
options.${namespace}.programs.nwg-drawer = {
enable = mkEnableOption "enable nwg-drawer";
};
}

View File

@@ -1,7 +1,7 @@
{ config, lib, ... }:
{ config, lib, namespace, ... }:
with lib;
let
cfg = config.mjallen.programs.nwg-panel;
cfg = config.${namespace}.programs.nwg-panel;
in
{
imports = [ ./options.nix ];

View File

@@ -1,7 +1,7 @@
{ lib, pkgs, ... }:
{ lib, pkgs, namespace, ... }:
with lib;
{
options.mjallen.programs.nwg-panel = {
options.${namespace}.programs.nwg-panel = {
enable = mkEnableOption "enable nwg-panel";
defaultApps = mkOption {

View File

@@ -1,7 +1,7 @@
{ config, lib, ... }:
{ config, lib, namespace, ... }:
with lib;
let
cfg = config.mjallen.programs.waybar;
cfg = config.${namespace}.programs.waybar;
baseStyle =
if cfg.style.file != null then

View File

@@ -1,4 +1,4 @@
{ lib, ... }:
{ lib, namespace, ... }:
with lib;
let
inherit (types)
@@ -13,7 +13,7 @@ let
;
in
{
options.mjallen.programs.waybar = {
options.${namespace}.programs.waybar = {
enable = mkEnableOption "Waybar status bar";
# Legacy/compat options (kept for backwards compatibility)

View File

@@ -6,7 +6,7 @@
...
}:
let
cfg = config.mjallen.programs.waybar;
cfg = config.${namespace}.programs.waybar;
pythonEnv = pkgs.python3.withPackages (_ps: [
pkgs.${namespace}.homeassistant-api

View File

@@ -2,10 +2,11 @@
config,
lib,
pkgs,
namespace,
...
}:
let
cfg = config.mjallen.programs.waybar;
cfg = config.${namespace}.programs.waybar;
waybar-weather = pkgs.writeScriptBin "waybar-weather" ''
#!/usr/bin/env nix-shell

View File

@@ -1,7 +1,7 @@
{ config, lib, ... }:
{ config, lib, namespace, ... }:
with lib;
let
cfg = config.mjallen.programs.wlogout;
cfg = config.${namespace}.programs.wlogout;
palette = import cfg.theme.file;
in
{

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{ lib, namespace, ... }:
with lib;
{
options.mjallen.programs.wlogout = {
options.${namespace}.programs.wlogout = {
enable = mkEnableOption "enable wlogout";
};
}

View File

@@ -1,7 +1,7 @@
{ config, lib, ... }:
{ config, lib, namespace, ... }:
with lib;
let
cfg = config.mjallen.programs.wofi;
cfg = config.${namespace}.programs.wofi;
palette = import cfg.theme.file;
in
{

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{ lib, namespace, ... }:
with lib;
{
options.mjallen.programs.wofi = {
options.${namespace}.programs.wofi = {
enable = mkEnableOption "enable wofi";
fontName = mkOption {