From 5c7902debc25c94ba372ec1576252300e2505924 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 10 Feb 2023 07:57:37 +0100 Subject: [PATCH] refactor: remove dead code --- darwin.nix | 1 - modules/btop.nix | 5 +- modules/firefox.nix | 2 - modules/mail.nix | 2 +- modules/neovim.nix | 2 +- modules/neovim/after/plugin/lsp.lua | 2 +- modules/newsboat.nix | 2 +- modules/sops.nix | 6 +-- packages/cura/default.nix | 2 - .../default.nix | 48 ++++++++----------- packages/helm-ls/default.nix | 1 - packages/jq-lsp/default.nix | 1 - packages/org-stats/default.nix | 1 - 13 files changed, 25 insertions(+), 50 deletions(-) diff --git a/darwin.nix b/darwin.nix index dbd43bb..00c7337 100644 --- a/darwin.nix +++ b/darwin.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }: { diff --git a/modules/btop.nix b/modules/btop.nix index 012f6bc..445ea02 100644 --- a/modules/btop.nix +++ b/modules/btop.nix @@ -1,7 +1,4 @@ -{pkgs, ...}: -with lib; let - cfg = config.catppuccin; -in { +{pkgs, ...}: { programs.btop = { enable = true; settings = { diff --git a/modules/firefox.nix b/modules/firefox.nix index 91993c9..541894e 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -1,12 +1,10 @@ { config, - lib, nur, pkgs, ... }: let inherit (pkgs.stdenv.hostPlatform) isLinux; - inherit (pkgs.stdenv.hostPlatform) isDarwin; in { programs.firefox = { enable = true; diff --git a/modules/mail.nix b/modules/mail.nix index 4142216..774125d 100644 --- a/modules/mail.nix +++ b/modules/mail.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - inherit (pkgs.stdenv.hostPlatform) isLinux isDarwin; + inherit (pkgs.stdenv.hostPlatform) isLinux; in { accounts.email.maildirBasePath = "${config.xdg.dataHome}/mail"; diff --git a/modules/neovim.nix b/modules/neovim.nix index 681b70f..ee748a3 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -62,8 +62,8 @@ rustfmt shfmt tree-sitter - alejandra deadnix + statix (callPackage ../packages/jq-lsp {}) (callPackage ../packages/helm-ls {}) diff --git a/modules/neovim/after/plugin/lsp.lua b/modules/neovim/after/plugin/lsp.lua index 7f8e0b5..552a447 100644 --- a/modules/neovim/after/plugin/lsp.lua +++ b/modules/neovim/after/plugin/lsp.lua @@ -313,7 +313,7 @@ null.setup({ null.builtins.formatting.shfmt, null.builtins.formatting.stylua, null.builtins.diagnostics.proselint, - null.builtins.diagnostics.deadnix, + null.builtins.diagnostics.statix, }, on_attach = function(client, bufnr) if client.supports_method("textDocument/formatting") then diff --git a/modules/newsboat.nix b/modules/newsboat.nix index 1b458b4..bf7f0f4 100644 --- a/modules/newsboat.nix +++ b/modules/newsboat.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{...}: { programs.newsboat = { enable = true; autoReload = true; diff --git a/modules/sops.nix b/modules/sops.nix index 55b3f2b..2bbd0a2 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: { +{config, ...}: { # TODO: enable after sops supports nix-darwin sops = { gnupg.home = "${config.xdg.configHome}/gnupg"; diff --git a/packages/cura/default.nix b/packages/cura/default.nix index dc7c9f9..5053ecc 100644 --- a/packages/cura/default.nix +++ b/packages/cura/default.nix @@ -1,8 +1,6 @@ { appimageTools, fetchurl, - lib, - pkgs, }: appimageTools.wrapType1 rec { name = "cura"; diff --git a/packages/discord-applemusic-rich-presence/default.nix b/packages/discord-applemusic-rich-presence/default.nix index a714663..ad7ca89 100644 --- a/packages/discord-applemusic-rich-presence/default.nix +++ b/packages/discord-applemusic-rich-presence/default.nix @@ -2,36 +2,26 @@ buildGoModule, fetchFromGitHub, lib, - pkgs, ... -}: let - inherit (pkgs.stdenv.hostPlatform) system; - target = - { - "aarch64-darwin" = "arm64"; - "x86_64-darwin" = "x86"; - } - .${system} - or (throw "Unsupported system: ${system}"); -in - buildGoModule rec { - pname = "discord-applemusic-rich-presence"; - version = "0.5.0"; +}: +buildGoModule rec { + pname = "discord-applemusic-rich-presence"; + version = "0.5.0"; - src = fetchFromGitHub { - owner = "caarlos0"; - repo = "discord-applemusic-rich-presence"; - rev = "v${version}"; - sha256 = "sha256-PCA0Thzng1C08NwBTh3Hl4yW2qvYXra6EZHrJxoCgIU="; - }; + src = fetchFromGitHub { + owner = "caarlos0"; + repo = "discord-applemusic-rich-presence"; + rev = "v${version}"; + sha256 = "sha256-PCA0Thzng1C08NwBTh3Hl4yW2qvYXra6EZHrJxoCgIU="; + }; - vendorSha256 = "sha256-RFJTBfsfEyKn9OSvE2HLgjKiJC3Hs90+P9rm5GlIseo="; + vendorSha256 = "sha256-RFJTBfsfEyKn9OSvE2HLgjKiJC3Hs90+P9rm5GlIseo="; - meta = with lib; { - description = "Discord's Rich Presence from Apple Music"; - homepage = "https://github.com/caarlos0/discord-applemusic-rich-presence"; - license = licenses.mit; - maintainers = [maintainers.nekowinston]; - platforms = platforms.darwin; - }; - } + meta = with lib; { + description = "Discord's Rich Presence from Apple Music"; + homepage = "https://github.com/caarlos0/discord-applemusic-rich-presence"; + license = licenses.mit; + maintainers = [maintainers.nekowinston]; + platforms = platforms.darwin; + }; +} diff --git a/packages/helm-ls/default.nix b/packages/helm-ls/default.nix index 24f5dd6..ca4e79c 100644 --- a/packages/helm-ls/default.nix +++ b/packages/helm-ls/default.nix @@ -2,7 +2,6 @@ buildGoModule, fetchFromGitHub, lib, - pkgs, ... }: buildGoModule rec { diff --git a/packages/jq-lsp/default.nix b/packages/jq-lsp/default.nix index 2b9f8d1..354540b 100644 --- a/packages/jq-lsp/default.nix +++ b/packages/jq-lsp/default.nix @@ -2,7 +2,6 @@ buildGoModule, fetchFromGitHub, lib, - pkgs, ... }: buildGoModule rec { diff --git a/packages/org-stats/default.nix b/packages/org-stats/default.nix index e3ae919..a3779ce 100644 --- a/packages/org-stats/default.nix +++ b/packages/org-stats/default.nix @@ -2,7 +2,6 @@ buildGoModule, fetchFromGitHub, lib, - pkgs, ... }: buildGoModule rec {