From db2c0f802d97ffaa9a3e70025d33713bd6e47238 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 8 Mar 2022 05:53:07 +0100 Subject: [PATCH] Disable nix-linter hook --- home-manager/roles/accounting.nix | 1 - home-manager/roles/desktop.nix | 7 +------ home-manager/roles/games.nix | 15 ------------- home-manager/roles/taskwarrior.nix | 1 - home-manager/roles/weechat/default.nix | 2 +- nixos/roles/email2matrix.nix | 6 +----- nixos/roles/foundryvtt.nix | 7 +------ nixos/roles/home-assistant/lib.nix | 29 +++++++++++++------------- nixos/roles/matrix-signal/default.nix | 7 +------ nixos/roles/server/default.nix | 7 +------ overlays/email2matrix/default.nix | 2 +- overlays/falsisign/default.nix | 24 --------------------- overlays/file-tree.nix | 4 ++-- overlays/jali/default.nix | 1 - overlays/jali/package.nix | 20 ------------------ overlays/pkgSets.nix | 3 +-- overlays/writeHaskellScript.nix | 4 ++-- private | 2 +- test.nix | 4 ++-- 19 files changed, 30 insertions(+), 116 deletions(-) delete mode 100644 overlays/falsisign/default.nix delete mode 100644 overlays/jali/default.nix delete mode 100644 overlays/jali/package.nix diff --git a/home-manager/roles/accounting.nix b/home-manager/roles/accounting.nix index ceb75e4e..c0c8e413 100644 --- a/home-manager/roles/accounting.nix +++ b/home-manager/roles/accounting.nix @@ -1,4 +1,3 @@ {pkgs, ...}: { - xdg.configFile."jali/config.py".source = pkgs.privateFile "jaliconfig.py"; home.packages = builtins.attrValues pkgs.accounting-pkgs; } diff --git a/home-manager/roles/desktop.nix b/home-manager/roles/desktop.nix index b15fee94..4e4255d8 100644 --- a/home-manager/roles/desktop.nix +++ b/home-manager/roles/desktop.nix @@ -1,9 +1,4 @@ -{ - pkgs, - lib, - config, - ... -}: let +{pkgs, ...}: let inherit (import ../../lib) colors; in { m-0.colors = colors; diff --git a/home-manager/roles/games.nix b/home-manager/roles/games.nix index 6630a126..92ab3d7f 100644 --- a/home-manager/roles/games.nix +++ b/home-manager/roles/games.nix @@ -1,6 +1,5 @@ { pkgs, - lib, config, ... }: let @@ -50,21 +49,7 @@ ${wine}/bin/wine64 ./Gw2-64.exe $@ -autologin ''; in { - #dconf.settings."org/gnome/settings-daemon/plugins/media-keys" = { - #mic-mute = lib.mkForce [ ]; - #next = lib.mkForce [ ]; - #play = lib.mkForce [ ]; - #previous = lib.mkForce [ ]; - #screensaver = lib.mkForce [ ]; - #volume-down = lib.mkForce [ ]; - #volume-up = lib.mkForce [ ]; - #}; - home.packages = builtins.attrValues { - #factorio = pkgs.factorio.override { - # username = "maralorn"; - # token = pkgs.privateValue "" "factorio"; - #}; inherit (pkgs) steam minecraft; inherit gw2run gw2setup wine gw2installdxvk; }; diff --git a/home-manager/roles/taskwarrior.nix b/home-manager/roles/taskwarrior.nix index c34786d4..6046c73c 100644 --- a/home-manager/roles/taskwarrior.nix +++ b/home-manager/roles/taskwarrior.nix @@ -1,5 +1,4 @@ { - lib, pkgs, config, ... diff --git a/home-manager/roles/weechat/default.nix b/home-manager/roles/weechat/default.nix index 51c113f6..09d25656 100644 --- a/home-manager/roles/weechat/default.nix +++ b/home-manager/roles/weechat/default.nix @@ -10,7 +10,7 @@ with lib; let plugins = builtins.attrValues (availablePlugins // { python = availablePlugins.python.withPackages - (ps: [pkgs.weechatScripts.weechat-matrix]); + (_: [pkgs.weechatScripts.weechat-matrix]); }); scripts = [pkgs.weechatScripts.weechat-matrix]; }; diff --git a/nixos/roles/email2matrix.nix b/nixos/roles/email2matrix.nix index c3341061..4e271a1b 100644 --- a/nixos/roles/email2matrix.nix +++ b/nixos/roles/email2matrix.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - ... -}: let +{pkgs, ...}: let default_mailbox = { MailboxName = ""; MatrixRoomId = ""; diff --git a/nixos/roles/foundryvtt.nix b/nixos/roles/foundryvtt.nix index f774eb48..dcc298e8 100644 --- a/nixos/roles/foundryvtt.nix +++ b/nixos/roles/foundryvtt.nix @@ -1,9 +1,4 @@ -{ - pkgs, - lib, - config, - ... -}: let +{pkgs, ...}: let name = "foundryvtt"; stateDir = "/var/lib/${name}"; dataDir = "${stateDir}/data"; diff --git a/nixos/roles/home-assistant/lib.nix b/nixos/roles/home-assistant/lib.nix index ede72969..536aa58b 100644 --- a/nixos/roles/home-assistant/lib.nix +++ b/nixos/roles/home-assistant/lib.nix @@ -43,35 +43,36 @@ rec { modeBinarySensorEntity = mode: option: "binary_sensor.${modeBinarySensorName mode option}"; }; triggers = rec { - stateTrigger = entity: { + stateTrigger = entity_id: { platform = "state"; - entity_id = entity; + inherit entity_id; }; modeSwitchTrigger = mode: stateTrigger (util.modeSelectEntity mode); }; conditions = { - modeIs = mode: option: { + modeIs = mode: state: { condition = "state"; entity_id = util.modeSelectEntity mode; - state = option; + inherit state; }; }; modules = rec { mkHAConfig = attrs: { services.home-assistant.config = attrs; }; - mkModeSwitcher = mode: attrs: _: let + mkModeSwitcher = mode: let options = builtins.attrNames mode.options; in - mkHAConfig { - input_select."${util.modeSelectName mode}" = - { - inherit options; - name = mode.title; - } - // attrs; - template = builtins.map (templates.binarySensorForMode mode) options; - }; + attrs: _: + mkHAConfig { + input_select."${util.modeSelectName mode}" = + { + inherit options; + name = mode.title; + } + // attrs; + template = builtins.map (templates.binarySensorForMode mode) options; + }; }; cards = { modeSwitcher = mode: let diff --git a/nixos/roles/matrix-signal/default.nix b/nixos/roles/matrix-signal/default.nix index 15c3691e..475209a7 100644 --- a/nixos/roles/matrix-signal/default.nix +++ b/nixos/roles/matrix-signal/default.nix @@ -1,9 +1,4 @@ -{ - pkgs, - config, - lib, - ... -}: { +_: { imports = [ ./mautrix-signal-module.nix ]; diff --git a/nixos/roles/server/default.nix b/nixos/roles/server/default.nix index 56a00613..10f8cb3e 100644 --- a/nixos/roles/server/default.nix +++ b/nixos/roles/server/default.nix @@ -1,8 +1,3 @@ -{ - config, - pkgs, - lib, - ... -}: { +_: { imports = [./init_ssh.nix]; } diff --git a/overlays/email2matrix/default.nix b/overlays/email2matrix/default.nix index e4dcb944..b9b29c21 100644 --- a/overlays/email2matrix/default.nix +++ b/overlays/email2matrix/default.nix @@ -1 +1 @@ -self: super: {email2matrix = self.callPackage ./package.nix {};} +self: _: {email2matrix = self.callPackage ./package.nix {};} diff --git a/overlays/falsisign/default.nix b/overlays/falsisign/default.nix deleted file mode 100644 index 5a23db24..00000000 --- a/overlays/falsisign/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -self: super: let - path = "PATH : ${super.lib.makeBinPath [super.imagemagick super.pdftk]}"; -in { - falsisign = super.stdenvNoCC.mkDerivation rec { - pname = "falsisign"; - version = "8e7114b"; - src = super.fetchFromGitLab { - owner = "edouardklein"; - repo = "falsisign"; - rev = version; - hash = "sha256-UJH8m1kWbW6m+6CyTfoF+oDO36c82kECHIUFaF9cT4U="; - }; - buildInputs = [super.makeWrapper]; - dontBuild = true; - installPhase = '' - patchShebangs *.sh - mkdir -p $out/bin - cp falsisign.sh $out/bin/falsisign - cp signdiv.sh $out/bin/signdiv - wrapProgram $out/bin/falsisign --prefix ${path} - wrapProgram $out/bin/signdiv --prefix ${path} - ''; - }; -} diff --git a/overlays/file-tree.nix b/overlays/file-tree.nix index a874d9b3..f1cf6f2a 100644 --- a/overlays/file-tree.nix +++ b/overlays/file-tree.nix @@ -1,7 +1,7 @@ -final: prev: let +_: prev: let inherit (prev) lib; linkToPath = path: fileOrDir: ( - if lib.types.path.check fileOrDir + if prev.lib.types.path.check fileOrDir then ["ln -sT ${fileOrDir} ${path}"] else ["mkdir -p ${path}"] diff --git a/overlays/jali/default.nix b/overlays/jali/default.nix deleted file mode 100644 index aefe7d4b..00000000 --- a/overlays/jali/default.nix +++ /dev/null @@ -1 +0,0 @@ -self: super: {jali = self.callPackage ./package.nix {};} diff --git a/overlays/jali/package.nix b/overlays/jali/package.nix deleted file mode 100644 index 7e203ab6..00000000 --- a/overlays/jali/package.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - aqbanking, - python3Packages, - fetchgit, -}: let - inherit (python3Packages) jinja2 pendulum GitPython buildPythonApplication; - pname = "jali"; - version = "b47d3b9"; -in - buildPythonApplication { - name = "${pname}-${version}"; - inherit pname version; - doCheck = false; - src = fetchgit { - url = "https://git.darmstadt.ccc.de/jali/jali.git"; - rev = version; - sha256 = "0l5h9hjri77zifx3x4khw7ncmmc9l9ppisdjilsfllzkabz4xjf4"; - }; - propagatedBuildInputs = [jinja2 pendulum GitPython aqbanking]; - } diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index fd9d9034..5df1f44c 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -105,7 +105,6 @@ self: super: { nheko dconf2nix haskell-docs-cli - falsisign ; inherit (self.gnomeExtensions) @@ -165,7 +164,7 @@ self: super: { }; accounting-pkgs = { inherit (self.haskellPackages) hledger hledger-ui hledger-web; - inherit (self) ledger jali aqbanking; + inherit (self) ledger aqbanking; }; system-pkgs = self.core-system-pkgs diff --git a/overlays/writeHaskellScript.nix b/overlays/writeHaskellScript.nix index aa8ee322..66f7a9e5 100644 --- a/overlays/writeHaskellScript.nix +++ b/overlays/writeHaskellScript.nix @@ -1,5 +1,5 @@ -self: super: let - inherit (self) lib pkgs; +final: _: let + inherit (final) lib pkgs; in { haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]''; # writeHaskell takes a name, an attrset with libraries and haskell version (both optional) diff --git a/private b/private index 7fd92662..265d6594 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 7fd92662dbc0af789fc1be44bc64ae2ec3871452 +Subproject commit 265d659498a76b5ad7f285c6bd9632c0b896df2c diff --git a/test.nix b/test.nix index 6e44ded2..94ae689b 100644 --- a/test.nix +++ b/test.nix @@ -3,11 +3,11 @@ let in { pre-commit-check = nix-pre-commit-hooks.run { src = ./.; - excludes = ["nix/.*"]; + excludes = ["nix/.*" "hardware-configuration.nix"]; hooks = { hlint.enable = true; alejandra.enable = true; - nix-linter.enable = true; + nix-linter.enable = false; # Too many false positives for now statix.enable = true; fourmolu.enable = true; cabal-fmt.enable = true;