diff --git a/config.nix b/config.nix deleted file mode 100644 index 05104fdac163f686a3c899a9a4af626b5bccd45b..0000000000000000000000000000000000000000 --- a/config.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - pkgs ? import { }, -}: -{ - username = "jolheiser"; - sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa"; - domain = "jolheiser.com"; -} diff --git a/dragonwell/default.nix b/dragonwell/default.nix index 738e174071e819dbcb9ab4563e9e4a907c3cc7ff..3e37cf8e8780579020aecc4a08a5e96dcee26d74 100644 --- a/dragonwell/default.nix +++ b/dragonwell/default.nix @@ -1,8 +1,32 @@ -{ jolheiser, ... }: +let + username = "jolheiser"; + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa"; +in { - imports = - (map (name: ./services + "/${name}") (builtins.attrNames (builtins.readDir ./services))) - ++ [ ./hardware.nix ]; + imports = [ + ./atproto.nix + ./beszel.nix + ./caddy.nix + ./forge-lines.nix + ./foundry.nix + #./git-bug.nix + ./git-pr.nix + ./go.nix + ./gollum.nix + ./horcrux.nix + ./mealie.nix + ./miniserve.nix + ./mint.nix + ./oa2p.nix + ./pocket-id.nix + ./pubserve.nix + ./restic.nix + ./soju.nix + ./ugit.nix + ./woodpecker.nix + ./zoekt.nix + ./hardware.nix + ]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; @@ -29,16 +53,16 @@ fail2ban.enable = true; }; users.users = { - "${jolheiser.username}" = { + "${username}" = { extraGroups = [ "wheel" "docker" "storage" ]; isNormalUser = true; - openssh.authorizedKeys.keys = [ jolheiser.sshKey ]; + openssh.authorizedKeys.keys = [ key ]; }; - "root".openssh.authorizedKeys.keys = [ jolheiser.sshKey ]; + "root".openssh.authorizedKeys.keys = [ key ]; }; nix = { diff --git a/dragonwell/go.nix b/dragonwell/go.nix new file mode 100644 index 0000000000000000000000000000000000000000..e388f3a9dc0a0068896adce91bdba0dd89b22a6d --- /dev/null +++ b/dragonwell/go.nix @@ -0,0 +1,36 @@ +let + altModules = [ + { + name = "hcaptcha"; + repo = "gitea.com/jolheiser/hcaptcha"; + } + { + name = "pwn"; + repo = "gitea.com/jolheiser/pwn"; + } + ]; + redirects = builtins.concatStringsSep "\n" ( + builtins.map (module: '' + respond /${module.name}* ` + + + + Redirecting to https://pkg.go.dev/go.jolheiser.com/${module.name} + ` + '') altModules + ); +in +{ + services.caddy.virtualHosts."go.jolheiser.com" = { + extraConfig = '' + header Content-Type text/html + ${redirects} + respond /* ` + + + + Redirecting to https://pkg.go.dev/go.jolheiser.com{path} + ` + ''; + }; +} diff --git a/dragonwell/oa2p.nix b/dragonwell/oa2p.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3ca8fc5a7c321e6a0f14889df6c976304abf45a --- /dev/null +++ b/dragonwell/oa2p.nix @@ -0,0 +1,26 @@ +{ config, ... }: +let + port = 6227; +in +{ + age.secrets.oa2p.file = ../secrets/oa2p.age; + services = { + oauth2-proxy = { + enable = true; + provider = "oidc"; + httpAddress = "localhost:${builtins.toString port}"; + reverseProxy = true; + cookie = { + secure = true; + domain = "wiki.jolheiser.com"; + }; + email.domains = [ "*" ]; + keyFile = config.age.secrets.oa2p.path; + redirectURL = "https://wiki.jolheiser.com/oauth2/callback"; + oidcIssuerUrl = "https://id.jolheiser.com"; + }; + caddy.virtualHosts."oa2p.jolheiser.com".extraConfig = '' + reverse_proxy localhost:${builtins.toString port} + ''; + }; +} diff --git a/dragonwell/services/atproto.nix b/dragonwell/atproto.nix rename from dragonwell/services/atproto.nix rename to dragonwell/atproto.nix index 6fce0df7fd5ac6a358718aa40a892d7ebcfc899e..6e417feeead24caea4be1ccbaff2e4ffb13d8a8c 100644 --- a/dragonwell/services/atproto.nix +++ b/dragonwell/atproto.nix @@ -1,23 +1,22 @@ -{ jolheiser, config, ... }: +{ config, ... }: let port = 2759; - host = "pds.${jolheiser.domain}"; in { - age.secrets.pds.file = ../../secrets/pds.age; + age.secrets.pds.file = ../secrets/pds.age; services = { bluesky-pds = { enable = true; pdsadmin.enable = true; settings = { PDS_PORT = port; - PDS_HOSTNAME = host; + PDS_HOSTNAME = "pds.jolheiser.com"; }; environmentFiles = [ config.age.secrets.pds.path ]; }; - caddy.virtualHosts."${host}".extraConfig = '' + caddy.virtualHosts."pds.jolheiser.com".extraConfig = '' reverse_proxy localhost:${builtins.toString port} ''; }; diff --git a/dragonwell/services/beszel.nix b/dragonwell/beszel.nix rename from dragonwell/services/beszel.nix rename to dragonwell/beszel.nix index 50ef37e7547039fcd3958e2d1d830d57ea69befb..f63f49bcfda70d3f91dadb765983abc774d5de29 100644 --- a/dragonwell/services/beszel.nix +++ b/dragonwell/beszel.nix @@ -1,6 +1,6 @@ { config, ... }: { - age.secrets.beszel-dragonwell.file = ../../secrets/beszel-dragonwell.age; + age.secrets.beszel-dragonwell.file = ../secrets/beszel-dragonwell.age; services.beszel.agent = { enable = true; environment.LOG_LEVEL = "info"; diff --git a/dragonwell/services/caddy.nix b/dragonwell/caddy.nix rename from dragonwell/services/caddy.nix rename to dragonwell/caddy.nix index 9ce60f5f5fb74eb639fb470e6cd33cf1d8841aeb..2f4a48b902f7dbf70bdbc35ab0af754a04c6055c 100644 --- a/dragonwell/services/caddy.nix +++ b/dragonwell/caddy.nix @@ -1,24 +1,19 @@ -{ - jolheiser, - inputs, - pkgs, - ... -}: +{ inputs, pkgs, ... }: { services.caddy = { enable = true; virtualHosts = { - "${jolheiser.domain}" = { + "jolheiser.com" = { extraConfig = '' handle_path /.well-known/webfinger { header Content-Type application/jrd+json respond ${ builtins.toJSON { - subject = "acct:john@${jolheiser.domain}"; + subject = "acct:john@jolheiser.com"; links = [ { rel = "http://openid.net/specs/connect/1.0/issuer"; - href = "https://id.${jolheiser.domain}"; + href = "https://id.jolheiser.com"; } ]; } @@ -38,15 +33,15 @@ root * ${inputs.website.packages.${pkgs.stdenv.hostPlatform.system}.default} file_server } ''; - serverAliases = [ "www.${jolheiser.domain}" ]; + serverAliases = [ "www.jolheiser.com" ]; }; - "blog.${jolheiser.domain}" = { + "blog.jolheiser.com" = { extraConfig = '' root * ${inputs.blog.packages.${pkgs.stdenv.hostPlatform.system}.default} file_server ''; }; - "dev.${jolheiser.domain}".extraConfig = '' + "dev.jolheiser.com".extraConfig = '' reverse_proxy localhost:3389 handle_errors 502 503 504 { respond "No active tunnel" diff --git a/dragonwell/services/forge-lines.nix b/dragonwell/forge-lines.nix rename from dragonwell/services/forge-lines.nix rename to dragonwell/forge-lines.nix index 6faec823e772dfce32f9392c55196d6bcd0b673b..3e0345be7229b1c59cd8d56e6215fa0d0deb3a99 100644 --- a/dragonwell/services/forge-lines.nix +++ b/dragonwell/forge-lines.nix @@ -1,6 +1,6 @@ { config, ... }: { - age.secrets.forge-lines.file = ../../secrets/forge-lines.age; + age.secrets.forge-lines.file = ../secrets/forge-lines.age; services.forge-lines = { enable = false; discordTokenFile = config.age.secrets.forge-lines.path; diff --git a/dragonwell/services/foundry.nix b/dragonwell/foundry.nix rename from dragonwell/services/foundry.nix rename to dragonwell/foundry.nix index cafbf6dc9281dd8878f577434a44d2a91e84d758..fce651798f88395091511064d599bc200b9b78f7 100644 --- a/dragonwell/services/foundry.nix +++ b/dragonwell/foundry.nix @@ -1,26 +1,20 @@ -{ - jolheiser, - inputs, - pkgs, - ... -}: +{ inputs, pkgs, ... }: let port = 30000; - host = "dnd.${jolheiser.domain}"; in { services = { foundryvtt = { enable = true; inherit port; - hostName = host; + hostName = "dnd.jolheiser.com"; minifyStaticFiles = true; proxyPort = 443; proxySSL = true; upnp = false; package = inputs.foundry.packages.${pkgs.stdenv.hostPlatform.system}.foundryvtt_14; }; - caddy.virtualHosts."${host}".extraConfig = '' + caddy.virtualHosts."dnd.jolheiser.com".extraConfig = '' reverse_proxy localhost:${builtins.toString port} ''; }; diff --git a/dragonwell/services/git-bug.nix b/dragonwell/git-bug.nix rename from dragonwell/services/git-bug.nix rename to dragonwell/git-bug.nix index d5eb1f476da2d0be0f9817a7fdc498bbd4a86d5e..03021813b6386cf94b1695145150219615a739df 100644 --- a/dragonwell/services/git-bug.nix +++ b/dragonwell/git-bug.nix @@ -1,9 +1,7 @@ -{ lib, ... }: let - enable = false; port = 2847; in -lib.mkIf enable { +{ services = { git-bug.bugs = { enable = false; diff --git a/dragonwell/services/git-pr.nix b/dragonwell/git-pr.nix rename from dragonwell/services/git-pr.nix rename to dragonwell/git-pr.nix index bbe8a374f5e3db430d9f25da437f4d70fd04f508..4f18805427e380469adea6acbec985cde41aea28 100644 --- a/dragonwell/services/git-pr.nix +++ b/dragonwell/git-pr.nix @@ -1,14 +1,12 @@ -{ jolheiser, ... }: let port = 7449; - host = "pr.${jolheiser.domain}"; in { services = { git-pr = { enable = false; openFirewall = true; - url = host; + url = "pr.jolheiser.com"; admins = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXoiWcPkL5kUAqJfMxnPM/ND4qJ4kKShDhXdqnYv2ZB" ]; sshPort = 7448; enableWeb = true; @@ -28,7 +26,7 @@ desc = "Nix flake, package, and module for git-pr"; } ]; }; - caddy.virtualHosts."${host}".extraConfig = '' + caddy.virtualHosts."pr.jolheiser.com".extraConfig = '' reverse_proxy localhost:${builtins.toString port} ''; }; diff --git a/dragonwell/services/go.nix b/dragonwell/services/go.nix deleted file mode 100644 index 18fcc61e67a6fade1c3f58cf777b38b762f24bb7..0000000000000000000000000000000000000000 --- a/dragonwell/services/go.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ jolheiser, ... }: -let - altModules = [ - { - name = "hcaptcha"; - repo = "gitea.com/jolheiser/hcaptcha"; - } - { - name = "pwn"; - repo = "gitea.com/jolheiser/pwn"; - } - ]; - host = "go.${jolheiser.domain}"; - redirects = builtins.concatStringsSep "\n" ( - builtins.map (module: '' - respond /${module.name}* ` - - - - Redirecting to https://pkg.go.dev/${host}/${module.name} - ` - '') altModules - ); -in -{ - services.caddy.virtualHosts."${host}" = { - extraConfig = '' - header Content-Type text/html - ${redirects} - respond /* ` - - - - Redirecting to https://pkg.go.dev/${host}{path} - ` - ''; - }; -} diff --git a/dragonwell/services/gollum.nix b/dragonwell/gollum.nix rename from dragonwell/services/gollum.nix rename to dragonwell/gollum.nix index 9e060cc60cc97f08d51844b18c8b09759a806574..0625aadc724edb60e39f7623c0c1ef044815ce69 100644 --- a/dragonwell/services/gollum.nix +++ b/dragonwell/gollum.nix @@ -1,9 +1,4 @@ -{ - pkgs, - jolheiser, - config, - ... -}: +{ pkgs, config, ... }: let port = 9454; in @@ -19,7 +14,7 @@ branch = "main"; user = "ugit"; group = "ugit"; }; - caddy.virtualHosts."wiki.${jolheiser.domain}".extraConfig = '' + caddy.virtualHosts."wiki.jolheiser.com".extraConfig = '' handle /oauth2/* { reverse_proxy localhost:6227 { header_up X-Real-IP {remote_host} diff --git a/dragonwell/services/horcrux.nix b/dragonwell/horcrux.nix rename from dragonwell/services/horcrux.nix rename to dragonwell/horcrux.nix index de6b52d4a1bdd835c21f95463491f32601fb03e2..5274732d82d122c3aec34991e4fb2f031eccb63b 100644 --- a/dragonwell/services/horcrux.nix +++ b/dragonwell/horcrux.nix @@ -1,7 +1,7 @@ { config, ... }: { age.secrets.horcrux = { - file = ../../secrets/horcrux.age; + file = ../secrets/horcrux.age; owner = "horcrux"; }; services.horcrux = { diff --git a/dragonwell/services/mealie.nix b/dragonwell/mealie.nix rename from dragonwell/services/mealie.nix rename to dragonwell/mealie.nix index b67b2443a03498534f7d1906675c79d1047c748f..d397f55d222a19c4506ad493c4bd6f16f704d508 100644 --- a/dragonwell/services/mealie.nix +++ b/dragonwell/mealie.nix @@ -1,15 +1,9 @@ -{ - pkgs, - jolheiser, - config, - ... -}: +{ pkgs, config, ... }: let port = 3663; - host = "recipes.${jolheiser.domain}"; in { - age.secrets.mealie.file = ../../secrets/mealie.age; + age.secrets.mealie.file = ../secrets/mealie.age; services = { mealie = { enable = true; @@ -24,12 +18,12 @@ ); listenAddress = "localhost"; inherit port; settings = { - BASE_URL = "https://${host}"; + BASE_URL = "https://recipes.jolheiser.com"; ALLOW_PASSWORD_LOGIN = "false"; }; credentialsFile = config.age.secrets.mealie.path; }; - caddy.virtualHosts."${host}".extraConfig = '' + caddy.virtualHosts."recipes.jolheiser.com".extraConfig = '' reverse_proxy localhost:${builtins.toString port} ''; }; diff --git a/dragonwell/services/miniserve.nix b/dragonwell/miniserve.nix rename from dragonwell/services/miniserve.nix rename to dragonwell/miniserve.nix diff --git a/dragonwell/services/mint.nix b/dragonwell/mint.nix rename from dragonwell/services/mint.nix rename to dragonwell/mint.nix index 71db8d12a12fbe19ee6a48f099686e04d71c93ae..679b5ce611e9d53a9d12a2a0084e886557add363 100644 --- a/dragonwell/services/mint.nix +++ b/dragonwell/mint.nix @@ -1,6 +1,5 @@ { inputs, - jolheiser, pkgs, config, ... @@ -9,7 +8,7 @@ let port = 6468; in { - age.secrets.mint.file = ../../secrets/mint.age; + age.secrets.mint.file = ../secrets/mint.age; services = { mint = { enable = true; @@ -19,7 +18,7 @@ MINT_LOG_LEVEL = "INFO"; }; environmentFile = config.age.secrets.mint.path; }; - caddy.virtualHosts."budget.${jolheiser.domain}".extraConfig = '' + caddy.virtualHosts."budget.jolheiser.com".extraConfig = '' handle_path /static/* { root * ${inputs.mint.packages.${pkgs.stdenv.hostPlatform.system}.default}/lib/mint/static/ file_server diff --git a/dragonwell/services/oa2p.nix b/dragonwell/services/oa2p.nix deleted file mode 100644 index bf84920a0853b843cbf0d91714fd4db6d8ae2eeb..0000000000000000000000000000000000000000 --- a/dragonwell/services/oa2p.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ jolheiser, config, ... }: -let - port = 6227; -in -{ - age.secrets.oa2p.file = ../../secrets/oa2p.age; - services = { - oauth2-proxy = { - enable = true; - provider = "oidc"; - httpAddress = "localhost:${builtins.toString port}"; - reverseProxy = true; - cookie = { - secure = true; - domain = "wiki.${jolheiser.domain}"; - }; - email.domains = [ "*" ]; - keyFile = config.age.secrets.oa2p.path; - redirectURL = "https://wiki.${jolheiser.domain}/oauth2/callback"; - oidcIssuerUrl = "https://id.${jolheiser.domain}"; - }; - caddy.virtualHosts."oa2p.${jolheiser.domain}".extraConfig = '' - reverse_proxy localhost:${builtins.toString port} - ''; - }; -} diff --git a/dragonwell/services/pocket-id.nix b/dragonwell/pocket-id.nix rename from dragonwell/services/pocket-id.nix rename to dragonwell/pocket-id.nix index 04f90178059566e2b3edcff835716def6e6364b2..993f938f133e2f00a3d9620852ecd155e40c4bf3 100644 --- a/dragonwell/services/pocket-id.nix +++ b/dragonwell/pocket-id.nix @@ -1,15 +1,14 @@ -{ config, jolheiser, ... }: +{ config, ... }: let port = 2884; - host = "id.${jolheiser.domain}"; in { - age.secrets.pocket-id.file = ../../secrets/pocket-id.age; + age.secrets.pocket-id.file = ../secrets/pocket-id.age; services = { pocket-id = { enable = true; settings = { - APP_URL = "https://${host}"; + APP_URL = "https://id.jolheiser.com"; PORT = port; APP_NAME = "jolheiser ID"; EMAILS_VERIFIED = true; @@ -19,7 +18,7 @@ ANALYTICS_DISABLED = true; }; environmentFile = config.age.secrets.pocket-id.path; }; - caddy.virtualHosts."${host}".extraConfig = '' + caddy.virtualHosts."id.jolheiser.com".extraConfig = '' reverse_proxy localhost:${builtins.toString port} ''; }; diff --git a/dragonwell/services/pubserve.nix b/dragonwell/pubserve.nix rename from dragonwell/services/pubserve.nix rename to dragonwell/pubserve.nix diff --git a/dragonwell/services/restic.nix b/dragonwell/restic.nix rename from dragonwell/services/restic.nix rename to dragonwell/restic.nix index fe861a1f577743645d830ea80077317099e3b5e3..f56bedca5a3d97c1ec635a0120d10bbdf9287608 100644 --- a/dragonwell/services/restic.nix +++ b/dragonwell/restic.nix @@ -1,9 +1,9 @@ { config, ... }: { age.secrets = { - restic-env.file = ../../secrets/restic-env.age; - restic-pass.file = ../../secrets/restic-pass.age; - restic-repo.file = ../../secrets/restic-repo.age; + restic-env.file = ../secrets/restic-env.age; + restic-pass.file = ../secrets/restic-pass.age; + restic-repo.file = ../secrets/restic-repo.age; }; services.restic.backups.dragonwell = { initialize = true; diff --git a/dragonwell/services/soju.nix b/dragonwell/soju.nix rename from dragonwell/services/soju.nix rename to dragonwell/soju.nix index e2cdc04473fe08dd41dc285e3e3c2c14f43dcf38..01f4534190c57cc26a4822da1f6fc62ce862ebd1 100644 --- a/dragonwell/services/soju.nix +++ b/dragonwell/soju.nix @@ -1,14 +1,13 @@ -{ jolheiser, lib, ... }: +{ lib, ... }: let - baseCertPath = "/var/lib/acme/${host}"; + baseCertPath = "/var/lib/acme/irc.jolheiser.com"; port = 7658; - host = "irc.${jolheiser.domain}"; in { security.acme = { acceptTerms = true; email = "irc@jolheiser.com"; - certs."${host}" = { + certs."irc.jolheiser.com" = { listenHTTP = ":${builtins.toString port}"; postRun = "systemctl reload soju"; group = "soju"; @@ -20,7 +19,7 @@ enable = true; tlsCertificate = "${baseCertPath}/fullchain.pem"; tlsCertificateKey = "${baseCertPath}/key.pem"; }; - caddy.virtualHosts."${host}".extraConfig = '' + caddy.virtualHosts."irc.jolheiser.com".extraConfig = '' reverse_proxy localhost:${builtins.toString port} ''; }; diff --git a/dragonwell/services/ugit.nix b/dragonwell/ugit.nix rename from dragonwell/services/ugit.nix rename to dragonwell/ugit.nix index baa2ffdda1b39b446e54193c640f95d6ff6dfb30..c985c6e38fe0d2e9ef06a78e13d7fd144cea74d4 100644 --- a/dragonwell/services/ugit.nix +++ b/dragonwell/ugit.nix @@ -1,8 +1,7 @@ -{ jolheiser, lib, ... }: +{ lib, ... }: let pubPort = 8449; privPort = 8447; - host = "git.${jolheiser.domain}"; opts = let homeDir = "/var/lib/ugit"; @@ -18,15 +17,15 @@ hostKeyFile = "${homeDir}/ugit_ed25519"; user = "ugit"; group = "ugit"; config = { - ssh.clone-url = "ugit@${host}"; + ssh.clone-url = "ugit@git.jolheiser.com"; http = { port = pubPort; - clone-url = "https://${host}"; + clone-url = "https://git.jolheiser.com"; }; log.json = true; profile = { - username = jolheiser.username; - email = "ugit@${jolheiser.domain}"; + username = "jolheiser"; + email = "ugit@jolheiser.com"; links = [ "Github,https://github.com/jolheiser" "Gitea,https://gitea.com/jolheiser" @@ -54,7 +53,7 @@ hostname = "git"; port = privPort; authKey = "tskey-auth-kyuvaLt8pb11CNTRL-admMYrs6UWb5XaCcdWJAWbriZ6JMo7ksK"; # One-time key }; - caddy.virtualHosts."${host}".extraConfig = '' + caddy.virtualHosts."git.jolheiser.com".extraConfig = '' reverse_proxy localhost:${builtins.toString pubPort} ''; }; diff --git a/dragonwell/services/woodpecker.nix b/dragonwell/woodpecker.nix rename from dragonwell/services/woodpecker.nix rename to dragonwell/woodpecker.nix index ab586889423b3467c1f1fd4f8812c31202fbce30..492498d7f1c0525eef4903c1c8eb1dc1b00238fb 100644 --- a/dragonwell/services/woodpecker.nix +++ b/dragonwell/woodpecker.nix @@ -1,6 +1,5 @@ { inputs, - jolheiser, pkgs, config, ... @@ -9,7 +8,7 @@ let port = 2423; in { - age.secrets.woodpecker.file = ../../secrets/woodpecker.age; + age.secrets.woodpecker.file = ../secrets/woodpecker.age; services = { woodpecker-server = { enable = true; @@ -23,8 +22,8 @@ WOODPECKER_ADMIN = "jolheiser"; WOODPECKER_SERVER_ADDR = ":${builtins.toString port}"; GITPECKER_REPOS = "/var/lib/ugit/repos"; - GITPECKER_URL = "https://git.${jolheiser.domain}"; - GITPECKER_PROVIDER = "https://id.${jolheiser.domain}"; + GITPECKER_URL = "https://git.jolheiser.com"; + GITPECKER_PROVIDER = "https://id.jolheiser.com"; GITPECKER_CLIENT_ID = "6975ecea-ce29-48f0-ad8d-323e419f7732"; GITPECKER_REDIRECT = "https://cicd/authorize"; GITPECKER_LOG_FILE = "/var/lib/woodpecker-server/gitpecker.log"; diff --git a/dragonwell/services/zoekt.nix b/dragonwell/zoekt.nix rename from dragonwell/services/zoekt.nix rename to dragonwell/zoekt.nix diff --git a/flake.nix b/flake.nix index 4a508f62b21bb5eabfc921723a98fa7079080d33..73e690b4f8ca32ea4ba1abed71c5b94da029ea52 100644 --- a/flake.nix +++ b/flake.nix @@ -42,14 +42,13 @@ }@inputs: let system = "x86_64-linux"; pkgs = import inputs.nixpkgs { inherit system; }; - jolheiser = import ./config.nix { inherit pkgs; }; in { colmena = { meta = { nixpkgs = import nixpkgs { inherit system; }; specialArgs = { - inherit jolheiser inputs; + inherit inputs; }; }; dragonwell.imports = [