fix(treewide): deadnix

This commit is contained in:
ooks-io 2024-07-15 20:53:35 +12:00
parent f7b3aba883
commit 5c055252ea
26 changed files with 44 additions and 26 deletions

View file

@ -2,7 +2,7 @@
# ooknet # ooknet
description = "a nix configuration written by an orangutan"; 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, ... }: { flake-parts.lib.mkFlake { inherit inputs; } ({withSystem, ... }: {
systems = import inputs.systems; systems = import inputs.systems;

View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [ pkgs.xdg-utils ]; home.packages = [ pkgs.xdg-utils ];

View file

@ -1,7 +1,7 @@
{ colorscheme }: { { colorscheme }: {
"${colorscheme.slug}" = { "${colorscheme.slug}" = {
palette = builtins.mapAttrs (name: value: "#${value}") colorscheme.colors; # Add leading '#' palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#'
"attributes" = "base09"; "attributes" = "base09";
"comment" = { fg = "base03"; modifiers = [ "italic" ]; }; "comment" = { fg = "base03"; modifiers = [ "italic" ]; };
"constant" = "base09"; "constant" = "base09";

View file

@ -2,7 +2,7 @@
let let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (config.colorscheme) slug palette; inherit (config.colorscheme) slug;
cfg = config.ooknet.editor.nvim; cfg = config.ooknet.editor.nvim;
console = config.ooknet.console; console = config.ooknet.console;
in in

View file

@ -1,7 +1,7 @@
{ config, lib, ... }: { config, lib, ... }:
let let
inherit (lib) mkIf mapAttrsToList; inherit (lib) mkIf;
cfg = config.ooknet.editor.nvim; cfg = config.ooknet.editor.nvim;
console = config.ooknet.console; console = config.ooknet.console;
in in

View file

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

View file

@ -9,6 +9,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.eza = { programs.eza = {
enable = true; enable = true;
git = true;
icons = true;
}; };
}; };
} }

View file

@ -1,4 +1,4 @@
{ lib, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
{ lib, config, inputs, pkgs, ... }: { lib, config, pkgs, ... }:
let let
inherit (lib) mkIf; inherit (lib) mkIf;

View file

@ -1,4 +1,4 @@
{ lib, config, inputs, ... }: { lib, config, ... }:
let let
inherit (lib) mkIf; inherit (lib) mkIf;

View file

@ -1,4 +1,4 @@
{ lib, config, inputs, pkgs, ... }: { lib, config, ... }:
let let
inherit (config.colorscheme) palette; inherit (config.colorscheme) palette;

View file

@ -1,4 +1,4 @@
{ lib, config, ... }: { lib, ... }:
let let
inherit (lib) mkOption; inherit (lib) mkOption;

View file

@ -1,4 +1,4 @@
{ inputs, outputs, config, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
{ inputs, outputs, config, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
{ inputs, outputs, config, ... }: { inputs, ... }:
{ {
imports = [ imports = [

View file

@ -1,4 +1,4 @@
{ inputs, outputs, config, ... }: { ... }:
{ {
imports = [ imports = [

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -16,7 +16,7 @@ in
]; ];
}; };
overlays = [ overlays = [
(final: prev: { (_final: prev: {
zjstatus = inputs.zjstatus.packages.${prev.system}.default; zjstatus = inputs.zjstatus.packages.${prev.system}.default;
}) })
]; ];

View file

@ -4,7 +4,6 @@ let
inherit (lib) mkOption mkEnableOption; inherit (lib) mkOption mkEnableOption;
inherit (lib.types) bool enum listOf int submodule nullOr str; inherit (lib.types) bool enum listOf int submodule nullOr str;
inherit (lib.lists) optionals concatLists; inherit (lib.lists) optionals concatLists;
inherit (builtins) concatStringsSep;
admin = config.ooknet.host.admin; admin = config.ooknet.host.admin;
hardware = config.ooknet.host.hardware; hardware = config.ooknet.host.hardware;

View file

@ -1,4 +1,4 @@
{ outputs, inputs, ... }: { inputs, ... }:
{ {
# For every flake input, aliases 'pkgs.inputs.${flake}' to # For every flake input, aliases 'pkgs.inputs.${flake}' to
# 'inputs.${flake}.packages.${pkgs.system}' or # 'inputs.${flake}.packages.${pkgs.system}' or
@ -14,7 +14,7 @@
inputs; inputs;
}; };
zjstatus = final: prev: { zjstatus = _final: prev: {
zjstatus = inputs.zjstatus.packages.${prev.system}.default; zjstatus = inputs.zjstatus.packages.${prev.system}.default;
}; };
@ -22,5 +22,5 @@
# waybar = inputs.nixpkgs-wayland.packages.${prev.system}.waybar; # waybar = inputs.nixpkgs-wayland.packages.${prev.system}.waybar;
# }; # };
additions = final: prev: import ../pkgs { pkgs = final; }; additions = final: _prev: import ../pkgs { pkgs = final; };
} }

View file

@ -1,5 +1,5 @@
{ {
perSystem = { system, pkgs, inputs, ... }: { perSystem = { pkgs, ... }: {
packages = { packages = {
live-buds-cli = pkgs.callPackage ./live-buds-cli {}; live-buds-cli = pkgs.callPackage ./live-buds-cli {};
}; };

View file

@ -3,7 +3,7 @@ let
in in
{ {
perSystem = { config, ... }: { perSystem = { ... }: {
imports = [ imports = [
{ {
_module.args.keys = sshKeys; _module.args.keys = sshKeys;