1
0
Fork 0

Disable nix-linter hook

This commit is contained in:
Malte Brandy 2022-03-08 05:53:07 +01:00
parent d37ff3743a
commit db2c0f802d
19 changed files with 30 additions and 116 deletions

View file

@ -1,4 +1,3 @@
{pkgs, ...}: { {pkgs, ...}: {
xdg.configFile."jali/config.py".source = pkgs.privateFile "jaliconfig.py";
home.packages = builtins.attrValues pkgs.accounting-pkgs; home.packages = builtins.attrValues pkgs.accounting-pkgs;
} }

View file

@ -1,9 +1,4 @@
{ {pkgs, ...}: let
pkgs,
lib,
config,
...
}: let
inherit (import ../../lib) colors; inherit (import ../../lib) colors;
in { in {
m-0.colors = colors; m-0.colors = colors;

View file

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
lib,
config, config,
... ...
}: let }: let
@ -50,21 +49,7 @@
${wine}/bin/wine64 ./Gw2-64.exe $@ -autologin ${wine}/bin/wine64 ./Gw2-64.exe $@ -autologin
''; '';
in { 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 { home.packages = builtins.attrValues {
#factorio = pkgs.factorio.override {
# username = "maralorn";
# token = pkgs.privateValue "" "factorio";
#};
inherit (pkgs) steam minecraft; inherit (pkgs) steam minecraft;
inherit gw2run gw2setup wine gw2installdxvk; inherit gw2run gw2setup wine gw2installdxvk;
}; };

View file

@ -1,5 +1,4 @@
{ {
lib,
pkgs, pkgs,
config, config,
... ...

View file

@ -10,7 +10,7 @@ with lib; let
plugins = builtins.attrValues (availablePlugins plugins = builtins.attrValues (availablePlugins
// { // {
python = availablePlugins.python.withPackages python = availablePlugins.python.withPackages
(ps: [pkgs.weechatScripts.weechat-matrix]); (_: [pkgs.weechatScripts.weechat-matrix]);
}); });
scripts = [pkgs.weechatScripts.weechat-matrix]; scripts = [pkgs.weechatScripts.weechat-matrix];
}; };

View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: let
pkgs,
config,
...
}: let
default_mailbox = { default_mailbox = {
MailboxName = "<missing>"; MailboxName = "<missing>";
MatrixRoomId = "<missing>"; MatrixRoomId = "<missing>";

View file

@ -1,9 +1,4 @@
{ {pkgs, ...}: let
pkgs,
lib,
config,
...
}: let
name = "foundryvtt"; name = "foundryvtt";
stateDir = "/var/lib/${name}"; stateDir = "/var/lib/${name}";
dataDir = "${stateDir}/data"; dataDir = "${stateDir}/data";

View file

@ -43,35 +43,36 @@ rec {
modeBinarySensorEntity = mode: option: "binary_sensor.${modeBinarySensorName mode option}"; modeBinarySensorEntity = mode: option: "binary_sensor.${modeBinarySensorName mode option}";
}; };
triggers = rec { triggers = rec {
stateTrigger = entity: { stateTrigger = entity_id: {
platform = "state"; platform = "state";
entity_id = entity; inherit entity_id;
}; };
modeSwitchTrigger = mode: stateTrigger (util.modeSelectEntity mode); modeSwitchTrigger = mode: stateTrigger (util.modeSelectEntity mode);
}; };
conditions = { conditions = {
modeIs = mode: option: { modeIs = mode: state: {
condition = "state"; condition = "state";
entity_id = util.modeSelectEntity mode; entity_id = util.modeSelectEntity mode;
state = option; inherit state;
}; };
}; };
modules = rec { modules = rec {
mkHAConfig = attrs: { mkHAConfig = attrs: {
services.home-assistant.config = attrs; services.home-assistant.config = attrs;
}; };
mkModeSwitcher = mode: attrs: _: let mkModeSwitcher = mode: let
options = builtins.attrNames mode.options; options = builtins.attrNames mode.options;
in in
mkHAConfig { attrs: _:
input_select."${util.modeSelectName mode}" = mkHAConfig {
{ input_select."${util.modeSelectName mode}" =
inherit options; {
name = mode.title; inherit options;
} name = mode.title;
// attrs; }
template = builtins.map (templates.binarySensorForMode mode) options; // attrs;
}; template = builtins.map (templates.binarySensorForMode mode) options;
};
}; };
cards = { cards = {
modeSwitcher = mode: let modeSwitcher = mode: let

View file

@ -1,9 +1,4 @@
{ _: {
pkgs,
config,
lib,
...
}: {
imports = [ imports = [
./mautrix-signal-module.nix ./mautrix-signal-module.nix
]; ];

View file

@ -1,8 +1,3 @@
{ _: {
config,
pkgs,
lib,
...
}: {
imports = [./init_ssh.nix]; imports = [./init_ssh.nix];
} }

View file

@ -1 +1 @@
self: super: {email2matrix = self.callPackage ./package.nix {};} self: _: {email2matrix = self.callPackage ./package.nix {};}

View file

@ -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}
'';
};
}

View file

@ -1,7 +1,7 @@
final: prev: let _: prev: let
inherit (prev) lib; inherit (prev) lib;
linkToPath = path: fileOrDir: ( linkToPath = path: fileOrDir: (
if lib.types.path.check fileOrDir if prev.lib.types.path.check fileOrDir
then ["ln -sT ${fileOrDir} ${path}"] then ["ln -sT ${fileOrDir} ${path}"]
else else
["mkdir -p ${path}"] ["mkdir -p ${path}"]

View file

@ -1 +0,0 @@
self: super: {jali = self.callPackage ./package.nix {};}

View file

@ -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];
}

View file

@ -105,7 +105,6 @@ self: super: {
nheko nheko
dconf2nix dconf2nix
haskell-docs-cli haskell-docs-cli
falsisign
; ;
inherit inherit
(self.gnomeExtensions) (self.gnomeExtensions)
@ -165,7 +164,7 @@ self: super: {
}; };
accounting-pkgs = { accounting-pkgs = {
inherit (self.haskellPackages) hledger hledger-ui hledger-web; inherit (self.haskellPackages) hledger hledger-ui hledger-web;
inherit (self) ledger jali aqbanking; inherit (self) ledger aqbanking;
}; };
system-pkgs = system-pkgs =
self.core-system-pkgs self.core-system-pkgs

View file

@ -1,5 +1,5 @@
self: super: let final: _: let
inherit (self) lib pkgs; inherit (final) lib pkgs;
in { in {
haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]''; haskellList = list: ''["${builtins.concatStringsSep ''", "'' list}"]'';
# writeHaskell takes a name, an attrset with libraries and haskell version (both optional) # writeHaskell takes a name, an attrset with libraries and haskell version (both optional)

@ -1 +1 @@
Subproject commit 7fd92662dbc0af789fc1be44bc64ae2ec3871452 Subproject commit 265d659498a76b5ad7f285c6bd9632c0b896df2c

View file

@ -3,11 +3,11 @@ let
in { in {
pre-commit-check = nix-pre-commit-hooks.run { pre-commit-check = nix-pre-commit-hooks.run {
src = ./.; src = ./.;
excludes = ["nix/.*"]; excludes = ["nix/.*" "hardware-configuration.nix"];
hooks = { hooks = {
hlint.enable = true; hlint.enable = true;
alejandra.enable = true; alejandra.enable = true;
nix-linter.enable = true; nix-linter.enable = false; # Too many false positives for now
statix.enable = true; statix.enable = true;
fourmolu.enable = true; fourmolu.enable = true;
cabal-fmt.enable = true; cabal-fmt.enable = true;