From f38cce9ed50d52a9e71a8ae26e26310a11366ad5 Mon Sep 17 00:00:00 2001 From: blahai Date: Sun, 2 Feb 2025 22:07:33 +0200 Subject: [PATCH] more stuffies --- flake.lock | 129 +++++++++++++--------- flake.nix | 7 ++ home/default.nix | 25 ----- home/pingu/alacritty.nix | 17 --- home/pingu/default.nix | 5 - modules/home/default.nix | 5 + modules/home/docs.nix | 10 ++ modules/nixos/services/hosted/forgejo.nix | 2 +- systems/default.nix | 12 +- 9 files changed, 105 insertions(+), 107 deletions(-) delete mode 100644 home/default.nix delete mode 100644 home/pingu/alacritty.nix delete mode 100644 home/pingu/default.nix create mode 100644 modules/home/default.nix create mode 100644 modules/home/docs.nix diff --git a/flake.lock b/flake.lock index e1b3e31..e7ab9f0 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1738183445, - "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=", + "lastModified": 1738456976, + "narHash": "sha256-cufyHbOMnSt9V4w4OVSzNcpJ+8DwzRZRJaca2Q89KVI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74", + "rev": "257b2050790ab3b1eb389e0f8bdc400eb9510139", "type": "github" }, "original": { @@ -169,11 +169,11 @@ }, "easy-hosts": { "locked": { - "lastModified": 1738271711, - "narHash": "sha256-KKnkJg6wV7bIc8dBB6jv8ODfWqCIvNdiuWtYviLzBzY=", + "lastModified": 1738500011, + "narHash": "sha256-tpYwro3iLCVWbKSIs2P4DAlA1hRs4XLgZYL2v8Bdjg4=", "owner": "tgirlcloud", "repo": "easy-hosts", - "rev": "0d5d68e498d44806f8d9f41554db68c891909349", + "rev": "5f1824597e4db164a5b7d3feb3a3c7d0a01d5699", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -465,6 +465,26 @@ "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": { "inputs": { "flake-utils": "flake-utils_2", @@ -474,11 +494,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1738282532, - "narHash": "sha256-LmcIQ9YNuTi5ncPOYTloqG42tcpfo2/TmUNE1qB7w/A=", + "lastModified": 1738523755, + "narHash": "sha256-EWaVd/RwiC1LNlGQv18FPjXxoTk8JWQZ5hrRM3s9/6g=", "owner": "blahai", "repo": "haivim", - "rev": "f1feadd053613b12aa7d98bacf73286b7f5d987f", + "rev": "a12393e06330207f2b897ec37cbacd3317833ab4", "type": "github" }, "original": { @@ -577,11 +597,11 @@ ] }, "locked": { - "lastModified": 1738228963, - "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=", + "lastModified": 1738448366, + "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "type": "github" }, "original": { @@ -635,11 +655,11 @@ ] }, "locked": { - "lastModified": 1738018829, - "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=", + "lastModified": 1738437059, + "narHash": "sha256-J+8ecqaP3zD9GHeN8Y4hUapoELSoggp0IZI8laTFt/0=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b", + "rev": "5ac80e3686a4dfa55d2bd15c81a266b89594a295", "type": "github" }, "original": { @@ -664,11 +684,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738339723, - "narHash": "sha256-9VrozytYMyHa4g69QC8aexod4rE5TtGuHV4gXuFMnRo=", + "lastModified": 1738524329, + "narHash": "sha256-LcSNAFcY6xkNuUUl/vu/0jYkHxVje1W2Udc00BTjxJI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ddf180fa304e71b1d6eaa9f2b250a907131b05d9", + "rev": "31431a92714ab7f53c25d2ececb26c5b7264b7e3", "type": "github" }, "original": { @@ -689,11 +709,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -940,11 +960,11 @@ ] }, "locked": { - "lastModified": 1738033138, - "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", + "lastModified": 1738277753, + "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", + "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", "type": "github" }, "original": { @@ -955,11 +975,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1738297584, + "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "9189ac18287c599860e878e905da550aa6dec1cd", "type": "github" }, "original": { @@ -971,11 +991,11 @@ }, "nixpkgs-smol": { "locked": { - "lastModified": 1738310300, - "narHash": "sha256-bRvUuk8A0O5jm/3fRN9Y5eFqLmO2b6bCC0YtPMxmWCI=", + "lastModified": 1738487426, + "narHash": "sha256-hnB0V0R/aKASnTBeTthFvW60uydv1xswWD4weqSuSfg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2807b247ea4704655f71a36403a68ee04b634db", + "rev": "8ed1fafea6a613d962f6a84c1153d34dc8b06d83", "type": "github" }, "original": { @@ -987,11 +1007,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -1003,11 +1023,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -1046,11 +1066,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738272272, - "narHash": "sha256-zVw0JrvXJ29HnjEsNUInqi5Zw+J8QLHk2EuPN12dTXc=", + "lastModified": 1738517265, + "narHash": "sha256-ZzulGUIHZhvcSHx+1ucCJkIcn27r9H+cSzCCpKxJcls=", "owner": "nix-community", "repo": "nixvim", - "rev": "93df574b42928d631d31fe312cadb3899eb5b1bd", + "rev": "56d0c4579e022b44a3e324f722fa23a6f4295798", "type": "github" }, "original": { @@ -1070,11 +1090,11 @@ ] }, "locked": { - "lastModified": 1737924095, - "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", + "lastModified": 1738445998, + "narHash": "sha256-wF2ZcRKF37re161jrXtNyjGMBDsIFtPeDvmIVfp8f7w=", "owner": "NuschtOS", "repo": "search", - "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", + "rev": "381d84a7422a4dbfef6a9c7703dbaf42036ae1c3", "type": "github" }, "original": { @@ -1115,6 +1135,7 @@ "easy-hosts": "easy-hosts", "flake-parts": "flake-parts", "flake-utils": "flake-utils", + "haipkgs": "haipkgs", "haivim": "haivim", "hjem": "hjem", "hjem-rum": "hjem-rum", @@ -1158,11 +1179,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1738364650, - "narHash": "sha256-kDFuWQYCLOwZCGdkHLIDLLWR0B/XVi9VaW/55pUFSpk=", + "lastModified": 1738469592, + "narHash": "sha256-rQ5vSuW1QiY5OAjOZIwp22sbmHLNEF4OeenjgOumpFg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "1bee02567d993de62e5a4f61c26b074b4ee27c9b", + "rev": "f6c11929ab7229cba72aed652daafdbda496a1b8", "type": "github" }, "original": { @@ -1375,11 +1396,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1737758457, - "narHash": "sha256-Z50/JcMQI2R9ttEd20gXEhuAXvAI0yp3bM7j6/Xoi+A=", + "lastModified": 1738379806, + "narHash": "sha256-3dkZt53Lr90wQOCPlDHAZn5t0G6n56t+JXW66+vviTE=", "owner": "wez", "repo": "wezterm", - "rev": "4bf0007cefff7f1ad139d89b54f074d5ad7d2184", + "rev": "b28bbbc4c8345197e433590c9ce50a7bf3ea5bc7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8908dfa..94cea07 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + haipkgs = { + url = "git+https://git.blahai.gay/blahai/haipkgs.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; + }; + haivim = { url = "github:blahai/haivim"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/default.nix b/home/default.nix deleted file mode 100644 index 59bc355..0000000 --- a/home/default.nix +++ /dev/null @@ -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;}; - }; - }; -} diff --git a/home/pingu/alacritty.nix b/home/pingu/alacritty.nix deleted file mode 100644 index 52deee1..0000000 --- a/home/pingu/alacritty.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - hjem.users.pingu.rum.programs.alacritty = { - enable = true; - settings = { - window = { - dimensions = { - lines = 28; - columns = 101; - }; - padding = { - x = 6; - y = 3; - }; - }; - }; - }; -} diff --git a/home/pingu/default.nix b/home/pingu/default.nix deleted file mode 100644 index 050c04c..0000000 --- a/home/pingu/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./alacritty.nix # this is a test for hjem-rum - ]; -} diff --git a/modules/home/default.nix b/modules/home/default.nix new file mode 100644 index 0000000..87a1d41 --- /dev/null +++ b/modules/home/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./docs.nix + ]; +} diff --git a/modules/home/docs.nix b/modules/home/docs.nix new file mode 100644 index 0000000..909f904 --- /dev/null +++ b/modules/home/docs.nix @@ -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; + }; +} diff --git a/modules/nixos/services/hosted/forgejo.nix b/modules/nixos/services/hosted/forgejo.nix index a5b639f..5328c45 100644 --- a/modules/nixos/services/hosted/forgejo.nix +++ b/modules/nixos/services/hosted/forgejo.nix @@ -78,7 +78,7 @@ in { SSH_PORT = 22; SSH_LISTEN_PORT = 22; - BUILTIN_SSH_SERVER_USER = "git"; + BUILTIN_SSH_SERVER_USER = "forgejo"; }; ui = { diff --git a/systems/default.nix b/systems/default.nix index 5fb11ae..adc2983 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -4,7 +4,7 @@ ... }: let inherit (self) lib; - inherit (lib.lists) optionals; + inherit (lib.lists) optionals concatLists; profilesPath = ../modules/profiles; # Hardware profiles @@ -22,13 +22,15 @@ in { shared.specialArgs = {inherit lib;}; perClass = class: { - modules = [ - # import the class module, this contains the common configurations between all systems of the same class - "${self}/modules/${class}/default.nix" + modules = concatLists [ + [ + # import the class module, this contains the common configurations between all systems of the same class + "${self}/modules/${class}/default.nix" + ] (optionals (class != "iso") [ # 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 "${self}/modules/base/default.nix"