more stuffies

This commit is contained in:
blahai 2025-02-02 22:07:33 +02:00
parent d6c098bbbe
commit f38cce9ed5
Signed by: blahai
SSH key fingerprint: SHA256:ZfCryi+V64yG+vC1ZIIsqgvBCmA31tTi7RJ6M8CvpRc
9 changed files with 105 additions and 107 deletions

129
flake.lock generated
View file

@ -65,11 +65,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738183445, "lastModified": 1738456976,
"narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=", "narHash": "sha256-cufyHbOMnSt9V4w4OVSzNcpJ+8DwzRZRJaca2Q89KVI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "48a000cf35dd10bfeb231152735aebbe875f4b74", "rev": "257b2050790ab3b1eb389e0f8bdc400eb9510139",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
}, },
"easy-hosts": { "easy-hosts": {
"locked": { "locked": {
"lastModified": 1738271711, "lastModified": 1738500011,
"narHash": "sha256-KKnkJg6wV7bIc8dBB6jv8ODfWqCIvNdiuWtYviLzBzY=", "narHash": "sha256-tpYwro3iLCVWbKSIs2P4DAlA1hRs4XLgZYL2v8Bdjg4=",
"owner": "tgirlcloud", "owner": "tgirlcloud",
"repo": "easy-hosts", "repo": "easy-hosts",
"rev": "0d5d68e498d44806f8d9f41554db68c891909349", "rev": "5f1824597e4db164a5b7d3feb3a3c7d0a01d5699",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1738453229,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,11 +257,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1738453229,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -465,6 +465,26 @@
"type": "github" "type": "github"
} }
}, },
"haipkgs": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1738509014,
"narHash": "sha256-QOT4/tCvD7ZnRRNLbr3VR9jYYNxqQukJSR8zolpOn6g=",
"ref": "refs/heads/main",
"rev": "0669083de870ccfd5e717c524ebeec242ad2f414",
"revCount": 18,
"type": "git",
"url": "https://git.blahai.gay/blahai/haipkgs.git"
},
"original": {
"type": "git",
"url": "https://git.blahai.gay/blahai/haipkgs.git"
}
},
"haivim": { "haivim": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -474,11 +494,11 @@
"nixvim": "nixvim" "nixvim": "nixvim"
}, },
"locked": { "locked": {
"lastModified": 1738282532, "lastModified": 1738523755,
"narHash": "sha256-LmcIQ9YNuTi5ncPOYTloqG42tcpfo2/TmUNE1qB7w/A=", "narHash": "sha256-EWaVd/RwiC1LNlGQv18FPjXxoTk8JWQZ5hrRM3s9/6g=",
"owner": "blahai", "owner": "blahai",
"repo": "haivim", "repo": "haivim",
"rev": "f1feadd053613b12aa7d98bacf73286b7f5d987f", "rev": "a12393e06330207f2b897ec37cbacd3317833ab4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +597,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738228963, "lastModified": 1738448366,
"narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=", "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8", "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -635,11 +655,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738018829, "lastModified": 1738437059,
"narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=", "narHash": "sha256-J+8ecqaP3zD9GHeN8Y4hUapoELSoggp0IZI8laTFt/0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b", "rev": "5ac80e3686a4dfa55d2bd15c81a266b89594a295",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -664,11 +684,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1738339723, "lastModified": 1738524329,
"narHash": "sha256-9VrozytYMyHa4g69QC8aexod4rE5TtGuHV4gXuFMnRo=", "narHash": "sha256-LcSNAFcY6xkNuUUl/vu/0jYkHxVje1W2Udc00BTjxJI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "ddf180fa304e71b1d6eaa9f2b250a907131b05d9", "rev": "31431a92714ab7f53c25d2ececb26c5b7264b7e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -689,11 +709,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737556638, "lastModified": 1738422629,
"narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -940,11 +960,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738033138, "lastModified": 1738277753,
"narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -955,11 +975,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738136902, "lastModified": 1738297584,
"narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", "rev": "9189ac18287c599860e878e905da550aa6dec1cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -971,11 +991,11 @@
}, },
"nixpkgs-smol": { "nixpkgs-smol": {
"locked": { "locked": {
"lastModified": 1738310300, "lastModified": 1738487426,
"narHash": "sha256-bRvUuk8A0O5jm/3fRN9Y5eFqLmO2b6bCC0YtPMxmWCI=", "narHash": "sha256-hnB0V0R/aKASnTBeTthFvW60uydv1xswWD4weqSuSfg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2807b247ea4704655f71a36403a68ee04b634db", "rev": "8ed1fafea6a613d962f6a84c1153d34dc8b06d83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -987,11 +1007,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1737885589, "lastModified": 1738410390,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1003,11 +1023,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1738142207, "lastModified": 1738410390,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1046,11 +1066,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1738272272, "lastModified": 1738517265,
"narHash": "sha256-zVw0JrvXJ29HnjEsNUInqi5Zw+J8QLHk2EuPN12dTXc=", "narHash": "sha256-ZzulGUIHZhvcSHx+1ucCJkIcn27r9H+cSzCCpKxJcls=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "93df574b42928d631d31fe312cadb3899eb5b1bd", "rev": "56d0c4579e022b44a3e324f722fa23a6f4295798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1070,11 +1090,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737924095, "lastModified": 1738445998,
"narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", "narHash": "sha256-wF2ZcRKF37re161jrXtNyjGMBDsIFtPeDvmIVfp8f7w=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", "rev": "381d84a7422a4dbfef6a9c7703dbaf42036ae1c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1115,6 +1135,7 @@
"easy-hosts": "easy-hosts", "easy-hosts": "easy-hosts",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"haipkgs": "haipkgs",
"haivim": "haivim", "haivim": "haivim",
"hjem": "hjem", "hjem": "hjem",
"hjem-rum": "hjem-rum", "hjem-rum": "hjem-rum",
@ -1158,11 +1179,11 @@
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1738364650, "lastModified": 1738469592,
"narHash": "sha256-kDFuWQYCLOwZCGdkHLIDLLWR0B/XVi9VaW/55pUFSpk=", "narHash": "sha256-rQ5vSuW1QiY5OAjOZIwp22sbmHLNEF4OeenjgOumpFg=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "1bee02567d993de62e5a4f61c26b074b4ee27c9b", "rev": "f6c11929ab7229cba72aed652daafdbda496a1b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1375,11 +1396,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1737758457, "lastModified": 1738379806,
"narHash": "sha256-Z50/JcMQI2R9ttEd20gXEhuAXvAI0yp3bM7j6/Xoi+A=", "narHash": "sha256-3dkZt53Lr90wQOCPlDHAZn5t0G6n56t+JXW66+vviTE=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "4bf0007cefff7f1ad139d89b54f074d5ad7d2184", "rev": "b28bbbc4c8345197e433590c9ce50a7bf3ea5bc7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -13,6 +13,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
haipkgs = {
url = "git+https://git.blahai.gay/blahai/haipkgs.git";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};
haivim = { haivim = {
url = "github:blahai/haivim"; url = "github:blahai/haivim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -1,25 +0,0 @@
{
lib,
pkgs,
config,
inputs,
...
}: let
inherit (lib.modules) mkIf;
inherit (lib.attrsets) genAttrs;
inherit (lib.options) mkEnableOption;
in {
options.olympus.system.enableHjem =
mkEnableOption "Should hjem be enabled"
// {
default = true;
};
config = mkIf config.olympus.system.enableHjem {
hjem = {
users = genAttrs config.olympus.system.users (name: ./${name});
clobberByDefault = true;
specialArgs = {inherit inputs;};
};
};
}

View file

@ -1,17 +0,0 @@
{
hjem.users.pingu.rum.programs.alacritty = {
enable = true;
settings = {
window = {
dimensions = {
lines = 28;
columns = 101;
};
padding = {
x = 6;
y = 3;
};
};
};
};
}

View file

@ -1,5 +0,0 @@
{
imports = [
./alacritty.nix # this is a test for hjem-rum
];
}

5
modules/home/default.nix Normal file
View file

@ -0,0 +1,5 @@
{
imports = [
./docs.nix
];
}

10
modules/home/docs.nix Normal file
View file

@ -0,0 +1,10 @@
{lib, ...}: let
inherit (lib.attrsets) mapAttrs;
inherit (lib.modules) mkForce;
in {
manual = mapAttrs (_: mkForce) {
html.enable = false;
json.enable = false;
manpages.enable = false;
};
}

View file

@ -78,7 +78,7 @@ in {
SSH_PORT = 22; SSH_PORT = 22;
SSH_LISTEN_PORT = 22; SSH_LISTEN_PORT = 22;
BUILTIN_SSH_SERVER_USER = "git"; BUILTIN_SSH_SERVER_USER = "forgejo";
}; };
ui = { ui = {

View file

@ -4,7 +4,7 @@
... ...
}: let }: let
inherit (self) lib; inherit (self) lib;
inherit (lib.lists) optionals; inherit (lib.lists) optionals concatLists;
profilesPath = ../modules/profiles; profilesPath = ../modules/profiles;
# Hardware profiles # Hardware profiles
@ -22,13 +22,15 @@ in {
shared.specialArgs = {inherit lib;}; shared.specialArgs = {inherit lib;};
perClass = class: { perClass = class: {
modules = [ modules = concatLists [
[
# import the class module, this contains the common configurations between all systems of the same class # import the class module, this contains the common configurations between all systems of the same class
"${self}/modules/${class}/default.nix" "${self}/modules/${class}/default.nix"
]
(optionals (class != "iso") [ (optionals (class != "iso") [
# import the home module, which is users for configuring users via hjem # import the home module, which is users for configuring users via hjem
"${self}/home/default.nix" # "${self}/home/default.nix"
# import the base module, this contains the common configurations between all systems # import the base module, this contains the common configurations between all systems
"${self}/modules/base/default.nix" "${self}/modules/base/default.nix"