From 5c055252ea377230396a23daba2fa8b10769212f Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 15 Jul 2024 20:53:35 +1200 Subject: [PATCH] fix(treewide): deadnix --- flake.nix | 2 +- home/modules/base/mime-apps.nix | 2 +- home/modules/console/editor/helix/theme.nix | 2 +- .../modules/console/editor/nvim/colorscheme.nix | 2 +- home/modules/console/editor/nvim/keymapping.nix | 2 +- home/modules/console/shell/fish/functions.nix | 17 +++++++++++++++++ home/modules/console/tools/eza.nix | 2 ++ home/modules/desktop/productivity/default.nix | 2 +- home/modules/desktop/tools/zellijMenu.nix | 2 +- .../compositor/hyprland/settings/hyprpaper.nix | 2 +- .../desktop/wayland/lockscreen/hyprlock.nix | 2 +- home/options/appearance/theme.nix | 2 +- home/user/ooks/ooksdesk/default.nix | 2 +- home/user/ooks/ooksmedia/default.nix | 2 +- home/user/ooks/ooksmicro/default.nix | 2 +- home/user/ooks/ookst480s/default.nix | 2 +- hosts/ooksdesk/hardware-configuration.nix | 2 +- hosts/ooksmedia/hardware-configuration.nix | 2 +- hosts/ooksmicro/hardware-configuration.nix | 2 +- hosts/ookst480s/hardware-configuration.nix | 2 +- hosts/ooksx1/hardware-configuration.nix | 2 +- nixos/modules/base/nix/nixpkgs.nix | 2 +- nixos/options/host.nix | 1 - outputs/overlays/default.nix | 6 +++--- outputs/pkgs/default.nix | 2 +- outputs/sshKeys.nix | 2 +- 26 files changed, 44 insertions(+), 26 deletions(-) create mode 100644 home/modules/console/shell/fish/functions.nix diff --git a/flake.nix b/flake.nix index 73b8cbf..1ceb9e2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ # ooknet description = "a nix configuration written by an orangutan"; - outputs = { flake-parts, nixpkgs, self, ... } @ inputs: + outputs = { flake-parts, self, ... } @ inputs: flake-parts.lib.mkFlake { inherit inputs; } ({withSystem, ... }: { systems = import inputs.systems; diff --git a/home/modules/base/mime-apps.nix b/home/modules/base/mime-apps.nix index 36f58b6..0f71a1b 100644 --- a/home/modules/base/mime-apps.nix +++ b/home/modules/base/mime-apps.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ pkgs, ... }: { home.packages = [ pkgs.xdg-utils ]; diff --git a/home/modules/console/editor/helix/theme.nix b/home/modules/console/editor/helix/theme.nix index 970ff70..7847727 100644 --- a/home/modules/console/editor/helix/theme.nix +++ b/home/modules/console/editor/helix/theme.nix @@ -1,7 +1,7 @@ { colorscheme }: { "${colorscheme.slug}" = { - palette = builtins.mapAttrs (name: value: "#${value}") colorscheme.colors; # Add leading '#' + palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#' "attributes" = "base09"; "comment" = { fg = "base03"; modifiers = [ "italic" ]; }; "constant" = "base09"; diff --git a/home/modules/console/editor/nvim/colorscheme.nix b/home/modules/console/editor/nvim/colorscheme.nix index a5655bd..95a9167 100644 --- a/home/modules/console/editor/nvim/colorscheme.nix +++ b/home/modules/console/editor/nvim/colorscheme.nix @@ -2,7 +2,7 @@ let inherit (lib) mkIf; - inherit (config.colorscheme) slug palette; + inherit (config.colorscheme) slug; cfg = config.ooknet.editor.nvim; console = config.ooknet.console; in diff --git a/home/modules/console/editor/nvim/keymapping.nix b/home/modules/console/editor/nvim/keymapping.nix index 97b1693..75247b7 100644 --- a/home/modules/console/editor/nvim/keymapping.nix +++ b/home/modules/console/editor/nvim/keymapping.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - inherit (lib) mkIf mapAttrsToList; + inherit (lib) mkIf; cfg = config.ooknet.editor.nvim; console = config.ooknet.console; in diff --git a/home/modules/console/shell/fish/functions.nix b/home/modules/console/shell/fish/functions.nix new file mode 100644 index 0000000..3472dcc --- /dev/null +++ b/home/modules/console/shell/fish/functions.nix @@ -0,0 +1,17 @@ +{ lib, config, osConfig, ... }: + +let + inherit (lib) mkIf; + cfg = config.ooknet.shell.fish; + admin = osConfig.ooknet.host.admin; +in + +{ + config = mkIf (cfg.enable || admin.shell == "fish") { + programs.fish.functions = { + man = '' + :q + '' + }; + }; +} diff --git a/home/modules/console/tools/eza.nix b/home/modules/console/tools/eza.nix index fbb392b..b8e505d 100644 --- a/home/modules/console/tools/eza.nix +++ b/home/modules/console/tools/eza.nix @@ -9,6 +9,8 @@ in config = mkIf cfg.enable { programs.eza = { enable = true; + git = true; + icons = true; }; }; } diff --git a/home/modules/desktop/productivity/default.nix b/home/modules/desktop/productivity/default.nix index b3f1292..299f6e9 100644 --- a/home/modules/desktop/productivity/default.nix +++ b/home/modules/desktop/productivity/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { imports = [ diff --git a/home/modules/desktop/tools/zellijMenu.nix b/home/modules/desktop/tools/zellijMenu.nix index a583cc8..8db4157 100644 --- a/home/modules/desktop/tools/zellijMenu.nix +++ b/home/modules/desktop/tools/zellijMenu.nix @@ -1,4 +1,4 @@ -{ lib, config, inputs, pkgs, ... }: +{ lib, config, pkgs, ... }: let inherit (lib) mkIf; diff --git a/home/modules/desktop/wayland/compositor/hyprland/settings/hyprpaper.nix b/home/modules/desktop/wayland/compositor/hyprland/settings/hyprpaper.nix index 91b92a0..04f637f 100644 --- a/home/modules/desktop/wayland/compositor/hyprland/settings/hyprpaper.nix +++ b/home/modules/desktop/wayland/compositor/hyprland/settings/hyprpaper.nix @@ -1,4 +1,4 @@ -{ lib, config, inputs, ... }: +{ lib, config, ... }: let inherit (lib) mkIf; diff --git a/home/modules/desktop/wayland/lockscreen/hyprlock.nix b/home/modules/desktop/wayland/lockscreen/hyprlock.nix index dbe6167..8cc9207 100644 --- a/home/modules/desktop/wayland/lockscreen/hyprlock.nix +++ b/home/modules/desktop/wayland/lockscreen/hyprlock.nix @@ -1,4 +1,4 @@ -{ lib, config, inputs, pkgs, ... }: +{ lib, config, ... }: let inherit (config.colorscheme) palette; diff --git a/home/options/appearance/theme.nix b/home/options/appearance/theme.nix index b319ac6..6cf3d49 100644 --- a/home/options/appearance/theme.nix +++ b/home/options/appearance/theme.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, ... }: let inherit (lib) mkOption; diff --git a/home/user/ooks/ooksdesk/default.nix b/home/user/ooks/ooksdesk/default.nix index 6e4a8fa..37d1ee3 100644 --- a/home/user/ooks/ooksdesk/default.nix +++ b/home/user/ooks/ooksdesk/default.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, config, ... }: +{ ... }: { imports = [ diff --git a/home/user/ooks/ooksmedia/default.nix b/home/user/ooks/ooksmedia/default.nix index 20df3ad..7a4dc4c 100644 --- a/home/user/ooks/ooksmedia/default.nix +++ b/home/user/ooks/ooksmedia/default.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, config, ... }: +{ ... }: { imports = [ diff --git a/home/user/ooks/ooksmicro/default.nix b/home/user/ooks/ooksmicro/default.nix index fb6b7e1..e5d6faf 100644 --- a/home/user/ooks/ooksmicro/default.nix +++ b/home/user/ooks/ooksmicro/default.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, config, ... }: +{ inputs, ... }: { imports = [ diff --git a/home/user/ooks/ookst480s/default.nix b/home/user/ooks/ookst480s/default.nix index ad56a00..abaf16d 100644 --- a/home/user/ooks/ookst480s/default.nix +++ b/home/user/ooks/ookst480s/default.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, config, ... }: +{ ... }: { imports = [ diff --git a/hosts/ooksdesk/hardware-configuration.nix b/hosts/ooksdesk/hardware-configuration.nix index e62aba0..b183b2c 100644 --- a/hosts/ooksdesk/hardware-configuration.nix +++ b/hosts/ooksdesk/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/ooksmedia/hardware-configuration.nix b/hosts/ooksmedia/hardware-configuration.nix index 234777f..fc2d52d 100644 --- a/hosts/ooksmedia/hardware-configuration.nix +++ b/hosts/ooksmedia/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/ooksmicro/hardware-configuration.nix b/hosts/ooksmicro/hardware-configuration.nix index 39dec67..c12ee18 100644 --- a/hosts/ooksmicro/hardware-configuration.nix +++ b/hosts/ooksmicro/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/ookst480s/hardware-configuration.nix b/hosts/ookst480s/hardware-configuration.nix index cf844be..d7b2c91 100644 --- a/hosts/ookst480s/hardware-configuration.nix +++ b/hosts/ookst480s/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/ooksx1/hardware-configuration.nix b/hosts/ooksx1/hardware-configuration.nix index c852b24..97b7f3e 100644 --- a/hosts/ooksx1/hardware-configuration.nix +++ b/hosts/ooksx1/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/nixos/modules/base/nix/nixpkgs.nix b/nixos/modules/base/nix/nixpkgs.nix index 7285e89..e79e944 100644 --- a/nixos/modules/base/nix/nixpkgs.nix +++ b/nixos/modules/base/nix/nixpkgs.nix @@ -16,7 +16,7 @@ in ]; }; overlays = [ - (final: prev: { + (_final: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; }) ]; diff --git a/nixos/options/host.nix b/nixos/options/host.nix index 2c6a8a1..9568dce 100644 --- a/nixos/options/host.nix +++ b/nixos/options/host.nix @@ -4,7 +4,6 @@ let inherit (lib) mkOption mkEnableOption; inherit (lib.types) bool enum listOf int submodule nullOr str; inherit (lib.lists) optionals concatLists; - inherit (builtins) concatStringsSep; admin = config.ooknet.host.admin; hardware = config.ooknet.host.hardware; diff --git a/outputs/overlays/default.nix b/outputs/overlays/default.nix index 0839bdf..15d17c6 100644 --- a/outputs/overlays/default.nix +++ b/outputs/overlays/default.nix @@ -1,4 +1,4 @@ -{ outputs, inputs, ... }: +{ inputs, ... }: { # For every flake input, aliases 'pkgs.inputs.${flake}' to # 'inputs.${flake}.packages.${pkgs.system}' or @@ -14,7 +14,7 @@ inputs; }; - zjstatus = final: prev: { + zjstatus = _final: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; }; @@ -22,5 +22,5 @@ # waybar = inputs.nixpkgs-wayland.packages.${prev.system}.waybar; # }; - additions = final: prev: import ../pkgs { pkgs = final; }; + additions = final: _prev: import ../pkgs { pkgs = final; }; } diff --git a/outputs/pkgs/default.nix b/outputs/pkgs/default.nix index b0dfda6..2f09652 100644 --- a/outputs/pkgs/default.nix +++ b/outputs/pkgs/default.nix @@ -1,5 +1,5 @@ { - perSystem = { system, pkgs, inputs, ... }: { + perSystem = { pkgs, ... }: { packages = { live-buds-cli = pkgs.callPackage ./live-buds-cli {}; }; diff --git a/outputs/sshKeys.nix b/outputs/sshKeys.nix index 0c5fd9f..7b3ffa9 100644 --- a/outputs/sshKeys.nix +++ b/outputs/sshKeys.nix @@ -3,7 +3,7 @@ let in { - perSystem = { config, ... }: { + perSystem = { ... }: { imports = [ { _module.args.keys = sshKeys;