WIP

khaneliman · Jan 15, 2025 · f15095b · f15095b
1 parent ac19268
commit f15095b
Show file tree

Hide file tree

Showing 232 changed files with 249 additions and 248 deletions.
diff --git a/configurations/darwin/khanelimac/default.nix b/configurations/darwin/khanelimac/default.nix
@@ -1,11 +1,11 @@
 {
-  lib,
   config,
   root,
+  flake,
   ...
 }:
 let
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 
   cfg = config.khanelinix.user;
 in

diff --git a/configurations/home/bruddy@bruddynix/default.nix b/configurations/home/bruddy@bruddynix/default.nix
@@ -1,10 +1,9 @@
 {
-  lib,
-  root,
+  flake,
   ...
 }:
 let
-  inherit (lib.khanelinix) enabled disabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled disabled;
 in
 {
   khanelinix = {

diff --git a/configurations/home/khaneliman@khanelimac/default.nix b/configurations/home/khaneliman@khanelimac/default.nix
@@ -2,11 +2,12 @@
   config,
   lib,
   root,
+  flake,
   ...
 }:
 let
   inherit (lib) mkForce;
-  inherit (lib.khanelinix) enabled disabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled disabled;
 in
 {
   khanelinix = {
@@ -23,8 +24,8 @@ in
             extraAccounts =
               let
                 # Not super secret, just doesn't need to be scraped so easily.
-                outlook = lib.khanelinix.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
-                personal = lib.khanelinix.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
+                outlook = flake.inputs.self.lib.khanelinix.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
+                personal = flake.inputs.self.lib.khanelinix.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
 
               in
               {

diff --git a/configurations/home/khaneliman@khanelinix/default.nix b/configurations/home/khaneliman@khanelinix/default.nix
@@ -3,11 +3,12 @@
   lib,
   pkgs,
   root,
+  flake,
   ...
 }:
 let
   inherit (lib) getExe;
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 in
 {
   khanelinix = {
@@ -25,8 +26,8 @@ in
             extraAccounts =
               let
                 # Not super secret, just doesn't need to be scraped so easily.
-                outlook = lib.khanelinix.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
-                personal = lib.khanelinix.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
+                outlook = flake.inputs.self.lib.khanelinix.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
+                personal = flake.inputs.self.lib.khanelinix.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
 
               in
               {

diff --git a/configurations/home/khaneliman@nixos/default.nix b/configurations/home/khaneliman@nixos/default.nix
@@ -1,11 +1,11 @@
 {
   config,
-  lib,
   root,
+  flake,
   ...
 }:
 let
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 in
 {
   khanelinix = {

diff --git a/configurations/home/nixos@CORE-PW00LM92/default.nix b/configurations/home/nixos@CORE-PW00LM92/default.nix
@@ -1,13 +1,14 @@
 {
   config,
   lib,
-  root,
   osConfig,
+  root,
+  flake,
   ...
 }:
 let
   inherit (lib) mkForce;
-  inherit (lib.khanelinix) enabled disabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled disabled;
 in
 {
   khanelinix = {

diff --git a/configurations/nixos/CORE-PW00LM92/default.nix b/configurations/nixos/CORE-PW00LM92/default.nix
@@ -1,7 +1,7 @@
-{ lib, ... }:
+{ lib, flake, ... }:
 let
   inherit (lib) mkForce;
-  inherit (lib.khanelinix) enabled disabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled disabled;
 in
 {
   # imports = [ ./hardware.nix ];

diff --git a/configurations/nixos/bruddynix/default.nix b/configurations/nixos/bruddynix/default.nix
@@ -1,10 +1,10 @@
 {
   config,
-  lib,
+  flake,
   ...
 }:
 let
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 in
 {
   # imports = [

diff --git a/configurations/nixos/khanelilab/default.nix b/configurations/nixos/khanelilab/default.nix
@@ -1,11 +1,11 @@
 {
   config,
-  lib,
   root,
+  flake,
   ...
 }:
 let
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 in
 {
   # imports = [

diff --git a/configurations/nixos/khanelinix/default.nix b/configurations/nixos/khanelinix/default.nix
@@ -1,11 +1,10 @@
 {
   config,
-  lib,
-  root,
+  flake,
   ...
 }:
 let
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 in
 {
   # imports = [
@@ -175,7 +174,7 @@ in
       sops = {
         enable = true;
         sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-        defaultSopsFile = root + "/secrets/khanelinix/default.yaml";
+        # defaultSopsFile = flake.inputs.self + "/secrets/khanelinix/default.yaml";
       };
     };
 

diff --git a/configurations/nixos/nixos/default.nix b/configurations/nixos/nixos/default.nix
@@ -1,6 +1,6 @@
-{ lib, ... }:
+{ flake, ... }:
 let
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 in
 {
   # imports = [ ./hardware.nix ];

diff --git a/modules/darwin/archetypes/personal/default.nix b/modules/darwin/archetypes/personal/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib.khanelinix) mkBoolOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt enabled;
 
   cfg = config.khanelinix.archetypes.personal;
 in

diff --git a/modules/darwin/archetypes/vm/default.nix b/modules/darwin/archetypes/vm/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib.khanelinix) mkBoolOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt enabled;
 
   cfg = config.khanelinix.archetypes.vm;
 in

diff --git a/modules/darwin/archetypes/workstation/default.nix b/modules/darwin/archetypes/workstation/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib.khanelinix) mkBoolOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt enabled;
 
   cfg = config.khanelinix.archetypes.workstation;
 in

diff --git a/modules/darwin/desktop/addons/jankyborders/default.nix b/modules/darwin/desktop/addons/jankyborders/default.nix
@@ -10,7 +10,7 @@ let
 in
 {
   options.khanelinix.desktop.addons.jankyborders = {
-    enable = lib.khanelinix.mkBoolOpt false "Whether to enable jankyborders in the desktop environment.";
+    enable = flake.inputs.self.lib.khanelinix.mkBoolOpt false "Whether to enable jankyborders in the desktop environment.";
     package = lib.mkOption {
       type = lib.types.package;
       default = pkgs.jankyborders;

diff --git a/modules/darwin/desktop/addons/skhd/default.nix b/modules/darwin/desktop/addons/skhd/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) mkIf getExe;
-  inherit (lib.khanelinix) mkBoolOpt mkOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt mkOpt;
 
   sketchybar = getExe config.services.sketchybar.package;
   yabai = getExe config.services.yabai.package;

diff --git a/modules/darwin/desktop/bars/sketchybar/default.nix b/modules/darwin/desktop/bars/sketchybar/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 let
-  inherit (lib.khanelinix) mkBoolOpt mkOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt mkOpt;
 
   cfg = config.khanelinix.desktop.bars.sketchybar;
 in

diff --git a/modules/darwin/desktop/wms/yabai/default.nix b/modules/darwin/desktop/wms/yabai/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) getExe;
-  inherit (lib.khanelinix) mkBoolOpt mkOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt mkOpt enabled;
 
   cfg = config.khanelinix.desktop.wms.yabai;
 in

diff --git a/modules/darwin/home/default.nix b/modules/darwin/home/default.nix
@@ -6,7 +6,7 @@
   ...
 }:
 let
-  inherit (lib.khanelinix) mkOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkOpt;
 in
 {
 

diff --git a/modules/darwin/programs/graphical/apps/_1password/default.nix b/modules/darwin/programs/graphical/apps/_1password/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.programs.graphical.apps._1password;
 in

diff --git a/modules/darwin/security/gpg/default.nix b/modules/darwin/security/gpg/default.nix
@@ -12,7 +12,7 @@ let
     mkIf
     getExe'
     ;
-  inherit (lib.khanelinix) mkOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkOpt;
 
   cfg = config.khanelinix.security.gpg;
 

diff --git a/modules/darwin/security/sops/default.nix b/modules/darwin/security/sops/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib.khanelinix) mkBoolOpt mkOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt mkOpt;
 
   cfg = config.khanelinix.security.sops;
 in

diff --git a/modules/darwin/services/nix-daemon/default.nix b/modules/darwin/services/nix-daemon/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) types mkIf;
-  inherit (lib.khanelinix) mkOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkOpt enabled;
 
   cfg = config.khanelinix.services.nix-daemon;
 in

diff --git a/modules/darwin/services/tailscale/default.nix b/modules/darwin/services/tailscale/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) types mkIf;
-  inherit (lib.khanelinix) mkOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkOpt;
 
   cfg = config.khanelinix.services.tailscale;
 in

diff --git a/modules/darwin/suites/art/default.nix b/modules/darwin/suites/art/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.suites.art;
 in

diff --git a/modules/darwin/suites/business/default.nix b/modules/darwin/suites/business/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt enabled;
 
   cfg = config.khanelinix.suites.business;
 in

diff --git a/modules/darwin/suites/common/default.nix b/modules/darwin/suites/common/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) mkIf mkDefault;
-  inherit (lib.khanelinix) enabled;
+  inherit (flake.inputs.self.lib.khanelinix) enabled;
 
   cfg = config.khanelinix.suites.common;
 in

diff --git a/modules/darwin/suites/desktop/default.nix b/modules/darwin/suites/desktop/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) mkIf mkDefault;
-  inherit (lib.khanelinix) mkBoolOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt enabled;
 
   cfg = config.khanelinix.suites.desktop;
 in

diff --git a/modules/darwin/suites/development/default.nix b/modules/darwin/suites/development/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.suites.development;
 in

diff --git a/modules/darwin/suites/games/default.nix b/modules/darwin/suites/games/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.suites.games;
 in

diff --git a/modules/darwin/suites/music/default.nix b/modules/darwin/suites/music/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.suites.music;
 in

diff --git a/modules/darwin/suites/networking/default.nix b/modules/darwin/suites/networking/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt enabled;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt enabled;
 
   cfg = config.khanelinix.suites.networking;
 in

diff --git a/modules/darwin/suites/photo/default.nix b/modules/darwin/suites/photo/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.suites.photo;
 in

diff --git a/modules/darwin/suites/social/default.nix b/modules/darwin/suites/social/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.suites.social;
 in

diff --git a/modules/darwin/suites/video/default.nix b/modules/darwin/suites/video/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.khanelinix) mkBoolOpt;
+  inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt;
 
   cfg = config.khanelinix.suites.video;
 in
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
       ...
     }:
     let
-      inherit (lib.khanelinix) mkBoolOpt enabled;
+      inherit (flake.inputs.self.lib.khanelinix) mkBoolOpt enabled;
       cfg = config.khanelinix.archetypes.personal;
     in
@@ Expand Down @@