diff --git a/hosts/frikandel/configuration.nix b/hosts/frikandel/configuration.nix index 5c65945..b3a25a9 100644 --- a/hosts/frikandel/configuration.nix +++ b/hosts/frikandel/configuration.nix @@ -30,6 +30,7 @@ in { }; boot.supportedFilesystems = [ "zfs" ]; + boot.kernelPackages = pkgs.linuxPackages_6_1; # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you diff --git a/hosts/frikandel/website.nix b/hosts/frikandel/website.nix index a825525..599dc4a 100644 --- a/hosts/frikandel/website.nix +++ b/hosts/frikandel/website.nix @@ -2,27 +2,7 @@ pkgs, lib, ... -}: let - bbeu = pkgs.stdenv.mkDerivation { - name = "benjaminbaedorf.eu"; - src = pkgs.fetchgit { - url = "https://git.pub.solar/b12f/benjaminbaedorf.eu.git"; - rev = "618c7f643f63752340a96a8caca40dac43e545da"; - hash = "sha256-u8dCKHitZgJJpDOlD5vzAxIVET6/1rKy3T9EoodMIGU="; - sparseCheckout = [ - "fonts" - "cows.jpg" - "fonts.css" - "index.html" - "public-pgp-benjamin-baedorf.asc" - ]; - }; - installPhase = '' - mkdir -p $out - cp -r * $out/ - ''; - }; -in { +}: { security.acme.certs = { "benjaminbaedorf.eu" = {}; "b12f.io" = {}; @@ -40,7 +20,7 @@ in { useACMEHost = "b12f.io"; locations."/" = { - root = bbeu; + root = pkgs.b12f-io; index = "index.html"; tryFiles = "$uri $uri/ =404"; }; diff --git a/overlays/default.nix b/overlays/default.nix index 314baa1..ef31c0e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -11,8 +11,6 @@ unstable = import inputs.nixpkgs-unstable { system = prev.system; }; master = import inputs.nixpkgs-master { system = prev.system; }; in { - nixd = unstable.nixd; - factorio-headless = master.factorio-headless; paperless-ngx = master.paperless-ngx; waybar = master.waybar; @@ -35,11 +33,24 @@ vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;}; }) + (import ../pkgs) (import ./blesh.nix) (import ./rnix-lsp.nix) (import ./neovim-plugins.nix) (import ./element-desktop.nix) + + (final: prev: { + b12f-io = prev.stdenv.mkDerivation { + name = "b12f.io"; + inherit (prev.sources.b12f-io-nvfetcher) version src; + installPhase = '' + mkdir -p $out + cp -r * $out/ + cp -r fonts cows.jpg fonts.css index.html bbeu-public.key $out/ + ''; + }; + }) ]; }); }; diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json new file mode 100644 index 0000000..98094ad --- /dev/null +++ b/pkgs/_sources/generated.json @@ -0,0 +1,181 @@ +{ + "b12f-io-nvfetcher": { + "cargoLocks": null, + "date": "2024-02-03", + "extract": null, + "name": "b12f-io-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "38adb94ce69d8807ea2e36f57abe08091192b31c", + "sha256": "sha256-Dqd23a8yQ6YEohLekqqbS05AMqMrH6Mjop8SqJzUvzg=", + "type": "git", + "url": "https://git.pub.solar/b12f/benjaminbaedorf.eu.git" + }, + "version": "38adb94ce69d8807ea2e36f57abe08091192b31c" + }, + "blesh-nvfetcher": { + "cargoLocks": null, + "date": "2024-02-01", + "extract": null, + "name": "blesh-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": true, + "leaveDotGit": true, + "name": null, + "owner": "akinomyoga", + "repo": "ble.sh", + "rev": "838b465269f5aff81c67933f7692d97bf0be5ada", + "sha256": "sha256-UGplHXxZf7Hr3pr6p5YWlLaskhMoq2QuZqGVXJN1Qck=", + "type": "github" + }, + "version": "838b465269f5aff81c67933f7692d97bf0be5ada" + }, + "instant-nvim-nvfetcher": { + "cargoLocks": null, + "date": "2022-06-25", + "extract": null, + "name": "instant-nvim-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "jbyuki", + "repo": "instant.nvim", + "rev": "294b6d08143b3db8f9db7f606829270149e1a786", + "sha256": "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=", + "type": "github" + }, + "version": "294b6d08143b3db8f9db7f606829270149e1a786" + }, + "rnix-lsp-nvfetcher": { + "cargoLocks": null, + "date": "2022-11-27", + "extract": null, + "name": "rnix-lsp-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "nix-community", + "repo": "rnix-lsp", + "rev": "95d40673fe43642e2e1144341e86d0036abd95d9", + "sha256": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=", + "type": "github" + }, + "version": "95d40673fe43642e2e1144341e86d0036abd95d9" + }, + "vim-apprentice-nvfetcher": { + "cargoLocks": null, + "date": "2023-02-15", + "extract": null, + "name": "vim-apprentice-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "romainl", + "repo": "Apprentice", + "rev": "59ad13661fa15edaf72c62218903c7817b5a3691", + "sha256": "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=", + "type": "github" + }, + "version": "59ad13661fa15edaf72c62218903c7817b5a3691" + }, + "vim-beautify-nvfetcher": { + "cargoLocks": null, + "date": "2018-12-27", + "extract": null, + "name": "vim-beautify-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "zeekay", + "repo": "vim-beautify", + "rev": "e0691483927dc5a0c051433602397419f9628623", + "sha256": "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=", + "type": "github" + }, + "version": "e0691483927dc5a0c051433602397419f9628623" + }, + "vim-caddyfile-nvfetcher": { + "cargoLocks": null, + "date": "2022-05-09", + "extract": null, + "name": "vim-caddyfile-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "isobit", + "repo": "vim-caddyfile", + "rev": "24fe0720551883e407cb70ae1d7c03f162d1d5a0", + "sha256": "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=", + "type": "github" + }, + "version": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" + }, + "vim-workspace-nvfetcher": { + "cargoLocks": null, + "date": "2023-05-28", + "extract": null, + "name": "vim-workspace-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "thaerkh", + "repo": "vim-workspace", + "rev": "c0d1e4332a378f58bfdf363b4957168fa78e79b4", + "sha256": "sha256-2Brx098dk5THiieBiW71FG9mUUwS1CSY9mpOPWA/Tq4=", + "type": "github" + }, + "version": "c0d1e4332a378f58bfdf363b4957168fa78e79b4" + }, + "vimagit-nvfetcher": { + "cargoLocks": null, + "date": "2024-01-04", + "extract": null, + "name": "vimagit-nvfetcher", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "jreybert", + "repo": "vimagit", + "rev": "06afe48439d0118a77d622ef06eff0f7cd7d62ab", + "sha256": "sha256-2kugFr32lZINgpmDyfTyBp5lNa2/dculKmcFGa2q/io=", + "type": "github" + }, + "version": "06afe48439d0118a77d622ef06eff0f7cd7d62ab" + } +} \ No newline at end of file diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 007aae7..7d052c7 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -1,19 +1,32 @@ # This file was generated by nvfetcher, please do not modify it manually. { fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { + b12f-io-nvfetcher = { + pname = "b12f-io-nvfetcher"; + version = "38adb94ce69d8807ea2e36f57abe08091192b31c"; + src = fetchgit { + url = "https://git.pub.solar/b12f/benjaminbaedorf.eu.git"; + rev = "38adb94ce69d8807ea2e36f57abe08091192b31c"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sha256 = "sha256-Dqd23a8yQ6YEohLekqqbS05AMqMrH6Mjop8SqJzUvzg="; + }; + date = "2024-02-03"; + }; blesh-nvfetcher = { pname = "blesh-nvfetcher"; - version = "d1a1d538e15adb04cc30e421f3ac094589c0a2f5"; + version = "838b465269f5aff81c67933f7692d97bf0be5ada"; src = fetchFromGitHub { owner = "akinomyoga"; repo = "ble.sh"; - rev = "d1a1d538e15adb04cc30e421f3ac094589c0a2f5"; + rev = "838b465269f5aff81c67933f7692d97bf0be5ada"; fetchSubmodules = true; deepClone = false; leaveDotGit = true; - sha256 = "sha256-Pvnk/JnewbczdrUHpvDgJaIjVm/8FcDpUGfRGfnBDIE="; + sha256 = "sha256-UGplHXxZf7Hr3pr6p5YWlLaskhMoq2QuZqGVXJN1Qck="; }; - date = "2023-12-13"; + date = "2024-02-01"; }; instant-nvim-nvfetcher = { pname = "instant-nvim-nvfetcher"; @@ -89,14 +102,14 @@ }; vimagit-nvfetcher = { pname = "vimagit-nvfetcher"; - version = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4"; + version = "06afe48439d0118a77d622ef06eff0f7cd7d62ab"; src = fetchFromGitHub { owner = "jreybert"; repo = "vimagit"; - rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4"; + rev = "06afe48439d0118a77d622ef06eff0f7cd7d62ab"; fetchSubmodules = false; - sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0="; + sha256 = "sha256-2kugFr32lZINgpmDyfTyBp5lNa2/dculKmcFGa2q/io="; }; - date = "2022-07-03"; + date = "2024-01-04"; }; } diff --git a/pkgs/sources.toml b/pkgs/sources.toml index c5460fd..1be764d 100644 --- a/pkgs/sources.toml +++ b/pkgs/sources.toml @@ -32,3 +32,8 @@ src.git = "https://github.com/akinomyoga/ble.sh" fetch.github = "akinomyoga/ble.sh" git.fetchSubmodules = true git.leaveDotGit = true + +[b12f-io-nvfetcher] +src.git = "https://git.pub.solar/b12f/benjaminbaedorf.eu.git" +fetch.git = "https://git.pub.solar/b12f/benjaminbaedorf.eu.git" +