From 3c1b5d5072a6e9180e55b7c36bf66599c037dbea Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 5 Sep 2025 11:19:35 -0500 Subject: [PATCH] stuff --- modules/home/programs/kitty/options.nix | 12 +++++++----- modules/nixos/impermanence/default.nix | 12 ------------ systems/x86_64-linux/jallen-nas/default.nix | 6 ++++++ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/modules/home/programs/kitty/options.nix b/modules/home/programs/kitty/options.nix index 8243b36..2afd857 100644 --- a/modules/home/programs/kitty/options.nix +++ b/modules/home/programs/kitty/options.nix @@ -1,5 +1,8 @@ -{ lib, ... }: +{ lib, namespace, ... }: with lib; +let + inherit (lib.${namespace}) mkOpt; +in { options.mjallen.programs.kitty = { enable = mkEnableOption "enable kitty terminal"; @@ -9,10 +12,9 @@ with lib; type = types.str; default = "DejaVu Sans"; }; - package = mkOption { - type = types.package; - default = pkgs.dejavu_fonts; - }; + + package = mkOpt types.package pkgs.dejavu_fonts "Default font package"; + size = mkOption { type = with types; int; default = 12; diff --git a/modules/nixos/impermanence/default.nix b/modules/nixos/impermanence/default.nix index 7d4704f..b4f86ba 100755 --- a/modules/nixos/impermanence/default.nix +++ b/modules/nixos/impermanence/default.nix @@ -61,12 +61,6 @@ in "/var/lib/systemd/coredump" "/etc/NetworkManager/system-connections" "/var/lib/tailscale" - { - directory = "/var/lib/colord"; - user = "colord"; - group = "colord"; - mode = "u=rwx,g=rx,o="; - } { directory = "/etc/nix"; user = "root"; @@ -77,12 +71,6 @@ in directory = "/var/lib/private"; mode = "u=rwx,g=rx,o="; } - { - directory = "/media/nas"; - user = "nas-apps"; - group = "jallen-nas"; - mode = "u=rwx,g=rx,o=rx"; - } ] ++ cfg.extraDirectories; files = [ diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index 0bfb08b..d087173 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -91,6 +91,12 @@ group = "traefik"; mode = "u=rwx,g=rwx,o=rx"; } + { + directory = "/media"; + user = "nas-apps"; + group = "jallen-nas"; + mode = "u=rwx,g=rx,o=rx"; + } ]; };