mirror of
https://github.com/nix-community/home-manager.git
synced 2025-11-08 11:36:05 +01:00
formatter: add deadnix (#7331)
This commit is contained in:
parent
da077f20db
commit
76d0c31fce
11 changed files with 62 additions and 73 deletions
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
|
@ -22,7 +22,7 @@ Also make sure to read the guidelines found at
|
|||
- [ ] Change is backwards compatible.
|
||||
|
||||
- [ ] Code formatted with `nix fmt` or
|
||||
`nix-shell -p treefmt nixfmt-rfc-style keep-sorted --run treefmt`.
|
||||
`nix-shell -p treefmt nixfmt-rfc-style deadnix keep-sorted --run treefmt`.
|
||||
|
||||
- [ ] Code tested through `nix-shell --pure tests -A run.all`
|
||||
or `nix build --reference-lock-file flake.lock ./tests#test-all` using Flakes.
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -17,4 +17,4 @@ test-install:
|
|||
HOME=$(shell mktemp -d) NIX_PATH=${NIX_PATH} nix-shell . -A install
|
||||
|
||||
format:
|
||||
nix-shell -p treefmt nixfmt-rfc-style keep-sorted --run "treefmt --config-file ./treefmt.toml"
|
||||
nix-shell -p treefmt nixfmt-rfc-style deadnix keep-sorted --run "treefmt --config-file ./treefmt.toml"
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
pkgs.treefmt.withConfig {
|
||||
runtimeInputs = with pkgs; [
|
||||
nixfmt-rfc-style
|
||||
deadnix
|
||||
keep-sorted
|
||||
];
|
||||
settings = pkgs.lib.importTOML ./treefmt.toml;
|
||||
|
|
|
|||
|
|
@ -187,28 +187,26 @@ in
|
|||
|
||||
corePlugins =
|
||||
let
|
||||
corePluginsOptions =
|
||||
{ config, ... }:
|
||||
{
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable the plugin.";
|
||||
};
|
||||
corePluginsOptions = {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable the plugin.";
|
||||
};
|
||||
|
||||
name = mkOption {
|
||||
type = types.enum corePlugins;
|
||||
description = "The plugin.";
|
||||
};
|
||||
name = mkOption {
|
||||
type = types.enum corePlugins;
|
||||
description = "The plugin.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = with types; attrsOf anything;
|
||||
description = "Plugin settings to include.";
|
||||
default = { };
|
||||
};
|
||||
settings = mkOption {
|
||||
type = with types; attrsOf anything;
|
||||
description = "Plugin settings to include.";
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
mkOption {
|
||||
description = "Core plugins to activate.";
|
||||
|
|
@ -220,28 +218,26 @@ in
|
|||
|
||||
communityPlugins =
|
||||
let
|
||||
communityPluginsOptions =
|
||||
{ config, ... }:
|
||||
{
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable the plugin.";
|
||||
};
|
||||
communityPluginsOptions = {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to enable the plugin.";
|
||||
};
|
||||
|
||||
pkg = mkOption {
|
||||
type = types.package;
|
||||
description = "The plugin package.";
|
||||
};
|
||||
pkg = mkOption {
|
||||
type = types.package;
|
||||
description = "The plugin package.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = with types; attrsOf anything;
|
||||
description = "Settings to include in the plugin's `data.json`.";
|
||||
default = { };
|
||||
};
|
||||
settings = mkOption {
|
||||
type = with types; attrsOf anything;
|
||||
description = "Settings to include in the plugin's `data.json`.";
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
mkOption {
|
||||
description = "Community plugins to install and activate.";
|
||||
|
|
@ -295,22 +291,20 @@ in
|
|||
|
||||
themes =
|
||||
let
|
||||
themesOptions =
|
||||
{ config, ... }:
|
||||
{
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to set the theme as active.";
|
||||
};
|
||||
themesOptions = {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to set the theme as active.";
|
||||
};
|
||||
|
||||
pkg = mkOption {
|
||||
type = types.package;
|
||||
description = "The theme package.";
|
||||
};
|
||||
pkg = mkOption {
|
||||
type = types.package;
|
||||
description = "The theme package.";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
mkOption {
|
||||
description = "Themes to install.";
|
||||
|
|
@ -320,22 +314,20 @@ in
|
|||
|
||||
hotkeys =
|
||||
let
|
||||
hotkeysOptions =
|
||||
{ config, ... }:
|
||||
{
|
||||
options = {
|
||||
modifiers = mkOption {
|
||||
type = with types; listOf str;
|
||||
description = "The hotkey modifiers.";
|
||||
default = [ ];
|
||||
};
|
||||
hotkeysOptions = {
|
||||
options = {
|
||||
modifiers = mkOption {
|
||||
type = with types; listOf str;
|
||||
description = "The hotkey modifiers.";
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
key = mkOption {
|
||||
type = types.str;
|
||||
description = "The hotkey.";
|
||||
};
|
||||
key = mkOption {
|
||||
type = types.str;
|
||||
description = "The hotkey.";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
mkOption {
|
||||
description = "Hotkeys to configure.";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ let
|
|||
mkIf
|
||||
mkOption
|
||||
types
|
||||
literalExpression
|
||||
;
|
||||
|
||||
cfg = config.services.stalonetray;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
programs.lutris.enable = true;
|
||||
nmt.script =
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
programs.mc = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@ tree-root-file = "release.json"
|
|||
command = "nixfmt"
|
||||
includes = [ "*.nix" ]
|
||||
|
||||
[formatter.deadnix]
|
||||
command = "deadnix"
|
||||
options = [ "--edit", "--no-lambda-arg" ]
|
||||
includes = [ "*.nix" ]
|
||||
|
||||
[formatter.keep-sorted]
|
||||
command = "keep-sorted"
|
||||
includes = [ "*" ]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue