From 099d1960ab8b170c23c1c07bf59916e564ec136d Mon Sep 17 00:00:00 2001 From: _cry64 Date: Fri, 13 Feb 2026 22:14:30 +1000 Subject: [PATCH] IM FUCKING SISYPHUS SAVE ME --- flake.lock | 8 ++++---- flake.nix | 8 ++++---- groups/cryde/default.nix | 1 + groups/cryde/programs.nix | 2 +- groups/cryos/programs.nix | 10 +++++++++- homes/me/default.nix | 6 +----- homes/modules/editor/helix.nix | 4 ++-- homes/modules/git.nix | 6 +++--- homes/modules/term/foot.nix | 5 +++-- homes/modules/wm/hypr/hyprland.nix | 2 +- nixpkgs.nix | 22 +++++++++++++++++++--- snow.nix | 6 ++++-- 12 files changed, 52 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index ec582ef..ef08cd8 100644 --- a/flake.lock +++ b/flake.lock @@ -17,8 +17,8 @@ ] }, "locked": { - "lastModified": 1770974095, - "narHash": "sha256-7plCbyNGVinY0Ti+MIR8tU+BJDe1qvyXCKq1TDk9tc8=", + "lastModified": 1770984385, + "narHash": "sha256-CwSXJ5b0f3etnFdh8SaLeW8DMxCdu/r00D9xUFvfJTw=", "path": "/home/me/cry/mk/Cerulean", "type": "path" }, @@ -354,8 +354,8 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770954326, - "narHash": "sha256-PZ+78r+iFZ90l6fdwC73SSyNyCqaiZIAFeDg0qBHY+8=", + "lastModified": 1770975061, + "narHash": "sha256-dedEcQSEzur2/pBcxFFygkSrMuKGOUWThOUD2LXMCsA=", "path": "/home/me/cry/mk/nt", "type": "path" }, diff --git a/flake.nix b/flake.nix index 238f561..6f73362 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nt.url = "github:cry128/nt"; - # nt.url = "/home/me/cry/mk/nt"; + # nt.url = "github:cry128/nt"; + nt.url = "/home/me/cry/mk/nt"; cerulean = { - url = "github:cry128/Cerulean"; - # url = "/home/me/cry/mk/Cerulean"; + # url = "github:cry128/Cerulean"; + url = "/home/me/cry/mk/Cerulean"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; diff --git a/groups/cryde/default.nix b/groups/cryde/default.nix index 359642e..03cdd2c 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -1,5 +1,6 @@ { pkgs, + upkgs, config, ... }: { diff --git a/groups/cryde/programs.nix b/groups/cryde/programs.nix index a07eaa7..09c0a67 100644 --- a/groups/cryde/programs.nix +++ b/groups/cryde/programs.nix @@ -27,6 +27,6 @@ upkgs.olympus # celeste discord discordo - ekphos + upkgs.ekphos ]; } diff --git a/groups/cryos/programs.nix b/groups/cryos/programs.nix index 4ec2405..947a1e5 100644 --- a/groups/cryos/programs.nix +++ b/groups/cryos/programs.nix @@ -19,7 +19,7 @@ hexyl # ASM nasm - x86-manpages + # x86-manpages # DEBUG # C Family gcc clang @@ -110,4 +110,12 @@ openssl libargon2 ]; + + programs = { + gnupg.agent = { + enable = true; + pinentryPackage = pkgs.pinentry-curses; + enableSSHSupport = true; + }; + }; } diff --git a/homes/me/default.nix b/homes/me/default.nix index c9a57cc..8484344 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -1,12 +1,8 @@ { - inputs, - outputs, lib, - config, pkgs, - upkgs, ... -} @ args: { +}: { imports = [ ../modules/fish.nix ../modules/btop.nix diff --git a/homes/modules/editor/helix.nix b/homes/modules/editor/helix.nix index 4119cc5..bccdc13 100755 --- a/homes/modules/editor/helix.nix +++ b/homes/modules/editor/helix.nix @@ -1,6 +1,6 @@ { pkgs, - upkgs, + # upkgs, ... }: let lsps = { @@ -43,7 +43,7 @@ }; ty = { - pkg = upkgs.ty; + pkg = pkgs.ty; # DEBUG: upkgs.ty; cmd = "ty"; }; diff --git a/homes/modules/git.nix b/homes/modules/git.nix index f035281..402efaa 100755 --- a/homes/modules/git.nix +++ b/homes/modules/git.nix @@ -11,9 +11,9 @@ userEmail = "them@dobutterfliescry.net"; signing = { - key = "F68745A836CA0412"; - format = "openpgp"; - signByDefault = true; + # key = "F68745A836CA0412"; + # format = "openpgp"; + # signByDefault = true; }; aliases = { diff --git a/homes/modules/term/foot.nix b/homes/modules/term/foot.nix index 8e40209..4fdaad5 100644 --- a/homes/modules/term/foot.nix +++ b/homes/modules/term/foot.nix @@ -1,7 +1,8 @@ -{upkgs, ...}: { +# DEBUG: {upkgs, ...}: { +{pkgs, ...}: { programs.foot = { enable = true; - package = upkgs.foot; + package = pkgs.foot; # DEBUG: upkgs.foot; server.enable = true; diff --git a/homes/modules/wm/hypr/hyprland.nix b/homes/modules/wm/hypr/hyprland.nix index 4db2870..38ed5af 100755 --- a/homes/modules/wm/hypr/hyprland.nix +++ b/homes/modules/wm/hypr/hyprland.nix @@ -14,7 +14,7 @@ config = lib.mkIf config.hyprland.enable { wayland.windowManager.hyprland = { enable = true; - package = pkgs.hyprland; # upkgs.hyprland; + package = pkgs.hyprland; xwayland.enable = true; diff --git a/nixpkgs.nix b/nixpkgs.nix index 549ca0b..12e275c 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,23 +1,39 @@ { - root, + lib, inputs, + system, ... }: { nixpkgs.channels.default = { # nixpkgs (stable branch) pkgs = { + inherit system; source = inputs.nixpkgs; overlays = [inputs.dobutterfliescry-net.overlays.default] - ++ import (root + "/overlays"); + ++ import ./overlays/default.nix; 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; diff --git a/snow.nix b/snow.nix index 5fe3054..7b263f3 100644 --- a/snow.nix +++ b/snow.nix @@ -13,6 +13,10 @@ cerulean.mkNexus ./. (self: { server = {}; }; + extraModules = with inputs; [ + home-manager.nixosModules.default + ]; + nodes = let inherit (self.nexus) @@ -24,7 +28,6 @@ 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 ]; @@ -35,7 +38,6 @@ 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 ];