Migrate to nilla #11
50 changed files with 860 additions and 981 deletions
1
.envrc
1
.envrc
|
|
@ -1 +1,2 @@
|
|||
use flake
|
||||
watch_file nilla.nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
types: [opened, synchronize, reopened]
|
||||
|
||||
|
|
@ -8,4 +9,5 @@ jobs:
|
|||
runs-on: native
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: nix flake check --all-systems
|
||||
- run: nix-build -A ci.check
|
||||
- run: ./result
|
||||
|
|
|
|||
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
.direnv
|
||||
result
|
||||
|
|
|
|||
10
README.md
10
README.md
|
|
@ -3,7 +3,7 @@
|
|||
雪定<rp>(</rp><rt>せってい</rt><rp>)</rp>
|
||||
</ruby>
|
||||
</h1>
|
||||
Collection of my personal Nix configurations and opinionated NixOS, nix-darwin, home-manager, and flake-parts modules.
|
||||
Collection of my personal Nix configurations and opinionated NixOS, nix-darwin, home-manager, and nilla modules.
|
||||
|
||||
> [!CAUTION]
|
||||
> I tried to make the modules in this repository useful to others without having
|
||||
|
|
@ -25,13 +25,12 @@ Collection of my personal Nix configurations and opinionated NixOS, nix-darwin,
|
|||
- modules - options which in principle should be reusable by others
|
||||
- system - my opinionated nixos/nix-darwin modules
|
||||
- home - my opinionated home-manager modules
|
||||
- flake - flake-parts modules
|
||||
- nilla - nilla modules
|
||||
- services - configs for services I self-host
|
||||
- secrets - agenix secrets
|
||||
- wrappers - nix packages wrapped with my configs (see:
|
||||
[wrapper-manager](https://github.com/viperML/wrapper-manager))
|
||||
- assets - miscellaneous values reused throughout my config
|
||||
- effects.nix - hercules-ci configuration
|
||||
|
||||
## Code guidelines
|
||||
|
||||
|
|
@ -55,9 +54,8 @@ clean, maintainable, and reusable.
|
|||
|
||||
Sorted rougly by priority
|
||||
|
||||
- get rid of flakes completely
|
||||
- bring back ci (sorta done)
|
||||
- hercules-ci effects for deploying machines on update (if configuration is
|
||||
valid)
|
||||
- fix disko
|
||||
- automatic deploys (either push or pull, to be decided)
|
||||
- make the configuration truly declarative (to a reasonable degree)
|
||||
- themeing solution
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, ... }:
|
||||
{ lib }:
|
||||
{
|
||||
options.assets = lib.mkOption {
|
||||
type = lib.types.unspecified;
|
||||
readOnly = true;
|
||||
options.assets = lib.options.create {
|
||||
type = lib.types.raw;
|
||||
writable = false;
|
||||
};
|
||||
|
||||
config.assets = {
|
||||
|
|
|
|||
12
default.nix
Normal file
12
default.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
let
|
||||
nilla = import ./nilla.nix { };
|
||||
getPackage = name: nilla.packages.${name}.result.${builtins.currentSystem};
|
||||
in
|
||||
{
|
||||
ci.check = getPackage "ci-check";
|
||||
formatter = getPackage "formatter";
|
||||
systems = {
|
||||
nixos = builtins.mapAttrs (_: system: system.result) nilla.systems.nixos;
|
||||
darwin = builtins.mapAttrs (_: system: system.result) nilla.systems.darwin;
|
||||
};
|
||||
}
|
||||
102
effects.nix
102
effects.nix
|
|
@ -1,102 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
withSystem,
|
||||
self,
|
||||
...
|
||||
}:
|
||||
let
|
||||
collectFlakeOutputs =
|
||||
{ config, pkgs }:
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
collectDrvs =
|
||||
prefix: attrs:
|
||||
let
|
||||
drvs = lib.pipe attrs [
|
||||
(lib.filterAttrs (_: lib.isDerivation))
|
||||
(lib.mapAttrsToList (
|
||||
name: drv: {
|
||||
name = lib.concatStringsSep "." (prefix ++ [ name ]);
|
||||
inherit drv;
|
||||
}
|
||||
))
|
||||
];
|
||||
recursed = lib.pipe attrs [
|
||||
(lib.filterAttrs (
|
||||
_: val: (!lib.isDerivation val) && (lib.isAttrs val) && (val.recurseForDerivations or true)
|
||||
))
|
||||
(lib.mapAttrsToList (name: collectDrvs (prefix ++ [ name ])))
|
||||
];
|
||||
in
|
||||
drvs ++ (lib.flatten recursed);
|
||||
rootOutputs = builtins.removeAttrs config.onPush.default.outputs [ "effects" ];
|
||||
in
|
||||
collectDrvs [ ] rootOutputs;
|
||||
in
|
||||
{
|
||||
defaultEffectSystem = "aarch64-linux";
|
||||
|
||||
hercules-ci = {
|
||||
flake-update = {
|
||||
enable = true;
|
||||
when.dayOfWeek = "Mon";
|
||||
};
|
||||
};
|
||||
|
||||
herculesCI = herculesCI: {
|
||||
onPush.default = {
|
||||
outputs.effects = {
|
||||
pin-cache = withSystem config.defaultEffectSystem (
|
||||
{ pkgs, hci-effects, ... }:
|
||||
let
|
||||
collected = collectFlakeOutputs {
|
||||
inherit (herculesCI) config;
|
||||
inherit pkgs;
|
||||
};
|
||||
cachixCommands = lib.concatMapStringsSep "\n" (
|
||||
{ name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}"
|
||||
) collected;
|
||||
in
|
||||
hci-effects.runIf (herculesCI.config.repo.branch == "main") (
|
||||
hci-effects.mkEffect {
|
||||
secretsMap."cachix-token" = "cachix-token";
|
||||
inputs = [ pkgs.cachix ];
|
||||
userSetupScript = ''
|
||||
cachix authtoken $(readSecretString cachix-token .token)
|
||||
'';
|
||||
# Discarding the context is fine here because we don't actually want to build those derivations.
|
||||
# They have already been built as part of this job,
|
||||
# we only want to pin them to make sure cachix doesn't GC them.
|
||||
effectScript = builtins.unsafeDiscardStringContext cachixCommands;
|
||||
}
|
||||
)
|
||||
);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
perSystem =
|
||||
{ pkgs, lib, ... }:
|
||||
rec {
|
||||
legacyPackages.outputsList =
|
||||
let
|
||||
config = self.herculesCI {
|
||||
primaryRepo = { };
|
||||
herculesCI = { };
|
||||
};
|
||||
in
|
||||
collectFlakeOutputs { inherit config pkgs; };
|
||||
|
||||
legacyPackages.github-matrix =
|
||||
let
|
||||
systems = lib.groupBy ({ drv, ... }: drv.system) legacyPackages.outputsList;
|
||||
in
|
||||
lib.concatMapStringsSep "\n" (
|
||||
{ name, value }:
|
||||
''
|
||||
${name}=${builtins.toJSON (map (d: d.name) value)}
|
||||
''
|
||||
) (lib.attrsToList systems);
|
||||
};
|
||||
}
|
||||
493
flake.lock
generated
493
flake.lock
generated
|
|
@ -1,5 +1,21 @@
|
|||
{
|
||||
"nodes": {
|
||||
"__flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748460212,
|
||||
"narHash": "sha256-RBUseGlYAKOd8hnKVujiGzpdJoZWj5e3A+Ds2mKsv28=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "88e58d66efad1b3e0edf8633ea0774f7105d37c9",
|
||||
"revCount": 86,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
||||
}
|
||||
},
|
||||
"agenix": {
|
||||
"inputs": {
|
||||
"darwin": [
|
||||
|
|
@ -14,11 +30,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736955230,
|
||||
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
|
||||
"lastModified": 1747575206,
|
||||
"narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
|
||||
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -28,30 +44,13 @@
|
|||
}
|
||||
},
|
||||
"attic": {
|
||||
"inputs": {
|
||||
"crane": [
|
||||
"crane"
|
||||
],
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"lix": [
|
||||
"lix"
|
||||
],
|
||||
"lix-module": [
|
||||
"lix-module"
|
||||
],
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742679462,
|
||||
"narHash": "sha256-L9q9KDqiJEREM/GRnSo4vB9VCvclmdRT9vXuFwBmb9Y=",
|
||||
"lastModified": 1748777195,
|
||||
"narHash": "sha256-j3GQS4zm4zc1yo+5hCs0kpIGNDePj7ayRkbqsy3tyYs=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "087bfe9234f8dc682dbf1d8f96c0b712f587c466",
|
||||
"revCount": 368,
|
||||
"rev": "ec24c04e345ab02ff35020d99e34f1eda0b82352",
|
||||
"revCount": 373,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/nrabulinski/attic.git"
|
||||
},
|
||||
|
|
@ -79,11 +78,11 @@
|
|||
"conduit-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742005420,
|
||||
"narHash": "sha256-v4LCx7VUZ+8Hy1+6ziREVY/QEADjZbo8c0h9eU7nMVY=",
|
||||
"lastModified": 1748702033,
|
||||
"narHash": "sha256-W72vGS0qJow1O4jXkuE3px4eNyFJeZqjuMREs6Lb5bU=",
|
||||
"owner": "famedly",
|
||||
"repo": "conduit",
|
||||
"rev": "063d13a0e10619f17bc21f0dd291c5a733581394",
|
||||
"rev": "a1886a13967b0471b55428f7aed55087ad357491",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -94,12 +93,28 @@
|
|||
}
|
||||
},
|
||||
"crane": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742394900,
|
||||
"narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
|
||||
"lastModified": 1748047550,
|
||||
"narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
|
||||
"rev": "b718a78696060df6280196a6f992d04c87a16aef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_2": {
|
||||
"locked": {
|
||||
"lastModified": 1743700120,
|
||||
"narHash": "sha256-8BjG/P0xnuCyVOXlYRwdI1B8nVtyYLf3oDwPSimqREY=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "e316f19ee058e6db50075115783be57ac549c389",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -115,11 +130,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742382197,
|
||||
"narHash": "sha256-5OtFbbdKAkWDVuzjs1J9KwdFuDxsEvz0FZX3xR2jEUM=",
|
||||
"lastModified": 1748354048,
|
||||
"narHash": "sha256-BUUifoC7bipKczvpk8fq+UYrhiK95nt/zhMuPcelzWg=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "643b57fd32135769f809913663130a95fe6db49e",
|
||||
"rev": "eb1b636932ba2f19522d3687ba27c6adf3fd5978",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -136,11 +151,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741786315,
|
||||
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
|
||||
"lastModified": 1748225455,
|
||||
"narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
|
||||
"rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -149,55 +164,14 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742452566,
|
||||
"narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742432361,
|
||||
"narHash": "sha256-FlqTrkzSn6oPR5iJTPsCQDd0ioMGzzxnPB+2wve9W2w=",
|
||||
"owner": "bandithedoge",
|
||||
"repo": "nixpkgs-firefox-darwin",
|
||||
"rev": "c868ff433ea5123e837a62ae689543045187d7a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "bandithedoge",
|
||||
"repo": "nixpkgs-firefox-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -206,81 +180,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"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-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"attic",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_3": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
|
|
@ -317,24 +216,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1712898590,
|
||||
|
|
@ -350,20 +231,67 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"mailserver",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"mailserver",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"mailserver",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"helix": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742479163,
|
||||
"narHash": "sha256-YC0zdGyZMu7seA2Jm1mxtcxE4lSeVwvCPMfWzJ8+o/c=",
|
||||
"lastModified": 1748702599,
|
||||
"narHash": "sha256-cXzTGHrZsT4wSxlLvw2ZlHPVjC/MA2W0sI/KF1yStbY=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "b7d735ffe66a03ab5970e5f860923aada50d4e4c",
|
||||
"rev": "2baff46b2578d78d817b9e128e8cc00345541f0b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -379,11 +307,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742501496,
|
||||
"narHash": "sha256-LYwyZmhckDKK7i4avmbcs1pBROpOaHi98lbjX1fmVpU=",
|
||||
"lastModified": 1748737919,
|
||||
"narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d725df5ad8cee60e61ee6fe3afb735e4fbc1ff41",
|
||||
"rev": "5675a9686851d9626560052a032c4e14e533c1fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -395,11 +323,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742411066,
|
||||
"narHash": "sha256-8vXOKPQFRzTjapsRnTJ1nuFjUfC+AGI2ybdK5cAEHZ8=",
|
||||
"lastModified": 1748588861,
|
||||
"narHash": "sha256-bP9MHHCx/6Pi1TlO7Iq8X6AUoQHzyExQJNnSHSOqUUk=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "2491b7cc2128ee440d24768c4521c38b1859fc28",
|
||||
"revCount": 17705,
|
||||
"rev": "3815dd5e64fc374fa4dcc5064470cd7a7d77aaf3",
|
||||
"revCount": 17966,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/lix.git"
|
||||
},
|
||||
|
|
@ -410,7 +338,7 @@
|
|||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": [
|
||||
"lix"
|
||||
|
|
@ -420,11 +348,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741894565,
|
||||
"narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=",
|
||||
"lastModified": 1747667424,
|
||||
"narHash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "a6da43f8193d9e329bba1795c42590c27966082e",
|
||||
"revCount": 136,
|
||||
"rev": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700",
|
||||
"revCount": 144,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module.git"
|
||||
},
|
||||
|
|
@ -436,18 +364,19 @@
|
|||
"mailserver": {
|
||||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-compat": "flake-compat",
|
||||
"git-hooks": "git-hooks",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-24_11": "nixpkgs-24_11"
|
||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742413977,
|
||||
"narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=",
|
||||
"lastModified": 1748689589,
|
||||
"narHash": "sha256-ltwdNAsto54HMQFdrCprWXPFhNBfEuiCkj+GS7ZHvww=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
|
||||
"rev": "c9f61e02aee97dc8c7d4f3739b012a992183508c",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -456,53 +385,45 @@
|
|||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"niko-nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_3",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"nh": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723663703,
|
||||
"narHash": "sha256-ubPcnvjRQCzZgaYTWOKd82xXwJKmOaPjStUOUkyRTSs=",
|
||||
"owner": "nrabulinski",
|
||||
"repo": "nur-packages",
|
||||
"rev": "567fd42dc54f71ce1705180ad7f35f786f00ed9a",
|
||||
"lastModified": 1748096601,
|
||||
"narHash": "sha256-ji/9z1pRbosyKVVAIGBazyz6PjWV8bc2Ux2RdQrVDWY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nh",
|
||||
"rev": "1ea27e73a3dcbc9950258e9054377ee677d12b9e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nrabulinski",
|
||||
"repo": "nur-packages",
|
||||
"owner": "nix-community",
|
||||
"repo": "nh",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"attic",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"nilla": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1737420293,
|
||||
"narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
|
||||
"lastModified": 1748686039,
|
||||
"narHash": "sha256-7iLzbTLtgdFtm9em3xxHO9BunN2YpgYquMLKXh5hEpQ=",
|
||||
"owner": "nilla-nix",
|
||||
"repo": "nilla",
|
||||
"rev": "4e6038f4ebc89487194013af6a1e077dfeb00359",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"owner": "nilla-nix",
|
||||
"repo": "nilla",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1723603349,
|
||||
"narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
|
||||
"lastModified": 1748662220,
|
||||
"narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
|
||||
"rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -512,61 +433,18 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-24_11": {
|
||||
"nixpkgs-25_05": {
|
||||
"locked": {
|
||||
"lastModified": 1734083684,
|
||||
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
|
||||
"lastModified": 1747610100,
|
||||
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-24.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1722555339,
|
||||
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1735563628,
|
||||
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
|
||||
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1742395137,
|
||||
"narHash": "sha256-WWNNjCSzQCtATpCFEijm81NNG1xqlLMVbIzXAiZysbs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2a725d40de138714db4872dc7405d86457aa17ad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -593,22 +471,21 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"__flake-compat": "__flake-compat",
|
||||
"agenix": "agenix",
|
||||
"attic": "attic",
|
||||
"conduit-src": "conduit-src",
|
||||
"crane": "crane",
|
||||
"darwin": "darwin",
|
||||
"disko": "disko",
|
||||
"fenix": "fenix",
|
||||
"firefox-darwin": "firefox-darwin",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"helix": "helix",
|
||||
"home-manager": "home-manager",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"mailserver": "mailserver",
|
||||
"niko-nur": "niko-nur",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nh": "nh",
|
||||
"nilla": "nilla",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"racket": "racket",
|
||||
"treefmt": "treefmt",
|
||||
"wrapper-manager": "wrapper-manager",
|
||||
|
|
@ -616,23 +493,6 @@
|
|||
"zjstatus": "zjstatus"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1742296961,
|
||||
"narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -662,11 +522,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739240901,
|
||||
"narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=",
|
||||
"lastModified": 1743682350,
|
||||
"narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c",
|
||||
"rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -720,21 +580,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -742,11 +587,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742370146,
|
||||
"narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
|
||||
"lastModified": 1748243702,
|
||||
"narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
|
||||
"rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -789,11 +634,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707430137,
|
||||
"narHash": "sha256-QeYv+l7v5raFE5vpnxicFRK0LIRPvbpxsMKqwkRqtBc=",
|
||||
"lastModified": 1748551590,
|
||||
"narHash": "sha256-SwTvZHFrPUxaWm1DFOmRMDP813sMhvKpd8onQBNJIeo=",
|
||||
"owner": "nrabulinski",
|
||||
"repo": "wrapper-manager-hm-compat",
|
||||
"rev": "16b0cf2e5f157ffe79114927d6006dc71dbe2210",
|
||||
"rev": "f4cffb7d2f9aa5c6fc652a065bea7dfea5856fee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -804,21 +649,19 @@
|
|||
},
|
||||
"zjstatus": {
|
||||
"inputs": {
|
||||
"crane": [
|
||||
"crane"
|
||||
],
|
||||
"flake-utils": "flake-utils_3",
|
||||
"crane": "crane_2",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741803511,
|
||||
"narHash": "sha256-DcCGBWvAvt+OWI+EcPRO+/IXZHkFgPxZUmxf2VLl8no=",
|
||||
"lastModified": 1745230073,
|
||||
"narHash": "sha256-OER99U7MiqQ47myvbsiljsax7OsK19NMds4NBM9XXLs=",
|
||||
"owner": "dj95",
|
||||
"repo": "zjstatus",
|
||||
"rev": "df9c77718f7023de8406e593eda6b5b0bc09cddd",
|
||||
"rev": "a819e3bfe6bfef0438d811cdbb1bcfdc29912c62",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
136
flake.nix
136
flake.nix
|
|
@ -1,86 +1,8 @@
|
|||
{
|
||||
outputs =
|
||||
inputs@{ flake-parts, ... }:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
|
||||
imports = [
|
||||
inputs.treefmt.flakeModule
|
||||
|
||||
./assets
|
||||
./hosts
|
||||
./modules
|
||||
./wrappers
|
||||
./pkgs
|
||||
./services
|
||||
];
|
||||
|
||||
perSystem =
|
||||
{
|
||||
inputs',
|
||||
self',
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
devShells.default = pkgs.mkShellNoCC {
|
||||
packages = [
|
||||
inputs'.agenix.packages.agenix
|
||||
self'.packages.attic-client
|
||||
# TODO: Contribute darwin support to nh
|
||||
pkgs.nh
|
||||
];
|
||||
};
|
||||
|
||||
packages = {
|
||||
# Re-export it for convenience and for caching
|
||||
inherit (inputs'.attic.packages) attic-client attic-server;
|
||||
base-packages = pkgs.symlinkJoin {
|
||||
name = "settei-base";
|
||||
paths = with self'.packages; [
|
||||
helix
|
||||
fish
|
||||
git-commit-last
|
||||
git-fixup
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
treefmt = {
|
||||
programs.deadnix.enable = true;
|
||||
programs.nixfmt.enable = true;
|
||||
programs.statix.enable = true;
|
||||
programs.fish_indent.enable = true;
|
||||
programs.deno.enable = true;
|
||||
programs.stylua.enable = true;
|
||||
programs.shfmt.enable = true;
|
||||
settings.global.excludes = [
|
||||
# agenix
|
||||
"*.age"
|
||||
|
||||
# racket
|
||||
"*.rkt"
|
||||
"**/rashrc"
|
||||
|
||||
# custom assets
|
||||
"*.png"
|
||||
"*.svg"
|
||||
];
|
||||
settings.on-unmatched = "fatal";
|
||||
};
|
||||
};
|
||||
};
|
||||
outputs = inputs: (import ./nilla.nix { inherit inputs; }).flake;
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable";
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||
};
|
||||
disko = {
|
||||
url = "github:nix-community/disko";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -125,26 +47,13 @@
|
|||
url = "gitlab:famedly/conduit?ref=next";
|
||||
flake = false;
|
||||
};
|
||||
fenix = {
|
||||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
attic = {
|
||||
url = "git+https://git.lix.systems/nrabulinski/attic.git";
|
||||
flake = false;
|
||||
};
|
||||
crane = {
|
||||
url = "github:ipetkov/crane";
|
||||
};
|
||||
firefox-darwin = {
|
||||
url = "github:bandithedoge/nixpkgs-firefox-darwin";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
niko-nur = {
|
||||
url = "github:nrabulinski/nur-packages";
|
||||
};
|
||||
attic = {
|
||||
url = "git+https://git.lix.systems/nrabulinski/attic.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.crane.follows = "crane";
|
||||
inputs.lix.follows = "lix";
|
||||
inputs.lix-module.follows = "lix-module";
|
||||
flake = false;
|
||||
};
|
||||
helix = {
|
||||
url = "github:helix-editor/helix";
|
||||
|
|
@ -153,7 +62,6 @@
|
|||
zjstatus = {
|
||||
url = "github:dj95/zjstatus";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.crane.follows = "crane";
|
||||
};
|
||||
lix = {
|
||||
url = "git+https://git.lix.systems/lix-project/lix.git";
|
||||
|
|
@ -168,27 +76,17 @@
|
|||
url = "github:numtide/treefmt-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
/*
|
||||
TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
|
||||
nixConfig = {
|
||||
extra-substituters = [
|
||||
"https://hyprland.cachix.org"
|
||||
"https://cache.garnix.io"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://hercules-ci.cachix.org"
|
||||
"https://nrabulinski.cachix.org"
|
||||
"https://cache.nrab.lol"
|
||||
];
|
||||
extra-trusted-public-keys = [
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
|
||||
"nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic="
|
||||
"cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg="
|
||||
];
|
||||
__flake-compat = {
|
||||
url = "git+https://git.lix.systems/lix-project/flake-compat.git";
|
||||
flake = false;
|
||||
};
|
||||
*/
|
||||
nilla = {
|
||||
url = "github:nilla-nix/nilla";
|
||||
flake = false;
|
||||
};
|
||||
nh = {
|
||||
url = "github:nix-community/nh";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{
|
||||
config,
|
||||
self,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
includes = [
|
||||
./kazuki
|
||||
./hijiri-vm
|
||||
./hijiri
|
||||
|
|
@ -16,58 +14,40 @@
|
|||
./youko
|
||||
];
|
||||
|
||||
builders =
|
||||
config.systems.builders =
|
||||
let
|
||||
sharedOptions = {
|
||||
_file = ./default.nix;
|
||||
|
||||
settei.sane-defaults.allSshKeys = config.assets.sshKeys.user;
|
||||
settei.flake-qol.inputs = inputs // {
|
||||
settei = self;
|
||||
settei = inputs.self;
|
||||
};
|
||||
};
|
||||
|
||||
baseNixos = inputs.nixpkgs.lib.nixosSystem {
|
||||
modules = [
|
||||
self.nixosModules.combined
|
||||
sharedOptions
|
||||
];
|
||||
specialArgs.configurationName = "base";
|
||||
};
|
||||
|
||||
baseDarwin = inputs.darwin.lib.darwinSystem {
|
||||
modules = [
|
||||
self.darwinModules.combined
|
||||
sharedOptions
|
||||
];
|
||||
specialArgs.configurationName = "base";
|
||||
};
|
||||
in
|
||||
{
|
||||
nixos =
|
||||
name: module:
|
||||
baseNixos.extendModules {
|
||||
inputs.nixpkgs.lib.nixosSystem {
|
||||
modules = [
|
||||
config.nixosModules.combined
|
||||
sharedOptions
|
||||
module
|
||||
config.__extraHostConfigs.${name} or { }
|
||||
config.extraHostConfigs.${name} or { }
|
||||
];
|
||||
specialArgs.configurationName = name;
|
||||
};
|
||||
|
||||
darwin =
|
||||
name: module:
|
||||
let
|
||||
eval = baseDarwin._module.args.extendModules {
|
||||
modules = [
|
||||
module
|
||||
config.__extraHostConfigs.${name} or { }
|
||||
];
|
||||
specialArgs.configurationName = name;
|
||||
};
|
||||
in
|
||||
eval
|
||||
// {
|
||||
system = eval.config.system.build.toplevel;
|
||||
inputs.darwin.lib.darwinSystem {
|
||||
modules = [
|
||||
config.darwinModules.combined
|
||||
sharedOptions
|
||||
module
|
||||
config.extraHostConfigs.${name} or { }
|
||||
];
|
||||
specialArgs.configurationName = name;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
configurations.nixos.hijiri-vm =
|
||||
config.systems.nixos.hijiri-vm.module =
|
||||
{
|
||||
modulesPath,
|
||||
lib,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
configurations.darwin.hijiri =
|
||||
config.systems.darwin.hijiri.module =
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
enable = true;
|
||||
skhdConfig =
|
||||
let
|
||||
spaceCount = 6;
|
||||
spaceCount = 9;
|
||||
spaceBindings = lib.genList (
|
||||
i:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
configurations.nixos =
|
||||
config.configurations.nixos =
|
||||
let
|
||||
mkInstaller =
|
||||
system:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
configurations.nixos.kazuki =
|
||||
config.systems.nixos.kazuki.module =
|
||||
{
|
||||
modulesPath,
|
||||
...
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
configurations.darwin.kogata =
|
||||
config.systems.darwin.kogata.module =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nixpkgs.system = "aarch64-darwin";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
configurations.nixos.ude =
|
||||
config.systems.nixos.ude.module =
|
||||
{
|
||||
config,
|
||||
modulesPath,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
configurations.nixos.youko =
|
||||
config.systems.nixos.youko.module =
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
|
|
|
|||
16
inputs.nix
Normal file
16
inputs.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
let
|
||||
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
nodeName = lock.nodes.root.inputs.__flake-compat;
|
||||
inherit (lock.nodes.${nodeName}.locked) narHash rev url;
|
||||
flake-compat = builtins.fetchTarball {
|
||||
url = "${url}/archive/${rev}.tar.gz";
|
||||
sha256 = narHash;
|
||||
};
|
||||
flake = import flake-compat {
|
||||
src = ./.;
|
||||
copySourceTreeToStore = false;
|
||||
useBuiltinsFetchTree = true;
|
||||
};
|
||||
in
|
||||
# Workaround for https://github.com/nilla-nix/nilla/issues/14
|
||||
builtins.mapAttrs (_: input: input // { type = "derivation"; }) flake.inputs
|
||||
|
|
@ -1,29 +1,21 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
flakeModule = import ./flake { inherit (inputs) nixpkgs darwin home-manager; };
|
||||
perInput = system: flake: {
|
||||
packages = flake.packages.${system};
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
flakeModule
|
||||
];
|
||||
|
||||
flake.homeModules = rec {
|
||||
config.homeModules = rec {
|
||||
settei = ./home;
|
||||
default = settei;
|
||||
};
|
||||
|
||||
flake.flakeModules = rec {
|
||||
settei = flakeModule;
|
||||
default = settei;
|
||||
};
|
||||
|
||||
flake.nixosModules = rec {
|
||||
config.nixosModules = rec {
|
||||
settei = import ./system {
|
||||
inherit (config) perInput;
|
||||
inherit perInput;
|
||||
isLinux = true;
|
||||
};
|
||||
combined = {
|
||||
|
|
@ -33,21 +25,28 @@ in
|
|||
inputs.disko.nixosModules.disko
|
||||
inputs.mailserver.nixosModules.default
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.attic.nixosModules.atticd
|
||||
"${inputs.attic}/nixos/atticd.nix"
|
||||
inputs.lix-module.nixosModules.default
|
||||
{
|
||||
disabledModules = [
|
||||
"services/networking/atticd.nix"
|
||||
];
|
||||
services.atticd.useFlakeCompatOverlay = false;
|
||||
nixpkgs.overlays = [
|
||||
(final: _: {
|
||||
attic-client = config.packages.attic-client.result.${final.system};
|
||||
attic-server = config.packages.attic-server.result.${final.system};
|
||||
})
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
default = combined;
|
||||
};
|
||||
|
||||
flake.darwinModules = rec {
|
||||
config.darwinModules = rec {
|
||||
settei = import ./system {
|
||||
inherit (config) perInput;
|
||||
inherit perInput;
|
||||
isLinux = false;
|
||||
};
|
||||
combined = {
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
{
|
||||
nixpkgs,
|
||||
darwin,
|
||||
home-manager,
|
||||
}:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
{
|
||||
_file = ./configurations.nix;
|
||||
|
||||
options = {
|
||||
# Those functions take the final arguments and emit a valid configuration.
|
||||
# Probably should hardly ever be overriden
|
||||
builders = {
|
||||
nixos = mkOption {
|
||||
type = types.functionTo types.unspecified;
|
||||
default = _name: nixpkgs.lib.nixosSystem;
|
||||
};
|
||||
darwin = mkOption {
|
||||
type = types.functionTo types.unspecified;
|
||||
default = _name: darwin.lib.darwinSystem;
|
||||
};
|
||||
home = mkOption {
|
||||
type = types.functionTo types.unspecified;
|
||||
default = _name: home-manager.lib.homeManagerConfiguration;
|
||||
};
|
||||
};
|
||||
|
||||
configurations = {
|
||||
nixos = mkOption {
|
||||
type = types.lazyAttrsOf types.deferredModule;
|
||||
default = { };
|
||||
};
|
||||
darwin = mkOption {
|
||||
type = types.lazyAttrsOf types.deferredModule;
|
||||
default = { };
|
||||
};
|
||||
home = mkOption {
|
||||
type = types.lazyAttrsOf types.deferredModule;
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config.flake = {
|
||||
nixosConfigurations = mapAttrs config.builders.nixos config.configurations.nixos;
|
||||
darwinConfigurations = mapAttrs config.builders.darwin config.configurations.darwin;
|
||||
homeConfigurations = mapAttrs config.builders.home config.configurations.home;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
{
|
||||
nixpkgs,
|
||||
darwin,
|
||||
home-manager,
|
||||
}:
|
||||
{
|
||||
_file = ./default.nix;
|
||||
|
||||
imports = [
|
||||
(import ./configurations.nix { inherit nixpkgs darwin home-manager; })
|
||||
./services.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
# List of features I want this module to eventually have
|
||||
# TODO: Automatic port allocation
|
||||
# TODO: Making it possible to conveniently isolate services (running them in NixOS containers)
|
||||
# TODO: Handling specializations
|
||||
# TODO: Convenient http handling
|
||||
# TODO: Automatic backup
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
serviceModule =
|
||||
{ config, ... }:
|
||||
{
|
||||
options = {
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
};
|
||||
ports = lib.mkOption {
|
||||
type = with lib.types; listOf port;
|
||||
default = [ ];
|
||||
};
|
||||
hosts = lib.mkOption {
|
||||
type = with lib.types; listOf str;
|
||||
default = [ config.host ];
|
||||
};
|
||||
config = lib.mkOption {
|
||||
type = lib.types.deferredModule;
|
||||
default = { };
|
||||
};
|
||||
hostConfig = lib.mkOption {
|
||||
type = with lib.types; attrsOf deferredModule;
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
moduleToHostConfigs =
|
||||
cfg:
|
||||
lib.genAttrs cfg.hosts (host: {
|
||||
imports = [
|
||||
cfg.config
|
||||
(cfg.hostConfig.${host} or { })
|
||||
];
|
||||
});
|
||||
|
||||
maybeGetPreviousConfigs = acc: host: (acc.${host} or { imports = [ ]; }).imports;
|
||||
in
|
||||
{
|
||||
_file = ./services.nix;
|
||||
|
||||
options = {
|
||||
services = lib.mkOption {
|
||||
type = with lib.types; attrsOf (submodule serviceModule);
|
||||
default = { };
|
||||
};
|
||||
|
||||
__extraHostConfigs = lib.mkOption {
|
||||
type = with lib.types; attrsOf deferredModule;
|
||||
readOnly = true;
|
||||
};
|
||||
};
|
||||
|
||||
config.__extraHostConfigs =
|
||||
let
|
||||
duplicatePorts = lib.pipe config.services [
|
||||
lib.attrValues
|
||||
(map (cfg: cfg.ports))
|
||||
lib.flatten
|
||||
(lib.groupBy' (cnt: _: cnt + 1) 0 toString)
|
||||
(lib.filterAttrs (_: cnt: cnt > 1))
|
||||
lib.attrNames
|
||||
];
|
||||
assertMsg =
|
||||
let
|
||||
plural = lib.length duplicatePorts > 1;
|
||||
in
|
||||
"\nBad service config:\nThe following port${if plural then "s" else ""} ${
|
||||
if plural then "were" else "was"
|
||||
} declared multiple times: ${lib.concatStringsSep ", " duplicatePorts}";
|
||||
# Here I collect all the services.<name>.config into a flat
|
||||
# __extraHostConfigs.<host>.imports = [
|
||||
# ...
|
||||
# ]
|
||||
# so that I can easily import them in hosts/default.nix
|
||||
hostConfigs = lib.pipe config.services [
|
||||
lib.attrValues
|
||||
(lib.foldl' (
|
||||
acc: cfg:
|
||||
acc
|
||||
// lib.mapAttrs (host: c: {
|
||||
imports = c.imports ++ (maybeGetPreviousConfigs acc host);
|
||||
}) (moduleToHostConfigs cfg)
|
||||
) { })
|
||||
];
|
||||
in
|
||||
if duplicatePorts != [ ] then throw assertMsg else hostConfigs;
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
# TODO: Make this module not rely on OS config being present
|
||||
{
|
||||
osConfig,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs',
|
||||
machineName,
|
||||
|
|
@ -59,7 +58,6 @@ in
|
|||
|
||||
home.packages = [
|
||||
inputs'.settei.packages.base-packages
|
||||
pkgs.nh
|
||||
];
|
||||
|
||||
home.sessionVariables.EDITOR = "hx";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,16 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
inputs',
|
||||
...
|
||||
}:
|
||||
{
|
||||
_file = ./default.nix;
|
||||
|
||||
imports = [ ./zellij.nix ];
|
||||
imports = [
|
||||
./zellij.nix
|
||||
./qutebrowser.nix
|
||||
];
|
||||
|
||||
options.settei.desktop = {
|
||||
enable = lib.mkEnableOption "Common configuration for desktop machines";
|
||||
|
|
@ -21,56 +23,12 @@
|
|||
nerd-fonts.iosevka
|
||||
nerd-fonts.iosevka-term
|
||||
fontconfig
|
||||
signal-desktop
|
||||
signal-desktop-bin
|
||||
];
|
||||
settei.unfree.allowedPackages = [ "signal-desktop" ];
|
||||
settei.unfree.allowedPackages = [ "signal-desktop-bin" ];
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package =
|
||||
let
|
||||
firefox-pkgs = pkgs.extend inputs.firefox-darwin.overlay;
|
||||
in
|
||||
lib.mkIf pkgs.stdenv.isDarwin firefox-pkgs.firefox-bin;
|
||||
};
|
||||
|
||||
programs.qutebrowser = {
|
||||
enable = true;
|
||||
package =
|
||||
if pkgs.stdenv.isDarwin then inputs'.niko-nur.packages.qutebrowser-bin else pkgs.qutebrowser;
|
||||
searchEngines = {
|
||||
r = "https://doc.rust-lang.org/stable/std/?search={}";
|
||||
lib = "https://lib.rs/search?q={}";
|
||||
nip = "https://jisho.org/search/{}";
|
||||
};
|
||||
settings = {
|
||||
tabs = {
|
||||
indicator.width = 3;
|
||||
};
|
||||
|
||||
fonts = {
|
||||
default_family = "IosevkaTerm Nerd Font";
|
||||
default_size = "13px";
|
||||
};
|
||||
|
||||
content = {
|
||||
canvas_reading = true;
|
||||
blocking.method = "both";
|
||||
javascript.clipboard = "access";
|
||||
};
|
||||
};
|
||||
# Workaround because the nix module doesn't properly handle options that expect a dict
|
||||
extraConfig = ''
|
||||
c.tabs.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
|
||||
c.statusbar.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
|
||||
'';
|
||||
keyBindings = {
|
||||
passthrough = {
|
||||
"<Ctrl-Escape>" = "mode-leave";
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.firefox.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
38
modules/home/desktop/qutebrowser.nix
Normal file
38
modules/home/desktop/qutebrowser.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs.qutebrowser = {
|
||||
# TODO: Enable again
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
searchEngines = {
|
||||
r = "https://doc.rust-lang.org/stable/std/?search={}";
|
||||
lib = "https://lib.rs/search?q={}";
|
||||
nip = "https://jisho.org/search/{}";
|
||||
};
|
||||
settings = {
|
||||
tabs = {
|
||||
indicator.width = 3;
|
||||
};
|
||||
|
||||
fonts = {
|
||||
default_family = "IosevkaTerm Nerd Font";
|
||||
default_size = "13px";
|
||||
};
|
||||
|
||||
content = {
|
||||
canvas_reading = true;
|
||||
blocking.method = "both";
|
||||
javascript.clipboard = "access";
|
||||
};
|
||||
};
|
||||
# Workaround because the nix module doesn't properly handle options that expect a dict
|
||||
extraConfig = ''
|
||||
c.tabs.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
|
||||
c.statusbar.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
|
||||
'';
|
||||
keyBindings = {
|
||||
passthrough = {
|
||||
"<Ctrl-Escape>" = "mode-leave";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
8
modules/nilla/builders/custom-load.nix
Normal file
8
modules/nilla/builders/custom-load.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ lib }:
|
||||
{
|
||||
config.builders.custom-load = {
|
||||
settings.type = lib.types.submodule { };
|
||||
settings.default = { };
|
||||
build = pkg: lib.attrs.generate pkg.systems (system: pkg.package { inherit system; });
|
||||
};
|
||||
}
|
||||
6
modules/nilla/builders/default.nix
Normal file
6
modules/nilla/builders/default.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
includes = [
|
||||
./nixpkgs-flake.nix
|
||||
./custom-load.nix
|
||||
];
|
||||
}
|
||||
21
modules/nilla/builders/nixpkgs-flake.nix
Normal file
21
modules/nilla/builders/nixpkgs-flake.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
}:
|
||||
{
|
||||
config.builders.nixpkgs-flake = {
|
||||
settings.type = lib.types.submodule {
|
||||
options.args = lib.options.create {
|
||||
type = lib.types.any;
|
||||
default.value = { };
|
||||
};
|
||||
};
|
||||
settings.default = { };
|
||||
build =
|
||||
pkg:
|
||||
lib.attrs.generate pkg.systems (
|
||||
system: inputs.nixpkgs.legacyPackages.${system}.callPackage pkg.package pkg.settings.args
|
||||
);
|
||||
};
|
||||
}
|
||||
9
modules/nilla/default.nix
Normal file
9
modules/nilla/default.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
includes = [
|
||||
./builders
|
||||
./services.nix
|
||||
./systems.nix
|
||||
./modules.nix
|
||||
./flake.nix
|
||||
];
|
||||
}
|
||||
32
modules/nilla/flake.nix
Normal file
32
modules/nilla/flake.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, config }:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
transpose =
|
||||
attrs: lib.attrs.generate systems (system: builtins.mapAttrs (_: pkg: pkg.result.${system}) attrs);
|
||||
in
|
||||
{
|
||||
options.flake = lib.options.create {
|
||||
type = lib.types.attrs.of lib.types.raw;
|
||||
};
|
||||
|
||||
config.flake = {
|
||||
inherit (config)
|
||||
nixosModules
|
||||
darwinModules
|
||||
homeModules
|
||||
;
|
||||
|
||||
nixosConfigurations = builtins.mapAttrs (_: system: system.result) config.systems.nixos;
|
||||
darwinConfigurations = builtins.mapAttrs (_: system: system.result) config.systems.darwin;
|
||||
homeConfigurations = builtins.mapAttrs (_: system: system.result) config.systems.home;
|
||||
|
||||
devShells = transpose config.shells;
|
||||
packages = transpose config.packages;
|
||||
|
||||
formatter = config.packages.formatter.result;
|
||||
};
|
||||
}
|
||||
17
modules/nilla/modules.nix
Normal file
17
modules/nilla/modules.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ lib }:
|
||||
{
|
||||
options = {
|
||||
nixosModules = lib.options.create {
|
||||
type = lib.types.attrs.of lib.types.raw;
|
||||
default.value = { };
|
||||
};
|
||||
darwinModules = lib.options.create {
|
||||
type = lib.types.attrs.of lib.types.raw;
|
||||
default.value = { };
|
||||
};
|
||||
homeModules = lib.options.create {
|
||||
type = lib.types.attrs.of lib.types.raw;
|
||||
default.value = { };
|
||||
};
|
||||
};
|
||||
}
|
||||
95
modules/nilla/services.nix
Normal file
95
modules/nilla/services.nix
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
{ lib, config }:
|
||||
let
|
||||
inherit (builtins)
|
||||
attrNames
|
||||
attrValues
|
||||
concatStringsSep
|
||||
mapAttrs
|
||||
foldl'
|
||||
groupBy
|
||||
length
|
||||
;
|
||||
serviceModule =
|
||||
{ config }:
|
||||
{
|
||||
options = {
|
||||
host = lib.options.create {
|
||||
type = lib.types.string;
|
||||
};
|
||||
ports = lib.options.create {
|
||||
type = lib.types.list.of lib.types.port;
|
||||
default.value = [ ];
|
||||
};
|
||||
hosts = lib.options.create {
|
||||
type = lib.types.list.of lib.types.string;
|
||||
default.value = [ config.host ];
|
||||
};
|
||||
module = lib.options.create {
|
||||
type = lib.types.raw;
|
||||
default.value = { };
|
||||
};
|
||||
hostModule = lib.options.create {
|
||||
type = lib.types.attrs.of lib.types.raw;
|
||||
default.value = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
moduleToHostConfigs =
|
||||
cfg:
|
||||
lib.attrs.generate cfg.hosts (host: {
|
||||
imports = [
|
||||
cfg.module
|
||||
(cfg.hostModule.${host} or { })
|
||||
];
|
||||
});
|
||||
|
||||
maybeGetPreviousConfigs = acc: host: (acc.${host} or { imports = [ ]; }).imports;
|
||||
|
||||
# Copied from nixpkgs/lib/lists.nix
|
||||
groupBy' =
|
||||
op: nul: pred: lst:
|
||||
mapAttrs (_name: foldl' op nul) (groupBy pred lst);
|
||||
duplicatePorts = lib.fp.pipe [
|
||||
attrValues
|
||||
(map (cfg: cfg.ports))
|
||||
lib.lists.flatten
|
||||
(groupBy' (cnt: _: cnt + 1) 0 toString)
|
||||
(lib.attrs.filter (_: cnt: cnt > 1))
|
||||
attrNames
|
||||
] config.services;
|
||||
in
|
||||
{
|
||||
options.services = lib.options.create {
|
||||
type = lib.types.attrs.of (lib.types.submodule serviceModule);
|
||||
default.value = { };
|
||||
};
|
||||
|
||||
options.extraHostConfigs = lib.options.create {
|
||||
type = lib.types.attrs.of lib.types.raw;
|
||||
writable = false;
|
||||
default.value = lib.fp.pipe [
|
||||
attrValues
|
||||
(foldl' (
|
||||
acc: cfg:
|
||||
acc
|
||||
// mapAttrs (host: c: {
|
||||
imports = c.imports ++ (maybeGetPreviousConfigs acc host);
|
||||
}) (moduleToHostConfigs cfg)
|
||||
) { })
|
||||
] config.services;
|
||||
};
|
||||
|
||||
config.assertions = [
|
||||
{
|
||||
assertion = duplicatePorts == [ ];
|
||||
message =
|
||||
let
|
||||
plural = length duplicatePorts > 1;
|
||||
in
|
||||
"\nBad service config:\nThe following port${if plural then "s" else ""} ${
|
||||
if plural then "were" else "was"
|
||||
} declared multiple times: ${concatStringsSep ", " duplicatePorts}";
|
||||
}
|
||||
];
|
||||
}
|
||||
52
modules/nilla/systems.nix
Normal file
52
modules/nilla/systems.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ config, lib }:
|
||||
let
|
||||
mkBuilderOption =
|
||||
typ:
|
||||
lib.options.create {
|
||||
type = lib.types.function (lib.types.function lib.types.raw);
|
||||
default.value = _name: _module: throw "Builder for systems.${typ} is not implemented";
|
||||
};
|
||||
inherit (config.systems) builders;
|
||||
mkSystemModule =
|
||||
typ:
|
||||
{ config, name }:
|
||||
{
|
||||
options = {
|
||||
name = lib.options.create {
|
||||
type = lib.types.string;
|
||||
default.value = name;
|
||||
};
|
||||
module = lib.options.create {
|
||||
type = lib.types.raw;
|
||||
default.value = { };
|
||||
};
|
||||
builder = lib.options.create {
|
||||
type = lib.types.function (lib.types.function lib.types.raw);
|
||||
default.value = builders.${typ};
|
||||
};
|
||||
result = lib.options.create {
|
||||
type = lib.types.raw;
|
||||
writable = false;
|
||||
default.value = config.builder config.name config.module;
|
||||
};
|
||||
};
|
||||
};
|
||||
mkSystemOption =
|
||||
typ:
|
||||
lib.options.create {
|
||||
type = lib.types.attrs.of (lib.types.submodule (mkSystemModule typ));
|
||||
default.value = { };
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
systems = {
|
||||
builders.nixos = mkBuilderOption "nixos";
|
||||
builders.darwin = mkBuilderOption "darwin";
|
||||
builders.home = mkBuilderOption "home";
|
||||
nixos = mkSystemOption "nixos";
|
||||
darwin = mkSystemOption "darwin";
|
||||
home = mkSystemOption "home";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -22,7 +22,6 @@
|
|||
(import ./tailscale.nix { inherit isLinux; })
|
||||
(import ./containers.nix { inherit isLinux; })
|
||||
./unfree.nix
|
||||
(import ./hercules.nix { inherit isLinux; })
|
||||
(import ./github-runner.nix { inherit isLinux; })
|
||||
(import ./incus.nix { inherit isLinux; })
|
||||
(import ./monitoring.nix { inherit isLinux; })
|
||||
|
|
|
|||
|
|
@ -7,6 +7,18 @@
|
|||
}:
|
||||
let
|
||||
cfg = config.settei.flake-qol;
|
||||
|
||||
nixpkgsInputToFlakeRef =
|
||||
input:
|
||||
if input._type or "" == "flake" then
|
||||
{
|
||||
type = "github";
|
||||
owner = "NixOS";
|
||||
repo = "nixpkgs";
|
||||
inherit (input) lastModified narHash rev;
|
||||
}
|
||||
else
|
||||
input;
|
||||
in
|
||||
{
|
||||
_file = ./flake-qol.nix;
|
||||
|
|
@ -20,6 +32,12 @@ in
|
|||
default = true;
|
||||
};
|
||||
inputs = mkOption { type = types.unspecified; };
|
||||
nixpkgsRef = mkOption {
|
||||
type = types.unspecified;
|
||||
default = cfg.inputs.nixpkgs;
|
||||
apply =
|
||||
ref: if builtins.isString ref then builtins.parseFlakeRef ref else nixpkgsInputToFlakeRef ref;
|
||||
};
|
||||
inputs-flakes = mkOption {
|
||||
type = types.attrs;
|
||||
readOnly = true;
|
||||
|
|
@ -44,8 +62,8 @@ in
|
|||
settei.user.extraArgs = reexportedArgs;
|
||||
|
||||
nix = {
|
||||
registry = lib.mapAttrs (_: flake: { inherit flake; }) cfg.inputs-flakes;
|
||||
nixPath = lib.mapAttrsToList (name: _: "${name}=flake:${name}") cfg.inputs-flakes;
|
||||
registry.nixpkgs.to = cfg.nixpkgsRef;
|
||||
nixPath = [ "nixpkgs=flake:nixpkgs" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
{ isLinux }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
options = {
|
||||
settei.hercules.enable = lib.mkEnableOption "Enables hercules-ci-agent with my configuration";
|
||||
};
|
||||
|
||||
herculesUser =
|
||||
if isLinux then
|
||||
config.systemd.services.hercules-ci-agent.serviceConfig.User
|
||||
else
|
||||
config.launchd.daemons.hercules-ci-agent.serviceConfig.UserName;
|
||||
in
|
||||
{
|
||||
_file = ./hercules.nix;
|
||||
|
||||
inherit options;
|
||||
|
||||
config = lib.mkIf config.settei.hercules.enable {
|
||||
age.secrets.hercules-token = {
|
||||
file = ../../../secrets/hercules-token.age;
|
||||
owner = herculesUser;
|
||||
};
|
||||
age.secrets.hercules-cache = {
|
||||
file = ../../../secrets/hercules-cache.age;
|
||||
owner = herculesUser;
|
||||
};
|
||||
age.secrets.hercules-secrets = {
|
||||
file = ../../../secrets/hercules-secrets.age;
|
||||
owner = herculesUser;
|
||||
};
|
||||
|
||||
services.hercules-ci-agent = {
|
||||
enable = true;
|
||||
settings = {
|
||||
clusterJoinTokenPath = config.age.secrets.hercules-token.path;
|
||||
concurrentTasks = lib.mkDefault 4;
|
||||
binaryCachesPath = config.age.secrets.hercules-cache.path;
|
||||
secretsJsonPath = config.age.secrets.hercules-secrets.path;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -62,15 +62,11 @@ let
|
|||
"https://cache.nrab.lol"
|
||||
"https://cache.garnix.io"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://hyprland.cachix.org"
|
||||
"https://hercules-ci.cachix.org"
|
||||
"https://nrabulinski.cachix.org"
|
||||
];
|
||||
extra-trusted-public-keys = [
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
|
||||
"nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic="
|
||||
"cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg="
|
||||
];
|
||||
|
|
@ -116,6 +112,8 @@ let
|
|||
|
||||
darwinConfig = lib.optionalAttrs (!isLinux) {
|
||||
system.stateVersion = 4;
|
||||
# FIXME: Remove
|
||||
system.primaryUser = username;
|
||||
|
||||
security.pam.services.sudo_local.touchIdAuth = true;
|
||||
|
||||
|
|
|
|||
135
nilla.nix
Normal file
135
nilla.nix
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
{
|
||||
inputs ? import ./inputs.nix,
|
||||
}:
|
||||
(import inputs.nilla).create (
|
||||
{ config, lib }:
|
||||
{
|
||||
includes = [
|
||||
./modules/nilla
|
||||
./pkgs
|
||||
./wrappers
|
||||
./hosts
|
||||
./assets
|
||||
./services
|
||||
./modules
|
||||
];
|
||||
|
||||
config.inputs = builtins.mapAttrs (_: src: {
|
||||
inherit src;
|
||||
loader = "raw";
|
||||
}) inputs;
|
||||
# Add inputs argument so modules can conveniently use it
|
||||
config.__module__.args.dynamic.inputs = builtins.mapAttrs (
|
||||
_name: input: input.result
|
||||
) config.inputs;
|
||||
|
||||
config.packages =
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
mkPackage = package: {
|
||||
builder = "nixpkgs-flake";
|
||||
inherit systems package;
|
||||
};
|
||||
mkPackageFlakeOutput =
|
||||
{
|
||||
input,
|
||||
output ? input,
|
||||
}:
|
||||
{
|
||||
inherit systems;
|
||||
builder = "custom-load";
|
||||
package = { system }: inputs.${input}.packages.${system}.${output};
|
||||
};
|
||||
getPkgs = system: builtins.mapAttrs (_: pkg: pkg.result.${system}) config.packages;
|
||||
in
|
||||
{
|
||||
agenix = mkPackageFlakeOutput { input = "agenix"; };
|
||||
base-packages = mkPackage (
|
||||
{ symlinkJoin, system }:
|
||||
symlinkJoin {
|
||||
name = "settei-base";
|
||||
paths = with (getPkgs system); [
|
||||
helix
|
||||
fish
|
||||
git-commit-last
|
||||
git-fixup
|
||||
nh
|
||||
];
|
||||
}
|
||||
);
|
||||
formatter = {
|
||||
inherit systems;
|
||||
builder = "custom-load";
|
||||
package =
|
||||
{ system }:
|
||||
let
|
||||
eval = inputs.treefmt.lib.evalModule inputs.nixpkgs.legacyPackages.${system} ./treefmt.nix;
|
||||
in
|
||||
eval.config.build.wrapper;
|
||||
};
|
||||
__allPackages =
|
||||
let
|
||||
all-packages = builtins.attrValues (
|
||||
builtins.removeAttrs config.packages [
|
||||
"ci-check"
|
||||
"__allPackages"
|
||||
]
|
||||
);
|
||||
all-packages' = lib.lists.flatten (map (pkg: builtins.attrValues pkg.result) all-packages);
|
||||
|
||||
nixos-systems = builtins.attrValues config.systems.nixos;
|
||||
nixos-systems' = map (system: system.result.config.system.build.toplevel) nixos-systems;
|
||||
|
||||
darwin-systems = builtins.attrValues config.systems.darwin;
|
||||
darwin-systems' = map (system: system.result.config.system.build.toplevel) darwin-systems;
|
||||
|
||||
all-drvs = all-packages' ++ nixos-systems' ++ darwin-systems';
|
||||
all-drvs' = lib.strings.concatMapSep "\n" builtins.unsafeDiscardStringContext all-drvs;
|
||||
in
|
||||
mkPackage (
|
||||
{ runCommand }:
|
||||
runCommand "eval-check" {
|
||||
allDerivations = all-drvs';
|
||||
passAsFile = [ "allDerivations" ];
|
||||
} "touch $out"
|
||||
);
|
||||
ci-check = mkPackage (
|
||||
{
|
||||
writeShellScript,
|
||||
lib,
|
||||
system,
|
||||
}:
|
||||
writeShellScript "ci-check" ''
|
||||
nix-instantiate --eval -E 'import ./nilla.nix {}' -A packages.__allPackages.result.${system}.outPath
|
||||
"${lib.getExe config.packages.formatter.result.${system}}" --ci
|
||||
''
|
||||
);
|
||||
};
|
||||
|
||||
config.shells.default = {
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
builder = "nixpkgs-flake";
|
||||
shell =
|
||||
{
|
||||
mkShellNoCC,
|
||||
system,
|
||||
nh,
|
||||
}:
|
||||
mkShellNoCC {
|
||||
packages = [
|
||||
config.packages.agenix.result.${system}
|
||||
config.packages.attic-client.result.${system}
|
||||
config.packages.nh.result.${system}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
)
|
||||
|
|
@ -1,47 +1,25 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fenix,
|
||||
crane,
|
||||
src,
|
||||
libiconv,
|
||||
rocksdb,
|
||||
darwin,
|
||||
rustPlatform,
|
||||
}:
|
||||
let
|
||||
rust =
|
||||
with fenix;
|
||||
combine [
|
||||
stable.cargo
|
||||
stable.rustc
|
||||
];
|
||||
crane' = crane.overrideToolchain rust;
|
||||
rocksdb' = rocksdb.overrideAttrs (
|
||||
final: prev: {
|
||||
version = "9.1.1";
|
||||
src = prev.src.override {
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=";
|
||||
};
|
||||
}
|
||||
);
|
||||
manifest = (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml")).package;
|
||||
in
|
||||
crane'.buildPackage {
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = manifest.name;
|
||||
inherit (manifest) version;
|
||||
|
||||
inherit src;
|
||||
strictDeps = true;
|
||||
|
||||
cargoLock.lockFile = "${src}/Cargo.lock";
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
# Use system RocksDB
|
||||
ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
|
||||
ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
|
||||
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
|
||||
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
|
||||
NIX_OUTPATH_USED_AS_RANDOM_SEED = "randomseed";
|
||||
CONDUIT_VERSION_EXTRA = src.shortRev;
|
||||
}
|
||||
|
|
|
|||
107
pkgs/default.nix
107
pkgs/default.nix
|
|
@ -1,35 +1,78 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
perSystem =
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs',
|
||||
...
|
||||
}:
|
||||
{
|
||||
packages.conduit-next = pkgs.callPackage ./conduit {
|
||||
src = inputs.conduit-src;
|
||||
crane = inputs.crane.mkLib pkgs;
|
||||
fenix = inputs'.fenix.packages;
|
||||
};
|
||||
|
||||
packages.git-commit-last = pkgs.writeShellApplication {
|
||||
name = "git-commit-last";
|
||||
text = ''
|
||||
GITDIR="$(git rev-parse --git-dir)"
|
||||
git commit -eF "$GITDIR/COMMIT_EDITMSG"
|
||||
'';
|
||||
};
|
||||
|
||||
packages.git-fixup = pkgs.writeShellApplication {
|
||||
name = "git-fixup";
|
||||
text = ''
|
||||
git log -n 50 --pretty=format:'%h %s' --no-merges | \
|
||||
${lib.getExe pkgs.fzf} | \
|
||||
cut -c -7 | \
|
||||
xargs -o git commit --fixup
|
||||
'';
|
||||
};
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
}:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
builder = "nixpkgs-flake";
|
||||
mkPackage = package: {
|
||||
inherit systems package builder;
|
||||
};
|
||||
atticPkgs = lib.attrs.generate systems (
|
||||
system:
|
||||
let
|
||||
pkgs = inputs.nixpkgs.legacyPackages.${system}.extend inputs.lix-module.overlays.default;
|
||||
craneLib = import inputs.crane { inherit pkgs; };
|
||||
in
|
||||
pkgs.callPackage "${inputs.attic}/crane.nix" { inherit craneLib; }
|
||||
);
|
||||
in
|
||||
{
|
||||
config.packages.conduit-next = {
|
||||
inherit systems builder;
|
||||
package = import ./conduit;
|
||||
settings.args = {
|
||||
src = inputs.conduit-src;
|
||||
};
|
||||
};
|
||||
|
||||
config.packages.git-commit-last = mkPackage (
|
||||
{ writeShellApplication }:
|
||||
writeShellApplication {
|
||||
name = "git-commit-last";
|
||||
text = ''
|
||||
GITDIR="$(git rev-parse --git-dir)"
|
||||
git commit -eF "$GITDIR/COMMIT_EDITMSG"
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
config.packages.git-fixup = mkPackage (
|
||||
{
|
||||
lib,
|
||||
writeShellApplication,
|
||||
fzf,
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "git-fixup";
|
||||
text = ''
|
||||
git log -n 50 --pretty=format:'%h %s' --no-merges | \
|
||||
${lib.getExe fzf} | \
|
||||
cut -c -7 | \
|
||||
xargs -o git commit --fixup
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
config.packages.attic-client = {
|
||||
inherit systems;
|
||||
builder = "custom-load";
|
||||
package = { system }: atticPkgs.${system}.attic-client;
|
||||
};
|
||||
config.packages.attic-server = {
|
||||
inherit systems;
|
||||
builder = "custom-load";
|
||||
package = { system }: atticPkgs.${system}.attic-server;
|
||||
};
|
||||
|
||||
config.packages.nh = {
|
||||
inherit systems builder;
|
||||
package = import "${inputs.nh}/package.nix";
|
||||
settings.args.rev = inputs.nh.shortRev;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
services.attic =
|
||||
config.services.attic =
|
||||
let
|
||||
atticPort = 9476;
|
||||
in
|
||||
{
|
||||
host = "kazuki";
|
||||
ports = [ atticPort ];
|
||||
config =
|
||||
module =
|
||||
{ config, ... }:
|
||||
{
|
||||
age.secrets.attic-creds = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
imports = [
|
||||
includes = [
|
||||
./attic.nix
|
||||
./forgejo-runner.nix
|
||||
./forgejo.nix
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
services.forgejo-runner = {
|
||||
config.services.forgejo-runner = {
|
||||
hosts = [
|
||||
"ude"
|
||||
"youko"
|
||||
];
|
||||
config =
|
||||
module =
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
services.forgejo = {
|
||||
config.services.forgejo = {
|
||||
host = "kazuki";
|
||||
ports = [ 3000 ];
|
||||
config =
|
||||
module =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
age.secrets.rab-lol-cf = {
|
||||
|
|
|
|||
1
shell.nix
Normal file
1
shell.nix
Normal file
|
|
@ -0,0 +1 @@
|
|||
(import ./nilla.nix { }).shells.default.result.${builtins.currentSystem}
|
||||
23
treefmt.nix
Normal file
23
treefmt.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{
|
||||
projectRootFile = "nilla.nix";
|
||||
programs.deadnix.enable = true;
|
||||
programs.nixfmt.enable = true;
|
||||
programs.statix.enable = true;
|
||||
programs.fish_indent.enable = true;
|
||||
programs.deno.enable = true;
|
||||
programs.stylua.enable = true;
|
||||
programs.shfmt.enable = true;
|
||||
settings.global.excludes = [
|
||||
# agenix
|
||||
"*.age"
|
||||
|
||||
# racket
|
||||
"*.rkt"
|
||||
"**/rashrc"
|
||||
|
||||
# custom assets
|
||||
"*.png"
|
||||
"*.svg"
|
||||
];
|
||||
settings.on-unmatched = "fatal";
|
||||
}
|
||||
|
|
@ -1,25 +1,36 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
perSystem =
|
||||
{ pkgs, inputs', ... }:
|
||||
let
|
||||
wrapped = inputs.wrapper-manager-hm-compat.lib {
|
||||
inherit pkgs;
|
||||
modules = [
|
||||
./starship
|
||||
./helix
|
||||
# TODO: Enable again
|
||||
# ./rash
|
||||
./fish
|
||||
./wezterm
|
||||
];
|
||||
specialArgs = {
|
||||
inherit inputs inputs';
|
||||
};
|
||||
};
|
||||
all-packages = wrapped.config.build.packages;
|
||||
in
|
||||
{
|
||||
packages = all-packages;
|
||||
};
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
}:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
wrappedPerSystem = lib.attrs.generate systems (
|
||||
system:
|
||||
inputs.wrapper-manager-hm-compat.lib {
|
||||
pkgs = inputs.nixpkgs.legacyPackages.${system};
|
||||
modules = [
|
||||
./starship
|
||||
./helix
|
||||
# TODO: Enable again
|
||||
# ./rash
|
||||
./fish
|
||||
./wezterm
|
||||
];
|
||||
specialArgs = { inherit inputs; };
|
||||
}
|
||||
);
|
||||
wrappedPerSystem' = builtins.mapAttrs (_: wrapped: wrapped.config.build.packages) wrappedPerSystem;
|
||||
wrapperNames = builtins.attrNames wrappedPerSystem'."x86_64-linux";
|
||||
in
|
||||
{
|
||||
config.packages = lib.attrs.generate wrapperNames (wrapper: {
|
||||
inherit systems;
|
||||
builder = "custom-load";
|
||||
package = { system }: wrappedPerSystem'.${system}.${wrapper};
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs, inputs', ... }:
|
||||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
package = inputs'.helix.packages.default;
|
||||
package = inputs.helix.packages.${pkgs.system}.default;
|
||||
settings = {
|
||||
theme = "base16_default_dark";
|
||||
editor = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs',
|
||||
inputs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
rev = "8eb52c163d6ea7c3cec2cc6b1011ce00738942e1";
|
||||
hash = "sha256-1yU0ZUBQqYEn85j4T2pLs02MTyJnO5BbYALIa88iomY=";
|
||||
};
|
||||
racket-with-libs = inputs'.racket.packages.racket.newLayer {
|
||||
racket-with-libs = inputs.racket.packages.${pkgs.system}.racket.newLayer {
|
||||
withRacketPackages =
|
||||
ps: with ps; [
|
||||
readline-gpl
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue