From f1224473a9753d320df3a2179083de660e68e1a9 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 17 Jul 2023 00:17:50 +0200 Subject: [PATCH] Introduce pre-commit-hooks.nix --- .pre-commit-config.yaml | 1 + container/matrix/default.nix | 2 +- container/proxitok/default.nix | 2 +- container/weewx/default.nix | 2 +- flake.lock | 117 +++++++++++++++++- flake.nix | 23 ++++ hardware/hosts/adsb-antenna.nix | 2 +- hardware/hosts/argon.nix | 2 +- hardware/hosts/weather-sdr.nix | 2 +- home/config/nvim/nifoc/theme.fnl | 17 ++- .../nvim/plugins/rainbow-delimiters.fnl | 12 ++ home/config/nvim/plugins/treesitter.fnl | 8 -- home/hosts/Styx.nix | 2 +- home/hosts/adsb-antenna.nix | 2 +- home/hosts/argon.nix | 2 +- home/hosts/mediaserver.nix | 2 +- home/hosts/tanker.nix | 2 +- home/hosts/weather-sdr.nix | 2 +- home/programs/atuin.nix | 2 - home/programs/fish.nix | 2 +- home/programs/fzf.nix | 2 - home/programs/gpg.nix | 2 - home/programs/nvim/default.nix | 11 +- home/programs/nvim/plugins.nix | 30 ++--- home/programs/nvim/plugins.yaml | 2 +- home/programs/texlive.nix | 2 - secret/container/additional-media/default.nix | Bin 1988 -> 1982 bytes system/hosts/adsb-antenna.nix | 4 +- system/hosts/mediaserver.nix | 5 +- system/hosts/weather-sdr.nix | 2 +- system/nixos/adguardhome.nix | 4 +- system/nixos/aria2.nix | 2 +- system/nixos/atticd.nix | 2 +- system/nixos/convos.nix | 2 +- system/nixos/elasticsearch.nix | 2 - system/nixos/flaresolverr.nix | 2 +- system/nixos/home-proxy.nix | 2 +- system/nixos/jellyfin.nix | 2 +- system/nixos/libreddit.nix | 2 +- system/nixos/nginx.nix | 2 +- system/nixos/prowlarr.nix | 2 +- system/nixos/radarr.nix | 2 +- system/nixos/rimgo.nix | 2 +- system/nixos/sabnzbd.nix | 2 +- system/nixos/sonarr.nix | 2 +- system/nixos/wireguard-netns.nix | 2 +- 46 files changed, 218 insertions(+), 82 deletions(-) create mode 120000 .pre-commit-config.yaml create mode 100644 home/config/nvim/plugins/rainbow-delimiters.fnl diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 120000 index 0000000..6b6bdfc --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1 @@ +/nix/store/rkdyfyp0x0nwvdq80b7vss4n599davvd-pre-commit-config.json \ No newline at end of file diff --git a/container/matrix/default.nix b/container/matrix/default.nix index c8cce39..7d1291c 100644 --- a/container/matrix/default.nix +++ b/container/matrix/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { virtualisation.oci-containers.containers = { diff --git a/container/proxitok/default.nix b/container/proxitok/default.nix index dbdee2d..0b4100c 100644 --- a/container/proxitok/default.nix +++ b/container/proxitok/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { virtualisation.oci-containers.containers = { diff --git a/container/weewx/default.nix b/container/weewx/default.nix index 73f4e56..10a160a 100644 --- a/container/weewx/default.nix +++ b/container/weewx/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: let secret = import ../../secret/container/weewx; diff --git a/flake.lock b/flake.lock index 04a917e..999b359 100644 --- a/flake.lock +++ b/flake.lock @@ -177,6 +177,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -261,6 +277,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -283,6 +317,27 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -379,11 +434,11 @@ ] }, "locked": { - "lastModified": 1689281837, - "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=", + "lastModified": 1689516967, + "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f", + "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63", "type": "github" }, "original": { @@ -476,6 +531,46 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1689328505, + "narHash": "sha256-9B3+OeUn1a/CvzE3GW6nWNwS5J7PDHTyHGlpL3wV5oA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5e28316db471d1ac234beb70031b635437421dd6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -489,6 +584,7 @@ "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" } }, @@ -534,6 +630,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 15b5066..7c589ca 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + pre-commit-hooks-nix = { + url = "github:cachix/pre-commit-hooks.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Overlays disko = { @@ -115,6 +120,7 @@ imports = [ inputs.flake-root.flakeModule inputs.treefmt-nix.flakeModule + inputs.pre-commit-hooks-nix.flakeModule ]; systems = [ @@ -135,12 +141,29 @@ }; }; + pre-commit = { + settings = { + excludes = [ "\\.direnv\\/" ]; + + hooks = { + deadnix.enable = true; + statix.enable = true; + treefmt.enable = true; + }; + + settings = { + statix.ignore = [ ".direnv/**/*.nix" ]; + }; + }; + }; + devShells.default = pkgs.mkShell { name = "dotfiles"; inputsFrom = [ config.flake-root.devShell config.treefmt.build.devShell + config.pre-commit.devShell ]; }; }; diff --git a/hardware/hosts/adsb-antenna.nix b/hardware/hosts/adsb-antenna.nix index 354ba28..591d9f9 100644 --- a/hardware/hosts/adsb-antenna.nix +++ b/hardware/hosts/adsb-antenna.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/hardware/hosts/argon.nix b/hardware/hosts/argon.nix index cb772a1..e010517 100644 --- a/hardware/hosts/argon.nix +++ b/hardware/hosts/argon.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/hardware/hosts/weather-sdr.nix b/hardware/hosts/weather-sdr.nix index f71f793..ac7cd9d 100644 --- a/hardware/hosts/weather-sdr.nix +++ b/hardware/hosts/weather-sdr.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/home/config/nvim/nifoc/theme.fnl b/home/config/nvim/nifoc/theme.fnl index bac8ec7..708682f 100644 --- a/home/config/nvim/nifoc/theme.fnl +++ b/home/config/nvim/nifoc/theme.fnl @@ -27,14 +27,13 @@ (highlight :IlluminatedWordText {:bg mod.colors.selection}) (highlight :IlluminatedWordRead {:bg mod.colors.selection}) (highlight :IlluminatedWordWrite {:bg mod.colors.selection :underline true}) - ;; nvim-ts-rainbow2 - (highlight :TSRainbowRed {:fg mod.colors.red}) - (highlight :TSRainbowYellow {:fg mod.colors.yellow}) - (highlight :TSRainbowBlue {:fg mod.colors.purple}) - (highlight :TSRainbowOrange {:fg mod.colors.orange}) - (highlight :TSRainbowGreen {:fg mod.colors.green}) - (highlight :TSRainbowViolet {:fg mod.colors.pink}) - (highlight :TSRainbowCyan {:fg mod.colors.cyan})) + ;; rainbow-delimiters + (highlight :RainbowDelimiterRed {:fg mod.colors.red}) + (highlight :RainbowDelimiterYellow {:fg mod.colors.yellow}) + (highlight :RainbowDelimiterBlue {:fg mod.colors.purple}) + (highlight :RainbowDelimiterOrange {:fg mod.colors.orange}) + (highlight :RainbowDelimiterGreen {:fg mod.colors.green}) + (highlight :RainbowDelimiterViolet {:fg mod.colors.pink}) + (highlight :RainbowDelimiterCyan {:fg mod.colors.cyan})) mod) - diff --git a/home/config/nvim/plugins/rainbow-delimiters.fnl b/home/config/nvim/plugins/rainbow-delimiters.fnl new file mode 100644 index 0000000..c4820a0 --- /dev/null +++ b/home/config/nvim/plugins/rainbow-delimiters.fnl @@ -0,0 +1,12 @@ +(let [rainbow-delimiters (require :rainbow-delimiters)] + (set vim.g.rainbow_delimiters + {:strategy {"" (. rainbow-delimiters :strategy :global) + :vim (. rainbow-delimiters :strategy :local)} + :query {"" :rainbow-delimiters :lua :rainbow-blocks} + :highlight [:RainbowDelimite + :RainbowDelimiterYellow + :RainbowDelimiterBlue + :RainbowDelimiterOrange + :RainbowDelimiterGreen + :RainbowDelimiterViolet + :RainbowDelimiterCyan]})) diff --git a/home/config/nvim/plugins/treesitter.fnl b/home/config/nvim/plugins/treesitter.fnl index 31686ae..2ba0bc0 100644 --- a/home/config/nvim/plugins/treesitter.fnl +++ b/home/config/nvim/plugins/treesitter.fnl @@ -48,17 +48,9 @@ :if "@function.inner" :ac "@conditional.outer" :ic "@conditional.inner"}}} - :rainbow {:enable true - :disable (vim.tbl_filter (fn [parser] - (not (vim.tbl_contains rainbow-parsers - parser))) - install-parsers) - :query :rainbow-parens - :strategy (require :ts-rainbow.strategy.global)} :matchup {:enable true :disable disable-parsers} :autopairs {:enable true :disable disable-parsers} :autotag {:enable true :disable disable-parsers} :playground {:enable true} :nifoc_hooks {:enable true :disable disable-parsers}})) - diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index 68e08b1..f07addc 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -1,4 +1,4 @@ -args@{ pkgs, config, lib, ... }: +{ pkgs, ... }: { imports = [ diff --git a/home/hosts/adsb-antenna.nix b/home/hosts/adsb-antenna.nix index 08d8998..79585e0 100644 --- a/home/hosts/adsb-antenna.nix +++ b/home/hosts/adsb-antenna.nix @@ -1,4 +1,4 @@ -args@{ pkgs, ... }: +{ pkgs, ... }: { imports = [ diff --git a/home/hosts/argon.nix b/home/hosts/argon.nix index 6fac53c..a39bad4 100644 --- a/home/hosts/argon.nix +++ b/home/hosts/argon.nix @@ -1,4 +1,4 @@ -args@{ pkgs, ... }: +{ pkgs, ... }: { imports = [ diff --git a/home/hosts/mediaserver.nix b/home/hosts/mediaserver.nix index 91180c8..c4cdec4 100644 --- a/home/hosts/mediaserver.nix +++ b/home/hosts/mediaserver.nix @@ -1,4 +1,4 @@ -args@{ pkgs, ... }: +{ pkgs, ... }: { imports = [ diff --git a/home/hosts/tanker.nix b/home/hosts/tanker.nix index bb8b8df..f3d4da3 100644 --- a/home/hosts/tanker.nix +++ b/home/hosts/tanker.nix @@ -1,4 +1,4 @@ -args@{ pkgs, ... }: +{ pkgs, ... }: { imports = [ diff --git a/home/hosts/weather-sdr.nix b/home/hosts/weather-sdr.nix index 08d8998..79585e0 100644 --- a/home/hosts/weather-sdr.nix +++ b/home/hosts/weather-sdr.nix @@ -1,4 +1,4 @@ -args@{ pkgs, ... }: +{ pkgs, ... }: { imports = [ diff --git a/home/programs/atuin.nix b/home/programs/atuin.nix index cc7c42a..c27b0a8 100644 --- a/home/programs/atuin.nix +++ b/home/programs/atuin.nix @@ -1,5 +1,3 @@ -{ pkgs, lib, ... }: - { programs.atuin = { enable = true; diff --git a/home/programs/fish.nix b/home/programs/fish.nix index 3f8b573..a0432bb 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ pkgs, lib, ... }: let inherit (pkgs) fetchFromGitHub; diff --git a/home/programs/fzf.nix b/home/programs/fzf.nix index 9bd11df..07998d4 100644 --- a/home/programs/fzf.nix +++ b/home/programs/fzf.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { programs.fzf = { enable = true; diff --git a/home/programs/gpg.nix b/home/programs/gpg.nix index 831d12f..3458bab 100644 --- a/home/programs/gpg.nix +++ b/home/programs/gpg.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { programs.gpg = { enable = true; diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 34fe73a..d78c906 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -106,7 +106,7 @@ in let customPlugins = import ./plugins.nix { inherit pkgs; }; in - (with customPlugins; [ + with customPlugins; [ # Utils popup-nvim plenary-nvim @@ -162,7 +162,12 @@ in type = "fennel"; } - nvim-ts-rainbow2 + { + plugin = rainbow-delimiters-nvim; + config = builtins.readFile ../../config/nvim/plugins/rainbow-delimiters.fnl; + type = "fennel"; + } + playground # Telescope @@ -338,7 +343,7 @@ in config = builtins.readFile ../../config/nvim/plugins/noice.fnl; type = "fennel"; } - ]); + ]; }; xdg.configFile."nvim" = { diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 4c39cb9..a661bba 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -107,12 +107,12 @@ in }; dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-07-13"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "9db13329e205aaee089e25be8113bd1faeca674e"; - sha256 = "1f79jazw5kp0ica4hdxpjry79qii8q6a0shg2rqkhpd0a8ydb8rg"; + rev = "948d237241b91389c8c2f109885b91cd2574b8bb"; + sha256 = "09cgyskfmqnp0gl1qbwfij8a6r6c0frgbj39zjx15frbhraygpdb"; fetchSubmodules = false; }; }; @@ -127,14 +127,14 @@ in fetchSubmodules = false; }; }; - nvim-ts-rainbow2 = buildVimPluginFrom2Nix { - pname = "nvim-ts-rainbow2"; - version = "2023-07-12"; + rainbow-delimiters-nvim = buildVimPluginFrom2Nix { + pname = "rainbow-delimiters.nvim"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "HiPhish"; - repo = "nvim-ts-rainbow2"; - rev = "b3120cd5ae9ca524af9cb602f41e12e301fa985f"; - sha256 = "0mjg0pkd8wv8cfar30lkyywdrd3g5lz36bbsfb7lrqi7kbksyzxv"; + repo = "rainbow-delimiters.nvim"; + rev = "a9f2bb9777a4b2a5178df09fcb7c30e5664949bc"; + sha256 = "0l542mlncq6c3p8d866zlzx12g3wil39xy4bq99nxlsjsmyhin7g"; fetchSubmodules = false; }; }; @@ -286,12 +286,12 @@ in }; nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-07-13"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "808e8fdbee02ed2c6efc17e70c7453fccf5d5a1d"; - sha256 = "1q0ryrsmiil2l2dfhlxnkgahxw5jnfbiv1b48ly2iscqldrsm9sb"; + rev = "a9d46f7f8173250567854d81ef2ead1256789b0e"; + sha256 = "1z53rlm4p8s90clr4biqaxnpfsr87889lxwp4wnazl4137hi4b9c"; fetchSubmodules = false; }; }; @@ -583,12 +583,12 @@ in }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-07-01"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "6c87c1d11c38180fb72bf8f45518a0a3e081afc1"; - sha256 = "0y0fwll3a421r0px9x2d8mq2nj00w6ahilwmrvmhvnazjgqd074j"; + rev = "26394ed09d47160a493d4e9e754f5f78d4556a6b"; + sha256 = "08b2yn27ljy3jf88qj3gi86rvy4ijrip3hha2dbnzhdsziq897k4"; fetchSubmodules = false; }; }; diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml index fbc1886..a98b163 100644 --- a/home/programs/nvim/plugins.yaml +++ b/home/programs/nvim/plugins.yaml @@ -13,7 +13,7 @@ - src: Mofiqul/dracula.nvim # Syntax - src: nvim-treesitter/nvim-treesitter -- src: HiPhish/nvim-ts-rainbow2 +- src: HiPhish/rainbow-delimiters.nvim - src: nvim-treesitter/playground # Telescope - src: nvim-telescope/telescope.nvim diff --git a/home/programs/texlive.nix b/home/programs/texlive.nix index 84439c0..ab674c5 100644 --- a/home/programs/texlive.nix +++ b/home/programs/texlive.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { programs.texlive = { enable = true; diff --git a/secret/container/additional-media/default.nix b/secret/container/additional-media/default.nix index 7ed312bf6c8176a6a840d386a02b68731dfb9b86..1b1a32834854c41ae3ee37f92a605681eb033403 100644 GIT binary patch literal 1982 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 W0;v71t%te~gi~qB%Jke*wHQxBm&~~U diff --git a/system/hosts/adsb-antenna.nix b/system/hosts/adsb-antenna.nix index 1bfbf5d..dad3481 100644 --- a/system/hosts/adsb-antenna.nix +++ b/system/hosts/adsb-antenna.nix @@ -1,4 +1,4 @@ -args@{ pkgs, lib, ... }: +{ pkgs, ... }: let secret = import ../../secret/hosts/adsb-antenna.nix; @@ -93,7 +93,7 @@ in }; daniel = { - hashedPassword = secret.users.daniel.hashedPassword; + inherit (secret.users.daniel) hashedPassword; isNormalUser = true; home = "/home/daniel"; description = "Daniel"; diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix index 9b1c7fe..1ef2c2e 100644 --- a/system/hosts/mediaserver.nix +++ b/system/hosts/mediaserver.nix @@ -1,4 +1,4 @@ -args@{ pkgs, config, lib, ... }: +args@{ pkgs, config, ... }: let secret = import ../../secret/hosts/mediaserver.nix; @@ -133,6 +133,9 @@ in doc.enable = false; }; + fonts.fontconfig.enable = false; + sound.enable = false; + programs.fish.enable = true; programs.htop.enable = true; diff --git a/system/hosts/weather-sdr.nix b/system/hosts/weather-sdr.nix index cc8f055..738bf95 100644 --- a/system/hosts/weather-sdr.nix +++ b/system/hosts/weather-sdr.nix @@ -1,4 +1,4 @@ -args@{ pkgs, config, lib, ... }: +{ pkgs, config, ... }: let ssh-keys = import ../shared/ssh-keys.nix; diff --git a/system/nixos/adguardhome.nix b/system/nixos/adguardhome.nix index c149c82..6668ca2 100644 --- a/system/nixos/adguardhome.nix +++ b/system/nixos/adguardhome.nix @@ -18,7 +18,7 @@ debug_pprof = false; dns = { - bind_hosts = secret.adguardhome.bind_hosts; + inherit (secret.adguardhome) bind_hosts; port = 53; bootstrap_dns = [ @@ -40,7 +40,7 @@ networking.firewall.interfaces = let - interfaces = lib.mapAttrsToList (_: value: lib.attrsets.attrByPath [ "matchConfig" "Name" ] null value) config.systemd.network.networks; + interfaces = lib.mapAttrsToList (_: lib.attrsets.attrByPath [ "matchConfig" "Name" ] null) config.systemd.network.networks; in builtins.listToAttrs (builtins.map diff --git a/system/nixos/aria2.nix b/system/nixos/aria2.nix index 72e5cd4..d26b459 100644 --- a/system/nixos/aria2.nix +++ b/system/nixos/aria2.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, config, ... }: let ariaDir = "/mnt/downloads/Aria2"; diff --git a/system/nixos/atticd.nix b/system/nixos/atticd.nix index 2c18b84..b909100 100644 --- a/system/nixos/atticd.nix +++ b/system/nixos/atticd.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, secret, ... }: +{ pkgs, config, secret, ... }: let fqdn = "attic.cache.daniel.sx"; diff --git a/system/nixos/convos.nix b/system/nixos/convos.nix index 239a04f..e1663e6 100644 --- a/system/nixos/convos.nix +++ b/system/nixos/convos.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { systemd.tmpfiles.rules = [ diff --git a/system/nixos/elasticsearch.nix b/system/nixos/elasticsearch.nix index d7d612b..5421c3a 100644 --- a/system/nixos/elasticsearch.nix +++ b/system/nixos/elasticsearch.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { services.elasticsearch = { enable = true; diff --git a/system/nixos/flaresolverr.nix b/system/nixos/flaresolverr.nix index b3b9840..8c3026b 100644 --- a/system/nixos/flaresolverr.nix +++ b/system/nixos/flaresolverr.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { virtualisation.oci-containers.containers.flaresolverr = { diff --git a/system/nixos/home-proxy.nix b/system/nixos/home-proxy.nix index 51f4c61..4a9edc2 100644 --- a/system/nixos/home-proxy.nix +++ b/system/nixos/home-proxy.nix @@ -1,4 +1,4 @@ -{ pkgs, config, secret, ... }: +{ secret, ... }: { services.nginx.streamConfig = '' diff --git a/system/nixos/jellyfin.nix b/system/nixos/jellyfin.nix index 572f647..6698dab 100644 --- a/system/nixos/jellyfin.nix +++ b/system/nixos/jellyfin.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { services.jellyfin = { diff --git a/system/nixos/libreddit.nix b/system/nixos/libreddit.nix index 9c454cf..57e210e 100644 --- a/system/nixos/libreddit.nix +++ b/system/nixos/libreddit.nix @@ -1,4 +1,4 @@ -{ config, secret, ... }: +{ secret, ... }: { services.libreddit = { diff --git a/system/nixos/nginx.nix b/system/nixos/nginx.nix index 4ebeb25..a458de0 100644 --- a/system/nixos/nginx.nix +++ b/system/nixos/nginx.nix @@ -28,7 +28,7 @@ networking.firewall.interfaces = let - interfaces = lib.mapAttrsToList (_: value: lib.attrsets.attrByPath [ "matchConfig" "Name" ] null value) config.systemd.network.networks ++ [ "tailscale0" ]; + interfaces = lib.mapAttrsToList (_: lib.attrsets.attrByPath [ "matchConfig" "Name" ] null) config.systemd.network.networks ++ [ "tailscale0" ]; in builtins.listToAttrs (builtins.map diff --git a/system/nixos/prowlarr.nix b/system/nixos/prowlarr.nix index 551e048..e1c58ff 100644 --- a/system/nixos/prowlarr.nix +++ b/system/nixos/prowlarr.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { virtualisation.oci-containers.containers.prowlarr = { diff --git a/system/nixos/radarr.nix b/system/nixos/radarr.nix index 4867b54..e843dee 100644 --- a/system/nixos/radarr.nix +++ b/system/nixos/radarr.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { virtualisation.oci-containers.containers.radarr = { diff --git a/system/nixos/rimgo.nix b/system/nixos/rimgo.nix index 5343c7f..2568893 100644 --- a/system/nixos/rimgo.nix +++ b/system/nixos/rimgo.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: let rimgo-pkg = pkgs.rimgo; diff --git a/system/nixos/sabnzbd.nix b/system/nixos/sabnzbd.nix index 96a7e75..e3cc489 100644 --- a/system/nixos/sabnzbd.nix +++ b/system/nixos/sabnzbd.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { systemd.tmpfiles.rules = [ diff --git a/system/nixos/sonarr.nix b/system/nixos/sonarr.nix index 0188aed..53cfe2e 100644 --- a/system/nixos/sonarr.nix +++ b/system/nixos/sonarr.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { virtualisation.oci-containers.containers.sonarr = { diff --git a/system/nixos/wireguard-netns.nix b/system/nixos/wireguard-netns.nix index fdd25a2..b5a5ddd 100644 --- a/system/nixos/wireguard-netns.nix +++ b/system/nixos/wireguard-netns.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, secret, ... }: +{ pkgs, config, secret, ... }: { environment.systemPackages = with pkgs; [ ldns tcpdump wireguard-tools ];