blahai/nyx
1
0
Fork 0
mirror of https://github.com/blahai/nyx.git synced 2025-02-22 22:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

stuff

Browse source
This commit is contained in:
blahai 2025-02-03 21:08:53 +02:00
parent f38cce9ed5
commit 36216c3d56
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
5 changed files with 91 additions and 257 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

312
flake.lock generated
View file

@ -102,13 +102,11 @@
}, },
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": [], "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": [ "utils": "utils"
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1727447169, "lastModified": 1727447169,
@ -146,27 +144,6 @@
"type": "github" "type": "github"
} }
}, },
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1738148035,
"narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=",
"owner": "nix-community",
"repo": "disko",
"rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "disko",
"type": "github"
}
},
"easy-hosts": { "easy-hosts": {
"locked": { "locked": {
"lastModified": 1738500011, "lastModified": 1738500011,
@ -183,20 +160,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"revCount": 69,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -212,7 +175,37 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"revCount": 69,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_3": { "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
@ -272,7 +265,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -290,7 +283,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -307,24 +300,6 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_7"
}, },
@ -342,24 +317,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_10"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -375,23 +332,6 @@
"type": "github" "type": "github"
} }
}, },
"freetype2": {
"flake": false,
"locked": {
"lastModified": 1723459814,
"narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=",
"owner": "freetype",
"repo": "freetype",
"rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5",
"type": "github"
},
"original": {
"owner": "freetype",
"ref": "VER-2-13-3",
"repo": "freetype",
"type": "github"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -472,11 +412,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738509014, "lastModified": 1738551629,
"narHash": "sha256-QOT4/tCvD7ZnRRNLbr3VR9jYYNxqQukJSR8zolpOn6g=", "narHash": "sha256-FUbtx2g0JpYKmrOC+iwlLQJxMQikoxkpam2/aHgKPcI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0669083de870ccfd5e717c524ebeec242ad2f414", "rev": "ad09219d5419b98f4126f55cd4d7aa06a128833c",
"revCount": 18, "revCount": 23,
"type": "git", "type": "git",
"url": "https://git.blahai.gay/blahai/haipkgs.git" "url": "https://git.blahai.gay/blahai/haipkgs.git"
}, },
@ -487,18 +427,18 @@
}, },
"haivim": { "haivim": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixvim": "nixvim" "nixvim": "nixvim"
}, },
"locked": { "locked": {
"lastModified": 1738523755, "lastModified": 1738541771,
"narHash": "sha256-EWaVd/RwiC1LNlGQv18FPjXxoTk8JWQZ5hrRM3s9/6g=", "narHash": "sha256-egUKrcFLZ46hgD7vM9tZJaWsuX/Y5qan7wdInURZqG4=",
"owner": "blahai", "owner": "blahai",
"repo": "haivim", "repo": "haivim",
"rev": "a12393e06330207f2b897ec37cbacd3317833ab4", "rev": "1899fa02c3aee9c00c3315662f27000d1f9ab226",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -507,23 +447,6 @@
"type": "github" "type": "github"
} }
}, },
"harfbuzz": {
"flake": false,
"locked": {
"lastModified": 1719502711,
"narHash": "sha256-2ieCf3ftNk851FZBDPVl+7QHWBqD729KiUxUyxi26Yg=",
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "9c03576c49db6e7207d9bcdfe3abd170a809157f",
"type": "github"
},
"original": {
"owner": "harfbuzz",
"ref": "9.0.0",
"repo": "harfbuzz",
"type": "github"
}
},
"hjem": { "hjem": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -684,11 +607,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1738524329, "lastModified": 1738546470,
"narHash": "sha256-LcSNAFcY6xkNuUUl/vu/0jYkHxVje1W2Udc00BTjxJI=", "narHash": "sha256-pyMFj2IBeiRDnYoHD9XtbFiwBzvXJCavdFoVPnZ1YB0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "31431a92714ab7f53c25d2ececb26c5b7264b7e3", "rev": "708d16636047c6a311c4e44424cf7d2090219a47",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -899,23 +822,6 @@
"type": "github" "type": "github"
} }
}, },
"libpng": {
"flake": false,
"locked": {
"lastModified": 1726173884,
"narHash": "sha256-gBfHgGaqVYdmhWXoNKZzPyGzyw2rr3zp+DjWmfC41jk=",
"owner": "pnggroup",
"repo": "libpng",
"rev": "f5e92d76973a7a53f517579bc95d61483bf108c0",
"type": "github"
},
"original": {
"owner": "pnggroup",
"ref": "v1.6.44",
"repo": "libpng",
"type": "github"
}
},
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -932,7 +838,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": "lix",
"nixpkgs": [ "nixpkgs": [
@ -991,11 +897,11 @@
}, },
"nixpkgs-smol": { "nixpkgs-smol": {
"locked": { "locked": {
"lastModified": 1738487426, "lastModified": 1738532490,
"narHash": "sha256-hnB0V0R/aKASnTBeTthFvW60uydv1xswWD4weqSuSfg=", "narHash": "sha256-Zt6oFCas78fRSFKX4yFLCh5D2o2+N67ox0g4LenzA0c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ed1fafea6a613d962f6a84c1153d34dc8b06d83", "rev": "ff0654c494b7484c4854ddabecdb91b0b7f7c4d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1037,26 +943,10 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1735821806,
"narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d6973081434f88088e5321f83ebafe9a1167c367",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -1066,11 +956,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1738517265, "lastModified": 1738528611,
"narHash": "sha256-ZzulGUIHZhvcSHx+1ucCJkIcn27r9H+cSzCCpKxJcls=", "narHash": "sha256-GRyyVXM/0pYnA8voPGZWTi9zDVkIO9O1fzA8cB4oO50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "56d0c4579e022b44a3e324f722fa23a6f4295798", "rev": "c284a509952eee265519674e67e70e73ddcbfd05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1081,7 +971,7 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"ixx": "ixx", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"haivim", "haivim",
@ -1105,7 +995,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
@ -1131,10 +1021,8 @@
"agenix": "agenix", "agenix": "agenix",
"ags": "ags", "ags": "ags",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko",
"easy-hosts": "easy-hosts", "easy-hosts": "easy-hosts",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"haipkgs": "haipkgs", "haipkgs": "haipkgs",
"haivim": "haivim", "haivim": "haivim",
"hjem": "hjem", "hjem": "hjem",
@ -1145,45 +1033,23 @@
"nixpkgs-smol": "nixpkgs-smol", "nixpkgs-smol": "nixpkgs-smol",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"systems": "systems_9", "systems": "systems_9",
"treefmt-nix": "treefmt-nix_2", "treefmt-nix": "treefmt-nix_2"
"wezterm": "wezterm"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"wezterm",
"nixpkgs"
]
},
"locked": {
"lastModified": 1735871325,
"narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a599f011db521766cbaf7c2f5874182485554f00",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
} }
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1738469592, "lastModified": 1738527890,
"narHash": "sha256-rQ5vSuW1QiY5OAjOZIwp22sbmHLNEF4OeenjgOumpFg=", "narHash": "sha256-y5WosmqAtq3P1cXX4vhP58t6i6zEX9PeO8LF1onPTWY=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "f6c11929ab7229cba72aed652daafdbda496a1b8", "rev": "6835108e9a472b99ab9e1f43a0fee3bdefaae14a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1207,21 +1073,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_10": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
@ -1384,29 +1235,21 @@
"type": "github" "type": "github"
} }
}, },
"wezterm": { "utils": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "systems": "systems_3"
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay",
"zlib": "zlib"
}, },
"locked": { "locked": {
"dir": "nix", "lastModified": 1701680307,
"lastModified": 1738379806, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"narHash": "sha256-3dkZt53Lr90wQOCPlDHAZn5t0G6n56t+JXW66+vviTE=", "owner": "numtide",
"owner": "wez", "repo": "flake-utils",
"repo": "wezterm", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"rev": "b28bbbc4c8345197e433590c9ce50a7bf3ea5bc7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"dir": "nix", "owner": "numtide",
"owner": "wez", "repo": "flake-utils",
"repo": "wezterm",
"type": "github" "type": "github"
} }
}, },
@ -1450,23 +1293,6 @@
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"type": "github" "type": "github"
} }
},
"zlib": {
"flake": false,
"locked": {
"lastModified": 1705948357,
"narHash": "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=",
"owner": "madler",
"repo": "zlib",
"rev": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf",
"type": "github"
},
"original": {
"owner": "madler",
"ref": "v1.3.1",
"repo": "zlib",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

12
flake.nix
View file

@ -6,7 +6,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-smol.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; nixpkgs-smol.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
wezterm.url = "github:wez/wezterm?dir=nix";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
@ -35,11 +34,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = {
url = "github:nix-community/disko/master";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -59,10 +53,6 @@
inputs.nixpkgs-lib.follows = "nixpkgs"; inputs.nixpkgs-lib.follows = "nixpkgs";
}; };
flake-utils = {
url = "github:numtide/flake-utils";
};
easy-hosts = { easy-hosts = {
url = "github:tgirlcloud/easy-hosts"; url = "github:tgirlcloud/easy-hosts";
}; };
@ -82,8 +72,6 @@
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
utils.follows = "flake-utils";
flake-compat.follows = "";
}; };
}; };
}; };

3
modules/base/nix/default.nix
View file

@ -1,6 +1,7 @@
{ {
imports = [ imports = [
./system.nix
./nix.nix ./nix.nix
./substituters.nix
./system.nix
]; ];
} }

17
modules/base/nix/substituters.nix Normal file
View file

@ -0,0 +1,17 @@
{
nix.settings = {
substituters = [
"https://nix-community.cachix.org"
"https://nixpkgs-unfree.cachix.org"
"https://haipkgs.cachix.org"
"https://hyprland.cachix.org"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
"haipkgs.cachix.org-1:AcjMqIafTEQ7dw99RpeTJU2ywNUn1h8yIxz2+zjpK/A="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
};
}

4
modules/nixos/services/hosted/forgejo.nix
View file

@ -110,10 +110,12 @@ in {
instances.default = { instances.default = {
enable = true; enable = true;
name = "Theia"; name = "Theia";
url = cfg.domain; url = "https://${cfg.domain}";
tokenFile = config.age.secrets.forgejo-runner-token.path; tokenFile = config.age.secrets.forgejo-runner-token.path;
labels = [ labels = [
"ubuntu-latest:docker://node:22-bookworm" "ubuntu-latest:docker://node:22-bookworm"
"nixos-latest:docker://nixos/nix"
"lix-latest:docker://git.blahai.gay/blahai/lix"
]; ];
}; };
}; };