From fd547a8e5715d976db1e7a81b6bb338af93c7700 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 13 Aug 2024 16:26:58 +0200 Subject: [PATCH] statix --- base.nix | 2 +- hardware/gpu/cuda.nix | 4 ++-- profiles/http/services/matrix-synapse.nix | 2 +- profiles/http/services/nitter.nix | 2 +- profiles/mounts/common-zfs.nix | 2 +- profiles/mounts/freon-nfs.nix | 8 +++----- profiles/mounts/fridge-nfs.nix | 8 +++----- profiles/mounts/meconium-nfs.nix | 8 +++----- profiles/mounts/reidun-nfs.nix | 8 +++----- statix.toml | 24 +++++++++++++++++++++++ users/pbsds/home/modules/jump.nix | 2 +- users/pbsds/home/profiles/xdg-ninja.nix | 3 +++ 12 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 statix.toml diff --git a/base.nix b/base.nix index 544eda5..9f54fac 100644 --- a/base.nix +++ b/base.nix @@ -37,7 +37,7 @@ # TODO: selectively whitelist nixpkgs.config.allowUnfree = true; - nixpkgs.config.allowUnfreePredicate = (pkg: true); + nixpkgs.config.allowUnfreePredicate = pkg: true; nixpkgs.config.nonfreeLicensing = true; # used by ffmpeg hardware.enableRedistributableFirmware = true; diff --git a/hardware/gpu/cuda.nix b/hardware/gpu/cuda.nix index b949e81..fe699c0 100644 --- a/hardware/gpu/cuda.nix +++ b/hardware/gpu/cuda.nix @@ -76,7 +76,7 @@ ]; # nvidia bad - nixpkgs.config.packageOverrides = (pkgs: { + nixpkgs.config.packageOverrides = pkgs: { /** / teams = pkgs.teams.overrideAttrs (old: rec { postInstall = (old.postInstall or "") + '' @@ -111,5 +111,5 @@ }); }); /**/ - }); + }; } diff --git a/profiles/http/services/matrix-synapse.nix b/profiles/http/services/matrix-synapse.nix index 230585a..47b8e9d 100644 --- a/profiles/http/services/matrix-synapse.nix +++ b/profiles/http/services/matrix-synapse.nix @@ -5,7 +5,7 @@ services.matrix-synapse = { #enable = true; settings = { - server_name = "${config.networking.domain}" + server_name = "${config.networking.domain}"; public_baseurl = mkDomain "matrix"; url_preview_enabled = false; max_upload_size = "100M"; diff --git a/profiles/http/services/nitter.nix b/profiles/http/services/nitter.nix index 12450ca..aa7263a 100644 --- a/profiles/http/services/nitter.nix +++ b/profiles/http/services/nitter.nix @@ -28,7 +28,7 @@ preferences.replaceTwitter = mkDomain "nitter"; # Replace Twitter links with links to this instance (blank to disable). default is "" preferences.replaceYouTube = lib.mkIf config.services.invidious.enable (mkDomain "invidious"); # Replace YouTube links with links to this instance (blank to disable). default is "" settings = lib.mkIf config.services.libreddit.enable { - Preferences.replaceReddit = (mkDomain "libreddit"); # Replace Reddit links with links to this instance (blank to disable). default is "" + Preferences.replaceReddit = mkDomain "libreddit"; # Replace Reddit links with links to this instance (blank to disable). default is "" }; #preferences.stickyProfile = ; # Make profile sidebar stick to top. default is true preferences.theme = "Twitter Dark"; # Instance theme. default is "Nitter" diff --git a/profiles/mounts/common-zfs.nix b/profiles/mounts/common-zfs.nix index 107987c..1d67300 100644 --- a/profiles/mounts/common-zfs.nix +++ b/profiles/mounts/common-zfs.nix @@ -41,7 +41,7 @@ statdPort = 4000; extraNfsdConfig = ''''; }; - networking.firewall = lib.mkIf (config.services.nfs.server.enable) { + networking.firewall = lib.mkIf config.services.nfs.server.enable { # for NFSv3; view with `rpcinfo -p` allowedTCPPorts = [ 111 2049 4000 4001 4002 ]; # 20048 allowedUDPPorts = [ 111 2049 4000 4001 4002 ]; # 20048 diff --git a/profiles/mounts/freon-nfs.nix b/profiles/mounts/freon-nfs.nix index 765a32d..5e79c29 100644 --- a/profiles/mounts/freon-nfs.nix +++ b/profiles/mounts/freon-nfs.nix @@ -13,15 +13,13 @@ }; # TODO: combine nameValuePair and listToAttrs joinSets = sets: builtins.foldl' (l: r: l // r) {} sets; - in joinSets ( - # TODO: space in dirname is not supported - (map (mkMount "/mnt/freon" "192.168.1.3:/Freon") [ + # TODO: space in dirname is not supported + in joinSets (map (mkMount "/mnt/freon" "192.168.1.3:/Freon") [ "" "/Backups" "/ISO" "/Games" "/Images" - ]) - ); + ]); } diff --git a/profiles/mounts/fridge-nfs.nix b/profiles/mounts/fridge-nfs.nix index 2b62df7..8391598 100644 --- a/profiles/mounts/fridge-nfs.nix +++ b/profiles/mounts/fridge-nfs.nix @@ -47,9 +47,8 @@ }; # TODO: combine nameValuePair and listToAttrs joinSets = sets: builtins.foldl' (l: r: l // r) {} sets; - in joinSets ( - # TODO: space in dirname is not supported - (map (mkMount "/mnt/fridgepool" "10.48.101.252:/pub") [ + # TODO: space in dirname is not supported + in joinSets (map (mkMount "/mnt/fridgepool" "10.48.101.252:/pub") [ # zfs list -rHo mountpoint,sharenfs fridpool/pub | grep ro= | cut -f1 "" "/ebook" @@ -114,7 +113,6 @@ "/software/win" "/wallpapers" "/webcomics" - ]) - ); + ]); } diff --git a/profiles/mounts/meconium-nfs.nix b/profiles/mounts/meconium-nfs.nix index 70a8611..5303fc6 100644 --- a/profiles/mounts/meconium-nfs.nix +++ b/profiles/mounts/meconium-nfs.nix @@ -13,16 +13,14 @@ }; # TODO: combine nameValuePair and listToAttrs joinSets = sets: builtins.foldl' (l: r: l // r) {} sets; - in joinSets ( - # TODO: depend on nox.networking.interfaces.eno1.ipv4.addresses - (map (mkMount "/mnt/meconium" "192.168.1.8:/Meconium" ) [ + # TODO: space in dirname is not supported + in joinSets (map (mkMount "/mnt/meconium" "192.168.1.8:/Meconium" ) [ "" "/backups" "/backups/rocm" "/beets_music" #"/garage" #"/garage/gunktrunk" - ]) - ); + ]); } diff --git a/profiles/mounts/reidun-nfs.nix b/profiles/mounts/reidun-nfs.nix index 6dd25b7..cdf3590 100644 --- a/profiles/mounts/reidun-nfs.nix +++ b/profiles/mounts/reidun-nfs.nix @@ -13,9 +13,8 @@ }; # TODO: combine nameValuePair and listToAttrs joinSets = sets: builtins.foldl' (l: r: l // r) {} sets; - in joinSets ( - # TODO: space in dirname is not supported - (map (mkMount "/mnt/reidun" "192.168.1.3:/Reidun/shared") [ + # TODO: space in dirname is not supported + in joinSets (map (mkMount "/mnt/reidun" "192.168.1.3:/Reidun/shared") [ "" #"/Backups" #"/Comics" @@ -54,7 +53,6 @@ "/Work/Programming" "/Work/School" "/pub" - ]) - ); + ]); } diff --git a/statix.toml b/statix.toml new file mode 100644 index 0000000..7fa236b --- /dev/null +++ b/statix.toml @@ -0,0 +1,24 @@ +ignore = ['.direnv'] +nix_version = '2.18' +disabled = [ + # "bool_comparison", # W01 + # "empty_let_in", # W02 + "manual_inherit", # W03 + "manual_inherit_from", # W04 + # "legacy_let_syntax", # W05 + # "collapsible_let_in", # W06 + # "eta_reduction", # W07 + # "useless_parens", # W08 + # "empty_pattern", # W10 + # "redundant_pattern_bind", # W11 + # "unquoted_uri", # W12 + # "deprecated_is_null", # W13 + # "empty_inherit", # W14 + # "faster_groupby", # W15 + # "faster_zipattrswith", # W16 + # "deprecated_to_path", # W17 + # "bool_simplification", # W18 + # "useless_has_attr", # W19 + "repeated_keys", # W20 + # "empty_list_concat", # W23 +] diff --git a/users/pbsds/home/modules/jump.nix b/users/pbsds/home/modules/jump.nix index 2d91f0f..dbd71f1 100644 --- a/users/pbsds/home/modules/jump.nix +++ b/users/pbsds/home/modules/jump.nix @@ -64,7 +64,7 @@ in { _complete_jump_marks() { local curw=''${COMP_WORDS[COMP_CWORD]} local wordlist=$(find "$_JUMP_MARKPATH" -type l -printf "%f\n") - COMPREPLY=($(compgen -W ''\'''${wordlist[@]}' -- "$curw")) + COMPREPLY=($(compgen -W ''\''${wordlist[@]}' -- "$curw")) return 0 } complete -F _complete_jump_marks jump unmark diff --git a/users/pbsds/home/profiles/xdg-ninja.nix b/users/pbsds/home/profiles/xdg-ninja.nix index 63ec6b7..8a536c4 100644 --- a/users/pbsds/home/profiles/xdg-ninja.nix +++ b/users/pbsds/home/profiles/xdg-ninja.nix @@ -2,6 +2,8 @@ # found by running `nix run nixpkgs#xdg-ninja` # TODO: + /** / + export ANDROID_HOME="$XDG_DATA_HOME"/android export HISTFILE="${XDG_STATE_HOME}"/bash/history export CARGO_HOME="$XDG_DATA_HOME"/cargo @@ -18,5 +20,6 @@ export LESSHISTFILE="$XDG_CACHE_HOME"/less/history export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export VAGRANT_HOME="$XDG_DATA_HOME"/vagrant + /**/ }