IM FUCKING SISYPHUS SAVE ME

This commit is contained in:
_cry64 2026-02-13 22:14:30 +10:00
parent 02251bd750
commit 099d1960ab
12 changed files with 52 additions and 28 deletions

8
flake.lock generated
View file

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

View file

@ -12,12 +12,12 @@
inputs.nixpkgs.follows = "nixpkgs"; 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 = { cerulean = {
url = "github:cry128/Cerulean"; # url = "github:cry128/Cerulean";
# url = "/home/me/cry/mk/Cerulean"; url = "/home/me/cry/mk/Cerulean";
inputs = { inputs = {
systems.follows = "systems"; systems.follows = "systems";
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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