darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2023-09-08 12:39:34 +01:00
parent 610a3b43c0
commit 90c350b5ed
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
17 changed files with 70 additions and 436 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/desktop.nix
View file

@ -33,7 +33,7 @@ in {
serif = ["Noto Serif" "Font Awesome 5 Free"];
};
};
fonts = with pkgs; [
packages = with pkgs; [
fira-code
fira-code-symbols
font-awesome

2
config/home-manager/base.nix
View file

@ -96,7 +96,7 @@ desktop: {pkgs, ...}: {
);
};
programs.exa = {
programs.eza = {
enable = true;
enableAliases = true;
};

4
config/home-manager/darkkirb.nix
View file

@ -15,17 +15,13 @@
../programs/firefox.nix
../programs/ims.nix
../programs/syncthing.nix
../programs/mpd.nix
../programs/zoom.nix
../programs/plover.nix
(import ../games/default.nix args)
../programs/yubikey.nix
../programs/keybase.nix
../programs/keepass.nix
../programs/kicad.nix
../programs/vscode
../programs/misc.nix
../programs/kitty.nix
../programs/zk.nix
../programs/fcitx.nix
../programs/gpg.nix

2
config/programs/vim/modules/lsp/misc.nix
View file

@ -16,8 +16,6 @@
nodePackages.typescript
nodePackages.typescript-language-server
nodePackages.vim-language-server
haskell-language-server
ltex-ls
marksman
];

3
config/programs/vim/modules/lsp/tex.nix
View file

@ -7,7 +7,4 @@
if config.isDesktop
then with pkgs.vimPlugins; [vimtex]
else [];
lspconfigPath = with pkgs; [
texlive.combined.scheme-medium
];
}

4
config/programs/vim/modules/ux/tree.nix
View file

@ -21,10 +21,6 @@
number = false;
relativenumber = false;
signcolumn = "yes";
mappings = {
custom_only = false;
list = [];
};
};
renderer = {
indent_markers = {

257
config/programs/vscode/default.nix
View file

@ -28,263 +28,6 @@ in {
programs.vscode = {
enable = true;
enableUpdateCheck = false;
userSettings = {
"workbench.iconTheme" = "material-icon-theme";
"cmake.configureOnOpen" = true;
"[c]" = {
"editor.defaultFormatter" = "xaver.clang-format";
};
"[cpp]" = {
"editor.defaultFormatter" = "xaver.clang-format";
};
"editor.suggestSelection" = "first";
"vsintellicode.modify.editor.suggestSelection" = "automaticallyOverrodeDefaultValue";
"[rust]" = {
"editor.defaultFormatter" = "statiolake.vscode-rustfmt";
};
"git.enableSmartCommit" = true;
"workbench.editorAssociations" = {
"*.ipynb" = "jupyter.notebook.ipynb";
};
"editor.inlineSuggest.enabled" = true;
"files.exclude" = {
"**/.classpath" = true;
"**/.project" = true;
"**/.settings" = true;
"**/.factorypath" = true;
};
"latex-workshop.view.pdf.viewer" = "tab";
"latex-workshop.latex.tools" = [
{
"name" = "latexmk";
"command" = "${pkgs.texlive.combined.scheme-full}/bin/latexmk";
"args" = [
"-synctex=1"
"-interaction=nonstopmode"
"-file-line-error"
"-xelatex"
"-shell-escape"
"-outdir=%OUTDIR%"
"%DOC%"
];
"env" = {};
}
{
"name" = "lualatexmk";
"command" = "${pkgs.texlive.combined.scheme-full}/bin/latexmk";
"args" = [
"-synctex=1"
"-interaction=nonstopmode"
"-file-line-error"
"-lualatex"
"-outdir=%OUTDIR%"
"%DOC%"
];
"env" = {};
}
{
"name" = "latexmk_rconly";
"command" = "${pkgs.texlive.combined.scheme-full}/bin/latexmk";
"args" = ["%DOC%"];
"env" = {};
}
{
"name" = "pdflatex";
"command" = "${pkgs.texlive.combined.scheme-full}/bin/pdflatex";
"args" = [
"-synctex=1"
"-interaction=nonstopmode"
"-file-line-error"
"%DOC%"
];
"env" = {};
}
{
"name" = "bibtex";
"command" = "${pkgs.texlive.combined.scheme-full}/bin/bibtex";
"args" = ["%DOCFILE%"];
"env" = {};
}
];
"security.workspace.trust.untrustedFiles" = "open";
"latex-workshop.message.update.show" = false;
"editor.codeLensFontFamily" = "\"FiraCode Nerd Font Mono\", \"Noto Sans Mono CJK JP\", monospace";
"editor.fontFamily" = "\"FiraCode Nerd Font Mono\", \"Noto Sans Mono CJK JP\", monospace";
"rust-analyzer.checkOnSave.command" = "clippy";
"ledger.binary" = "${pkgs.hledger}/bin/hledger";
"workbench.colorTheme" = "Catppuccin Mocha";
"window.titleBarStyle" = "custom";
"rust-analyzer.hoverActions.references" = true;
"rust-analyzer.lens.methodReferences" = true;
"rust-analyzer.workspace.symbol.search.scope" = "workspace_and_dependencies";
"rust-analyzer.workspace.symbol.search.kind" = "all_symbols";
"rust-analyzer.lens.references" = true;
"rust-analyzer.lens.enumVariantReferences" = true;
"editor.bracketPairColorization.enabled" = true;
"C_Cpp.experimentalFeatures" = "Enabled";
"C_Cpp.dimInactiveRegions" = false;
"git.confirmSync" = false;
"files.watcherExclude" = {
"**/.bloop" = true;
"**/.metals" = true;
"**/.ammonite" = true;
};
"editor.formatOnSave" = true;
"rust-analyzer.checkOnSave.extraArgs" = [
"--"
"-Wabsolute_paths_not_starting_with_crate"
"-Welided_lifetimes_in_paths"
"-Wexplicit_outlives_requirements"
"-Wkeyword_idents"
"-Wmacro_use_extern_crate"
"-Wmeta_variable_misuse"
"-Wmissing_abi"
"-Wmissing_copy_implementations"
"-Wmissing_debug_implementations"
"-Wmissing_docs"
"-Wnon_ascii_idents"
"-Wnoop_method_call"
"-Wpointer_structural_match"
"-Wsingle_use_lifetimes"
"-Wtrivial_casts"
"-Wtrivial_numeric_casts"
"-Wunreachable_pub"
"-Wunused_extern_crates"
"-Wunused_import_braces"
"-Wunused_lifetimes"
"-Wunused_qualifications"
"-Wvariant_size_differences"
"-Wclippy::pedantic"
"-Wclippy::nursery"
"-Wclippy::all"
];
"github.copilot.enable" = {
"*" = true;
"yaml" = true;
"plaintext" = true;
"markdown" = true;
};
"rust-analyzer.cargo.allFeatures" = true;
"rust-analyzer.cargo.unsetTest" = [];
"redhat.telemetry.enabled" = false;
"openapi.approvedHostnames" = ["raw.githubusercontent.com"];
"liveServer.settings.donotShowInfoMsg" = true;
"[typescript]" = {
"editor.defaultFormatter" = "vscode.typescript-language-features";
};
"[javascript]" = {
"editor.defaultFormatter" = "vscode.typescript-language-features";
};
"go.toolsManagement.autoUpdate" = true;
"nix.serverPath" = "${pkgs.rnix-lsp}/bin/rnix-lsp";
"python.analysis.typeCheckingMode" = "strict";
"tabnine.experimentalAutoImports" = true;
"editor.autoClosingBrackets" = "always";
"editor.autoClosingDelete" = "always";
"editor.autoClosingOvertype" = "always";
"editor.autoClosingQuotes" = "always";
"editor.definitionLinkOpensInPeek" = true;
"editor.experimental.pasteActions.enabled" = true;
"editor.foldingImportsByDefault" = true;
"editor.linkedEditing" = true;
"editor.renderWhitespace" = "boundary";
"editor.rulers" = [72 80 100 120];
"editor.smoothScrolling" = true;
"editor.stickyTabStops" = true;
"editor.stickyScroll.enabled" = true;
"editor.tabCompletion" = "on";
"editor.unicodeHighlight.ambiguousCharacters" = false;
"editor.wordWrapColumn" = 120;
"editor.cursorSmoothCaretAnimation" = "on";
"editor.cursorSurroundingLines" = 5;
"editor.find.autoFindInSelection" = "multiline";
"editor.fontLigatures" = true;
"editor.formatOnPaste" = true;
"editor.formatOnType" = true;
"diffEditor.codeLens" = true;
"diffEditor.diffAlgorithm" = "experimental";
"editor.minimap.renderCharacters" = false;
"editor.suggest.preview" = true;
"editor.suggest.shareSuggestSelections" = true;
"files.enableTrash" = false;
"files.eol" = "\n";
"files.insertFinalNewline" = true;
"files.trimFinalNewlines" = true;
"files.trimTrailingWhitespace" = true;
"workbench.experimental.editSessions.partialMatches.enabled" = true;
"workbench.experimental.settingsProfiles.enabled" = true;
"workbench.list.smoothScrolling" = true;
"workbench.startupEditor" = "none";
"workbench.editor.closeOnFileDelete" = true;
"explorer.excludeGitIgnore" = true;
"explorer.fileNesting.enabled" = true;
"explorer.fileNesting.patterns" = {
"Cargo.toml" = "Cargo.*";
"flake.nix" = "flake.lock";
"*.ts" = "\${capture}.js, \${capture}.d.ts";
"*.js" = "\${capture}.js.map, \${capture}.min.js, \${capture}.d.ts";
"*.jsx" = "\${capture}.js";
"*.tsx" = "\${capture}.ts";
"tsconfig.json" = "tsconfig.*.json";
"package.json" = "package-lock.json, .npmrc, yarn.lock, .yarnrc";
};
"search.quickOpen.includeSymbols" = true;
"search.smartCase" = true;
"search.showLineNumbers" = true;
"search.seedOnFocus" = true;
"search.seedWithNearestWord" = true;
"search.useGlobalIgnoreFiles" = true;
"search.useParentIgnoreFiles" = true;
"debug.allowBreakpointsEverywhere" = true;
"debug.autoExpandLazyVariables" = true;
"testing.alwaysRevealTestOnStateChange" = true;
"scm.alwaysShowActions" = true;
"scm.alwaysShowRepositories" = true;
"telemetry.telemetryLevel" = "off";
"better-comments.highlightPlainText" = true;
"C_Cpp.inlayHints.autoDeclarationTypes.enabled" = true;
"C_Cpp.inlayHints.autoDeclarationTypes.showOnLeft" = true;
"C_Cpp.inlayHints.parameterNames.enabled" = true;
"C_Cpp.inlayHints.referenceOperator.enabled" = true;
"C_Cpp.inlayHints.referenceOperator.showSpace" = true;
"csharp.inlayHints.parameters.enabled" = true;
"csharp.inlayHints.parameters.forIndexerParameters" = true;
"csharp.inlayHints.parameters.forLiteralParameters" = true;
"csharp.inlayHints.parameters.forObjectCreationParameters" = true;
"csharp.inlayHints.parameters.forOtherParameters" = true;
"csharp.inlayHints.parameters.suppressForParametersThatDifferOnlyBySuffix" = true;
"csharp.inlayHints.parameters.suppressForParametersThatMatchArgumentName" = true;
"csharp.inlayHints.parameters.suppressForParametersThatMatchMethodIntent" = true;
"csharp.inlayHints.types.enabled" = true;
"csharp.inlayHints.types.forImplicitObjectCreation" = true;
"csharp.inlayHints.types.forImplicitVariableTypes" = true;
"csharp.inlayHints.types.forLambdaParameterTypes" = true;
"cSpell.language" = "en,en-GB";
"conventionalCommits.emojiFormat" = "emoji";
"conventionalCommits.showEditor" = true;
"git.allowForcePush" = true;
"git.autofetch" = "all";
"git.autofetchPeriod" = 60;
"github.gitProtocol" = "ssh";
"gitlens.showWelcomeOnInstall" = false;
"gitlens.defaultGravatarsStyle" = "monsterid";
"vsintellicode.features.python.deepLearning" = "enabled";
"merge-conflict.autoNavigateNextConflict.enabled" = true;
"projectManager.git.baseFolders" = ["/home/darkkirb/sources"];
"projectManager.hg.maxDepthRecursion" = 1;
"rust-analyzer.assist.emitMustUse" = true;
"rust-analyzer.diagnostics.experimental.enable" = true;
"rust-analyzer.lens.references.enumVariant.enable" = true;
"rust-analyzer.lens.references.method.enable" = true;
"rust-analyzer.lens.references.trait.enable" = true;
"rust-analyzer.lens.references.adt.enable" = true;
"editor.accessibilitySupport" = "off";
"[jsonc]" = {
"editor.defaultFormatter" = "esbenp.prettier-vscode";
};
"nix.formatterPath" = "${pkgs.alejandra}/bin/alejandra";
"nix.enableLanguageServer" = true;
};
extensions = with x86_64-linux-pkgs.vscode-extensions; [
];
};

2
config/programs/zsh.nix
View file

@ -4,7 +4,7 @@ desktop: _: {
enable = true;
enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
syntaxHighlighting.enable = true;
enableVteIntegration = desktop;
autocd = true;
};

7
config/services/dovecot.nix
View file

@ -7,9 +7,12 @@
in {
nixpkgs.overlays = [
(curr: prev: {
dovecot = prev.dovecot.override {
dovecot = (prev.dovecot.override {
withPgSQL = true;
};
}).overrideAttrs (super: {
doCheck = false;
doInstallCheck = false;
});
})
];
services.dovecot2 = {

1
config/services/matrix-media-repo.nix
View file

@ -39,6 +39,7 @@
ssl = true;
bucketName = "matrix-chir-rs";
region = "us-west-000";
useMD5 = true;
};
}
];

3
config/services/named-submissive.nix
View file

@ -2,7 +2,6 @@
pkgs,
config,
dns,
hosts-list,
...
}: let
mkZone = name: {
@ -17,7 +16,6 @@ in {
"darkkirb.de" = mkZone "darkkirb.de";
"chir.rs" = mkZone "chir.rs";
"int.chir.rs" = mkZone "int.chir.rs";
"rpz.int.chir.rs" = mkZone "rpz.int.chir.rs";
"shitallover.me" = mkZone "shitallover.me";
};
extraConfig = ''
@ -35,7 +33,6 @@ in {
recursion yes;
dnssec-validation yes;
allow-notify { 130.162.60.127; 2a01:4f8:1c17:d953:b4e1:8ff:e658:6f49; 138.201.155.128; 2a01:4f8:1c17:d953:b4e1:8ff:e658:6f49; fd0d:a262:1fa6:e621:b4e1:8ff:e658:6f49; 100.119.226.33; fd7a:115c:a1e0:ab12:4843:cd96:6277:e221; };
response-policy {zone "rpz.int.chir.rs";};
'';
};
networking.firewall.allowedTCPPorts = [53];

8
config/services/named.nix
View file

@ -2,13 +2,11 @@
pkgs,
config,
dns,
hosts-list,
...
}: let
darkkirb-de = import ../../zones/darkkirb.de.nix {inherit dns;};
chir-rs = import ../../zones/chir.rs.nix {inherit dns;};
int-chir-rs = import ../../zones/int.chir.rs.nix {inherit dns;};
rpz-int-chir-rs = import ../../zones/rpz.int.chir.rs.nix {inherit pkgs hosts-list;};
signzone = import ../../zones/signzone.nix;
shitallover-me = import ../../zones/shitallover.me.nix {inherit dns;};
in {
@ -106,12 +104,6 @@ in {
};
'';
};
"rpz.int.chir.rs" = {
master = true;
file = "${rpz-int-chir-rs}";
slaves = ["fd7a:115c:a1e0:ab12:4843:cd96:6263:ad6b" "100.99.173.107"];
extraConfig = "also-notify {fd7a:115c:a1e0:ab12:4843:cd96:6263:ad6b; 100.99.173.107;};";
};
};
extraConfig = ''
statistics-channels {

15
config/services/wordpress.nix
View file

@ -32,17 +32,15 @@
webmention
activitypub
friends
hum
webfinger
nodeinfo
classic-editor
wordpress-seo
ilab-media-tools
webp-express
jetpack
modern-footnotes
polylang
the-plus-addons-for-block-editor
shortcoder
wp-dark-mode
wp-super-cache
;
};
themes = {
@ -52,6 +50,13 @@
twentytwentythree
;
};
poolConfig = {
pm = "dynamic";
"pm.max_children" = 460;
"pm.start_servers" = 4;
"pm.min_spare_servers" = 4;
"pm.max_spare_servers" = 64;
};
};
nixpkgs.overlays = [

126
flake.lock
View file

@ -13,18 +13,18 @@
"flake-utils"
],
"nixpkgs": [
"nixpkgs-for-crane"
"nixpkgs"
],
"rust-overlay": [
"rust-overlay"
]
},
"locked": {
"lastModified": 1693576513,
"narHash": "sha256-a8WFN9TWzF5PzQ3wfsRDPDCouHKMh1ykkHNJP9IxiHA=",
"lastModified": 1694160842,
"narHash": "sha256-KqzSSagAay+qBhXlDGHc05dpio9PZ/ZFVmQcuJum/qU=",
"owner": "DarkKirb",
"repo": "attic",
"rev": "915757f4fde58d1ea041540c6b0b45bb119d1036",
"rev": "9460d742caf366a1f999936dacd4d6e9274d956b",
"type": "github"
},
"original": {
@ -223,7 +223,7 @@
"flake-utils"
],
"nixpkgs": [
"nixpkgs-for-crane"
"nixpkgs"
],
"rust-overlay": [
"rust-overlay"
@ -426,11 +426,11 @@
"unionmount": "unionmount"
},
"locked": {
"lastModified": 1693505022,
"narHash": "sha256-bKHIyO6HDGU9RxvyDujMHcnDG+KJFHYhmdMOJiZ/a08=",
"lastModified": 1693677969,
"narHash": "sha256-kpq5rKxw6AxDAk0Cw11OJnkFxNPvVIyc0XGvK2OXlBY=",
"owner": "EmaApps",
"repo": "emanote",
"rev": "5f4fe23de7947af3666ac3d4ea422031f43b4607",
"rev": "5623bb3814e382dfea7ffd21d3da25c2d3179001",
"type": "github"
},
"original": {
@ -608,11 +608,11 @@
]
},
"locked": {
"lastModified": 1690933134,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
"lastModified": 1693611461,
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"type": "github"
},
"original": {
@ -644,11 +644,11 @@
},
"flake-root": {
"locked": {
"lastModified": 1680964220,
"narHash": "sha256-dIdTYcf+KW9a4pKHsEbddvLVSfR1yiAJynzg2x0nfWg=",
"lastModified": 1692742795,
"narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
"owner": "srid",
"repo": "flake-root",
"rev": "f1c0b93d05bdbea6c011136ba1a135c80c5b326c",
"rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
"type": "github"
},
"original": {
@ -674,11 +674,11 @@
},
"flake-schemas": {
"locked": {
"lastModified": 1693491534,
"narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=",
"lastModified": 1693615523,
"narHash": "sha256-LeyH24etXCxNJviWptyLy2DPT9xt+oOs/zE66To1iPY=",
"owner": "DeterminateSystems",
"repo": "flake-schemas",
"rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279",
"rev": "8940e872c4f8c7cd7d0a1ec169fa0a24697b1f1c",
"type": "github"
},
"original": {
@ -786,11 +786,11 @@
},
"haskell-flake": {
"locked": {
"lastModified": 1692741689,
"narHash": "sha256-CbNpheNJMTM9Wz5iTzdXmMtvfH9KvH/jNfv6N9roaqs=",
"lastModified": 1693786046,
"narHash": "sha256-+s6Ss5AJBXQg1yT3CUFFz6PMfKqvzvLsS9+J5SGrWUg=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "c8622c8a259e18e0a1919462ce885380108a723c",
"rev": "201721efe661961bda4af980cee8b47fa54e7665",
"type": "github"
},
"original": {
@ -837,11 +837,11 @@
]
},
"locked": {
"lastModified": 1693399033,
"narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=",
"lastModified": 1694134858,
"narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10",
"rev": "19c6a4081b14443420358262f8416149bd79561a",
"type": "github"
},
"original": {
@ -872,22 +872,6 @@
}
},
"hosts-list": {
"flake": false,
"locked": {
"lastModified": 1693313884,
"narHash": "sha256-5dpMXdScvexhmzr6i0kA5APIApQOOxaalQEbIrovhWg=",
"owner": "StevenBlack",
"repo": "hosts",
"rev": "85cc9dff95af18be0b715ef5e8db3104a19bb2c3",
"type": "github"
},
"original": {
"owner": "StevenBlack",
"repo": "hosts",
"type": "github"
}
},
"hosts-list_2": {
"flake": false,
"locked": {
"lastModified": 1687530518,
@ -1134,11 +1118,11 @@
]
},
"locked": {
"lastModified": 1693555248,
"narHash": "sha256-120l2RuBwLseE4oGw85IhzRgpA8DuaoLqeF1BUeJU/8=",
"lastModified": 1694255439,
"narHash": "sha256-8rbfguzo1ZZqH68x1FDwWkFXgWkeXJGsYpZ1km6SKf0=",
"ref": "main",
"rev": "a2856e63712ff4b4c180cacbd1d57d129dada561",
"revCount": 990,
"rev": "a31d65ab2cfa2aac903db847cf168994b756093a",
"revCount": 1006,
"type": "git",
"url": "https://git.chir.rs/darkkirb/nix-packages.git"
},
@ -1216,7 +1200,7 @@
"flake-utils": "flake-utils_3",
"haskell-flake": "haskell-flake_2",
"home-manager": "home-manager_2",
"hosts-list": "hosts-list_2",
"hosts-list": "hosts-list",
"naersk": "naersk",
"nix-neovim": "nix-neovim_2",
"nix-packages": "nix-packages_2",
@ -1263,11 +1247,11 @@
},
"nixos-hardware_2": {
"locked": {
"lastModified": 1692952286,
"narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
"lastModified": 1693718952,
"narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
"rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35",
"type": "github"
},
"original": {
@ -1308,22 +1292,6 @@
"type": "github"
}
},
"nixpkgs-for-crane_2": {
"locked": {
"lastModified": 1673681449,
"narHash": "sha256-0Sd00uFoVsO7xgd15FZst7wlw6Wvt7rJ7y7Q5BWKMgA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ae365afb80773c3bb67e52294a82e329a9e5be0",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ae365afb80773c3bb67e52294a82e329a9e5be0",
"type": "github"
}
},
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
@ -1389,11 +1357,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1693553268,
"narHash": "sha256-WLeTs7XzqRKCR8kAkiMAHJG0Ftvn2fsAMCPvkZ9oWAk=",
"lastModified": 1694170870,
"narHash": "sha256-Ah/gHWAWpRvJo548STc2ITGH19c20yyOetaq5F37nd8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0edab9b485884d6e287e76f303f4201992ea3ff5",
"rev": "e39aa8f4c6b01ff776fb2aa5721e7823493e5d6e",
"type": "github"
},
"original": {
@ -1419,11 +1387,11 @@
},
"nur_2": {
"locked": {
"lastModified": 1693555295,
"narHash": "sha256-wmMYa7Wki1V53nkH50bUD9mmg5OMjgXG18BVadS1sgQ=",
"lastModified": 1694166358,
"narHash": "sha256-ePuCkwXgEIb7BbpjiEDQ49UVJDaT3G40qytcOOhiC3U=",
"owner": "nix-community",
"repo": "NUR",
"rev": "92cc0ab078f0d82002caefbb9a8f38d198d03763",
"rev": "fb92b60e2b104df0f963e146399f5303770dee01",
"type": "github"
},
"original": {
@ -1443,13 +1411,11 @@
"flake-utils": "flake-utils_2",
"haskell-flake": "haskell-flake",
"home-manager": "home-manager",
"hosts-list": "hosts-list",
"nix-neovim": "nix-neovim",
"nix-packages": "nix-packages",
"nixos-config-for-netboot": "nixos-config-for-netboot",
"nixos-hardware": "nixos-hardware_2",
"nixpkgs": "nixpkgs_4",
"nixpkgs-for-crane": "nixpkgs-for-crane_2",
"nur": "nur_2",
"rust-overlay": "rust-overlay_2",
"sops-nix": "sops-nix_2"
@ -1490,11 +1456,11 @@
]
},
"locked": {
"lastModified": 1693534421,
"narHash": "sha256-R/P7Qk47FnwK6TjBxlMILHXRLdywCymBUI5AbI+jWHk=",
"lastModified": 1694139063,
"narHash": "sha256-M2dhhe6IzHmS0zQkmnzbcG98jEQGZ4UcS3VcT+rG/Do=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "dbbe620d0358c9241b9258fda572c9f6c2a790ed",
"rev": "46dbbcaf435b0d22b149684589b9b059f73f4ffc",
"type": "github"
},
"original": {
@ -1538,11 +1504,11 @@
]
},
"locked": {
"lastModified": 1693404499,
"narHash": "sha256-cx/7yvM/AP+o/3wPJmA9W9F+WHemJk5t+Xcr+Qwkqhg=",
"lastModified": 1693898833,
"narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "d9c5dc41c4b1f74c77f0dbffd0f3a4ebde447b7a",
"rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623",
"type": "github"
},
"original": {
@ -1605,11 +1571,11 @@
]
},
"locked": {
"lastModified": 1692972530,
"narHash": "sha256-LG+M7TjlLJ1lx2qbD1yaexvue1VAatpVandtHVEN5Lc=",
"lastModified": 1693468138,
"narHash": "sha256-DddblCahuTW8K0ncPOheTlG3igE8b15LJjafF1PWhOo=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "843e1e1b01ac7c9e858368fffd1692cbbdbe4a0e",
"rev": "6930a5ba0a722385baf273885a03f561dcb1af67",
"type": "github"
},
"original": {

9
flake.nix
View file

@ -9,7 +9,7 @@ rec {
inputs.cargo2nix.follows = "cargo2nix";
inputs.crane.follows = "crane";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs-for-crane";
inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
};
cargo2nix = {
@ -20,7 +20,7 @@ rec {
crane = {
url = "github:DarkKirb/crane";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs-for-crane";
inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
};
dns = {
@ -44,10 +44,6 @@ rec {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
hosts-list = {
url = "github:StevenBlack/hosts";
flake = false;
};
nix-neovim = {
url = "github:syberant/nix-neovim";
inputs.nixpkgs.follows = "nixpkgs";
@ -63,7 +59,6 @@ rec {
};
nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs.url = "github:NixOS/nixpkgs";
nixpkgs-for-crane.url = "github:NixOS/nixpkgs/3ae365afb80773c3bb67e52294a82e329a9e5be0";
nur.url = "github:nix-community/NUR";
rust-overlay = {
url = "github:oxalica/rust-overlay";

5
zones/chir.rs.nix
View file

@ -144,7 +144,7 @@ with dns.lib.combinators; let
SOA = {
nameServer = "ns1.chir.rs.";
adminEmail = "lotte@chir.rs";
serial = 37;
serial = 38;
};
NS = [
"ns1.chir.rs."
@ -241,7 +241,8 @@ with dns.lib.combinators; let
mediaproxy.CNAME = ["mediaproxy-chir-rs.b-cdn.net."];
attic = createFullZone {};
cloud = createZone oracleBase;
lotte = createZone {};
lotte.CNAME = ["lotte-chir-rs.b-cdn.net."];
lotte-nocdn = createZone {};
ipfs-nocdn = createZone oracleBase;
ipfs.CNAME = ["ipfs-chir-rs.b-cdn.net."];
status = createZone oracleBase;

56
zones/rpz.int.chir.rs.nix
View file

@ -1,56 +0,0 @@
{
pkgs,
hosts-list,
...
}: let
hostfiles-lists = [
{
name = "Unified-fakenews-gambling";
path = "${hosts-list}/alternates/fakenews-gambling/hosts";
}
];
hostfile-to-hostname-list = hostfile: {
name = "${hostfile.name}-hostnames";
path = pkgs.runCommand "${hostfile.name}-hostnames" {} ''
cp ${hostfile.path} $out
sed -i '/^127.0.0.1.*localhost$/d' $out
sed -i '/^127.0.0.1.*local$/d' $out
sed -i '/^127.0.0.1.*localhost.localdomain$/d' $out
sed -i '/^255.255.255.255/d' $out
sed -i '/^::1/d' $out
sed -i '/^fe00::/d' $out
sed -i '/^ff00::/d' $out
sed -i '/^ff02::/d' $out
sed -i 's/^0.0.0.0\s\+//' $out
sed -i 's/^127.0.0.1\s\+//' $out
'';
};
hostname-lists =
[
{
name = "no-application-dns";
path = pkgs.writeText "no-application-dns" "use-application-dns.net";
}
]
++ map hostfile-to-hostname-list hostfiles-lists;
prepare-hostname-list = hostname-list:
pkgs.runCommand "${hostname-list.name}-prepared" {} ''
sed 's/#.*//' ${hostname-list.path} > $out
'';
prepared-hostname-list = map prepare-hostname-list hostname-lists;
concat-hostname-list = pkgs.runCommand "concat-hostname-list" {} ''
cat ${builtins.toString prepared-hostname-list} | sort -u | grep -Ev '^\s*$' > $out
'';
in
pkgs.runCommand "rpz.int.chir.rs" {} ''
echo "@ 3600 IN SOA ns1.chir.rs. lotte.chir.rs. ${toString hosts-list.lastModified} 86400 7200 2592000 86400" > $out
echo "@ 3600 IN NS ns1.chir.rs. " >> $out
echo "@ 3600 IN NS ns2.chir.rs. " >> $out
echo "@ 3600 IN NS ns3.chir.rs. " >> $out
echo "@ 3600 IN NS ns4.chir.rs. " >> $out
echo "@ 3600 IN NS ns1.darkkirb.de. " >> $out
echo "@ 3600 IN NS ns2.darkkirb.de. " >> $out
echo "@ 3600 IN NS ns1.shitallover.me. " >> $out
echo "@ 3600 IN NS ns2.shitallover.me. " >> $out
sed 's/$/ IN CNAME ./' ${concat-hostname-list} >> $out
''