flake.lock

@@ -17,8 +17,8 @@
         ]
       },
       "locked": {
-        "lastModified": 1770984845,
+        "lastModified": 1770974095,
-        "narHash": "sha256-si6XCx0xGq3z7dZSVCx5NgVxgFdnTc1qaKro5IemG70=",
+        "narHash": "sha256-7plCbyNGVinY0Ti+MIR8tU+BJDe1qvyXCKq1TDk9tc8=",
         "path": "/home/me/cry/mk/Cerulean",
         "type": "path"
       },
@@ -354,8 +354,8 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1770975061,
+        "lastModified": 1770954326,
-        "narHash": "sha256-dedEcQSEzur2/pBcxFFygkSrMuKGOUWThOUD2LXMCsA=",
+        "narHash": "sha256-PZ+78r+iFZ90l6fdwC73SSyNyCqaiZIAFeDg0qBHY+8=",
         "path": "/home/me/cry/mk/nt",
         "type": "path"
       },

flake.nix

@@ -12,12 +12,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # nt.url = "github:cry128/nt";
+    nt.url = "github:cry128/nt";
-    nt.url = "/home/me/cry/mk/nt";
+    # nt.url = "/home/me/cry/mk/nt";
 
     cerulean = {
-      # url = "github:cry128/Cerulean";
+      url = "github:cry128/Cerulean";
-      url = "/home/me/cry/mk/Cerulean";
+      # url = "/home/me/cry/mk/Cerulean";
       inputs = {
         systems.follows = "systems";
         nixpkgs.follows = "nixpkgs";

groups/cryde/default.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  upkgs,
   config,
   ...
 }: {

groups/cryde/programs.nix

@@ -27,6 +27,6 @@
     upkgs.olympus # celeste
     discord
     discordo
-    upkgs.ekphos
+    ekphos
   ];
 }

groups/cryos/programs.nix

@@ -19,7 +19,7 @@
     hexyl
     # ASM
     nasm
-    # x86-manpages # DEBUG
+    x86-manpages
     # C Family
     gcc
     clang
@@ -110,12 +110,4 @@
     openssl
     libargon2
   ];
-
-  programs = {
-    gnupg.agent = {
-      enable = true;
-      pinentryPackage = pkgs.pinentry-curses;
-      enableSSHSupport = true;
-    };
-  };
 }

homes/me/default.nix

@@ -1,8 +1,12 @@
 {
+  inputs,
+  outputs,
   lib,
+  config,
   pkgs,
+  upkgs,
   ...
-}: {
+} @ args: {
   imports = [
     ../modules/fish.nix
     ../modules/btop.nix

homes/modules/editor/helix.nix

@@ -1,6 +1,6 @@
 {
   pkgs,
-  # upkgs,
+  upkgs,
   ...
 }: let
   lsps = {
@@ -43,7 +43,7 @@
     };
 
     ty = {
-      pkg = pkgs.ty; # DEBUG: upkgs.ty;
+      pkg = upkgs.ty;
       cmd = "ty";
     };
 

homes/modules/git.nix

@@ -11,9 +11,9 @@
     userEmail = "them@dobutterfliescry.net";
 
     signing = {
-      # key = "F68745A836CA0412";
+      key = "F68745A836CA0412";
-      # format = "openpgp";
+      format = "openpgp";
-      # signByDefault = true;
+      signByDefault = true;
     };
 
     aliases = {

homes/modules/term/foot.nix

@@ -1,8 +1,7 @@
-# DEBUG: {upkgs, ...}: {
+{upkgs, ...}: {
-{pkgs, ...}: {
   programs.foot = {
     enable = true;
-    package = pkgs.foot; # DEBUG: upkgs.foot;
+    package = upkgs.foot;
 
     server.enable = true;
 

homes/modules/wm/hypr/hyprland.nix

@@ -14,7 +14,7 @@
   config = lib.mkIf config.hyprland.enable {
     wayland.windowManager.hyprland = {
       enable = true;
-      package = pkgs.hyprland;
+      package = pkgs.hyprland; # upkgs.hyprland;
 
       xwayland.enable = true;
 

nixpkgs.nix

@@ -1,39 +1,23 @@
 {
-  lib,
+  root,
   inputs,
-  system,
   ...
 }: {
   nixpkgs.channels.default = {
     # nixpkgs (stable branch)
     pkgs = {
-      inherit system;
       source = inputs.nixpkgs;
       overlays =
         [inputs.dobutterfliescry-net.overlays.default]
-        ++ import ./overlays/default.nix;
+        ++ import (root + "/overlays");
       config = {
-        # allowUnfree = false;
+        allowUnfree = false;
         allowBroken = false;
-        allowUnfreePredicate = pkg:
-          builtins.elem (lib.getName pkg) [
-            "discord"
-            "steam"
-            "steamcmd"
-            "steam-unwrapped"
-
-            "obsidian"
-            "gitkraken"
-          ];
       };
     };
     # nixpkgs-unstable
     upkgs = {
-      inherit system;
       source = inputs.nixpkgs-unstable;
-      overlays =
-        [inputs.dobutterfliescry-net.overlays.default]
-        ++ import ./overlays/default.nix;
       config = {
         allowUnfree = false;
         allowBroken = false;

snow.nix

@@ -13,10 +13,6 @@ cerulean.mkNexus ./. (self: {
       server = {};
     };
 
-    extraModules = with inputs; [
-      home-manager.nixosModules.default
-    ];
-
     nodes = let
       inherit
         (self.nexus)
@@ -28,6 +24,7 @@ cerulean.mkNexus ./. (self: {
         system = "x86_64-linux";
         groups = [groups.cryos.cryde];
         extraModules = with inputs; [
+          home-manager.nixosModules.default
           grub2-themes.nixosModules.default
           nix-flatpak.nixosModules.nix-flatpak
         ];
@@ -38,6 +35,7 @@ cerulean.mkNexus ./. (self: {
         system = "x86_64-linux";
         groups = [groups.cryos.cryde];
         extraModules = with inputs; [
+          home-manager.nixosModules.default
           grub2-themes.nixosModules.default
           nix-flatpak.nixosModules.nix-flatpak
         ];