cleanup

modules/home/programs/btop/default.nix

@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.btop;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 in
 {
   imports = [ ./options.nix ];

modules/home/programs/kitty/default.nix

@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.kitty;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 in
 {
   imports = [ ./options.nix ];

modules/home/programs/kitty/options.nix

@@ -15,13 +15,13 @@ with lib;
       };
       size = mkOption {
         type = with types; int;
-        default = 8;
+        default = 12;
       };
     };
 
     theme = mkOption {
       type = types.attrs;
-      default = import ../../desktop/theme/nord.nix;
+      default = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
     };
   };
 }

modules/home/programs/mako/default.nix

@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.mako;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 in
 {
   imports = [ ./options.nix ];

modules/home/programs/nwg-dock/default.nix

@@ -7,7 +7,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.nwg-dock;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 in
 {
   imports = [ ./options.nix ];

modules/home/programs/nwg-drawer/default.nix

@@ -7,7 +7,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.nwg-drawer;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 in
 {
   imports = [ ./options.nix ];

modules/home/programs/waybar/default.nix

@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.waybar;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 
   defaultOpacity = "opacity: 0.85;";
   defaultBorderRadius = "border-radius: 1rem;";

modules/home/programs/wlogout/default.nix

@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.wlogout;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 in
 {
   imports = [ ./options.nix ];

modules/home/programs/wofi/default.nix

@@ -2,7 +2,7 @@
 with lib;
 let
   cfg = config.mjallen.programs.wofi;
-  nord = import ../../desktop/theme/nord.nix;
+  nord = import (lib.snowfall.fs.get-file "modules/home/desktop/theme/nord.nix");
 in
 {
   imports = [ ./options.nix ];

modules/nixos/homeassistant/default.nix

@@ -93,6 +93,7 @@ in
         pkgs.${namespace}.ha-icloud3
         pkgs.${namespace}.ha-mail-and-packages
         pkgs.${namespace}.ha-nanokvm
+        pkgs.${namespace}.ha-openhasp
         pkgs.${namespace}.ha-overseerr
         pkgs.${namespace}.ha-petlibro
         pkgs.${namespace}.ha-wyzeapi

modules/nixos/sops/default.nix

@@ -1,4 +1,8 @@
 { lib, ... }:
+let
+  defaultSops = (lib.snowfall.fs.get-file "secrets/pi4-secrets.yaml");
+  # sharedSops = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
+in
 {
   # Permission modes are in octal representation (same as chmod),
   # the digits represent: user|group|others
@@ -15,7 +19,7 @@
   # Either the group id or group name representation of the secret group
   # It is recommended to get the group name from `config.users.users.<?name>.group` to avoid misconfiguration
   sops = {
-    defaultSopsFile = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
+    defaultSopsFile = defaultSops;
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
     # ------------------------------
@@ -28,27 +32,27 @@
       # SSH keys
       # ------------------------------
       # "ssh-keys-public/desktop-nixos" = {
-      #   sopsFile = ../../secrets/secrets.yaml;
+      #   sopsFile = sharedSops;
       #   mode = "0644";
       #   owner = config.users.users."${user}".name;
       #   group = config.users.users."${user}".group;
       #   restartUnits = [ "sshd.service" ];
       # };
       # "ssh-keys-private/desktop-nixos" = {
-      #   sopsFile = ../../secrets/secrets.yaml;
+      #   sopsFile = sharedSops;
       #   mode = "0600";
       #   owner = config.users.users."${user}".name;
       #   group = config.users.users."${user}".group;
       #   restartUnits = [ "sshd.service" ];
       # };
       # "ssh-keys-public/desktop-nixos-root" = {
-      #   sopsFile = ../../secrets/secrets.yaml;
+      #   sopsFile = sharedSops;
       #   path = "/root/.ssh/id_ed25519.pub";
       #   mode = "0600";
       #   restartUnits = [ "sshd.service" ];
       # };
       # "ssh-keys-private/desktop-nixos-root" = {
-      #   sopsFile = ../../secrets/secrets.yaml;
+      #   sopsFile = sharedSops;
       #   path = "/root/.ssh/id_ed25519";
       #   mode = "0600";
       #   restartUnits = [ "sshd.service" ];