style: utilise keep-sorted formatter
This commit is contained in:
parent
fd65dc21ad
commit
f04a4ca44d
31 changed files with 86 additions and 27 deletions
|
|
@ -1,12 +1,18 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
feature = "desktop";
|
||||
in
|
||||
{
|
||||
config = lib.mkIf config.${feature}.enable {
|
||||
# keep-sorted start
|
||||
kitty.enable = true;
|
||||
obsidian.enable = true;
|
||||
zellij.enable = true;
|
||||
# keep-sorted end
|
||||
};
|
||||
|
||||
imports = [ ];
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ in
|
|||
{
|
||||
imports = (featureBundler ./bundles) ++ (featureBundler ./features);
|
||||
|
||||
# keep-sorted start
|
||||
bat.enable = lib.mkDefault true;
|
||||
direnv.enable = lib.mkDefault true;
|
||||
eza.enable = lib.mkDefault true;
|
||||
|
|
@ -16,4 +17,5 @@ in
|
|||
starship.enable = lib.mkDefault true;
|
||||
yazi.enable = lib.mkDefault true;
|
||||
zoxide.enable = lib.mkDefault true;
|
||||
# keep-sorted end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
feature = "eza";
|
||||
in
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ in
|
|||
set fish_greeting
|
||||
'';
|
||||
shellAliases = {
|
||||
# keep-sorted start
|
||||
cat = "bat";
|
||||
cd = "j";
|
||||
g = "lazygit";
|
||||
|
|
@ -25,6 +26,7 @@ in
|
|||
ns = "nh os switch";
|
||||
vi = "nvim";
|
||||
vim = "nvim";
|
||||
# keep-sorted end
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ in
|
|||
userEmail = "83637728+wi11-holdsworth@users.noreply.github.com";
|
||||
|
||||
aliases = {
|
||||
# keep-sorted start
|
||||
a = "add";
|
||||
aa = "add .";
|
||||
ap = "add -p";
|
||||
|
|
@ -36,6 +37,7 @@ in
|
|||
cob = "checkout -b";
|
||||
ps = "push";
|
||||
pl = "pull";
|
||||
# keep-sorted end
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ in
|
|||
showRibbon = false;
|
||||
};
|
||||
communityPlugins = [
|
||||
# keep-sorted start
|
||||
"obsidian-livesync"
|
||||
"oz-clear-unused-images"
|
||||
"obsidian-editor-shortcuts"
|
||||
|
|
@ -33,8 +34,10 @@ in
|
|||
"pdf-plus"
|
||||
"obsidian-excalidraw-plugin"
|
||||
"obsidian-relative-line-numbers"
|
||||
# keep-sorted end
|
||||
];
|
||||
corePlugins = [
|
||||
# keep-sorted start
|
||||
"backlink"
|
||||
"bases"
|
||||
"bookmarks"
|
||||
|
|
@ -61,6 +64,7 @@ in
|
|||
"word-count"
|
||||
"workspaces"
|
||||
"zk-prefixer"
|
||||
# keep-sorted end
|
||||
];
|
||||
hotkeys = {
|
||||
"editor:swap-line-down" = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ in
|
|||
programs.yazi = {
|
||||
enable = true;
|
||||
plugins = {
|
||||
# keep-sorted start
|
||||
diff = pkgs.yaziPlugins.diff;
|
||||
git = pkgs.yaziPlugins.git;
|
||||
mediainfo = pkgs.yaziPlugins.mediainfo;
|
||||
|
|
@ -23,9 +24,8 @@ in
|
|||
starship = pkgs.yaziPlugins.starship;
|
||||
vcs-files = pkgs.yaziPlugins.vcs-files;
|
||||
yatline-githead = pkgs.yaziPlugins.yatline-githead;
|
||||
# keep-sorted end
|
||||
};
|
||||
# flavors = {};
|
||||
# themes = {};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,14 +14,15 @@ in
|
|||
print-and-scan.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# keep-sorted start
|
||||
beeper
|
||||
brave
|
||||
calibre
|
||||
cameractrls-gtk3
|
||||
jellyfin-media-player
|
||||
# TODO: break out into separate configuration module
|
||||
onlyoffice-desktopeditors
|
||||
sleek-todo
|
||||
# keep-sorted end
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,16 +13,15 @@ in
|
|||
with pkgs;
|
||||
(
|
||||
[
|
||||
# general
|
||||
# keep-sorted start
|
||||
devenv
|
||||
just
|
||||
mask
|
||||
vscode
|
||||
|
||||
# rust
|
||||
bacon
|
||||
cargo-info
|
||||
rusty-man
|
||||
# keep-sorted end
|
||||
]
|
||||
++ (with jetbrains; [
|
||||
rider
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ let
|
|||
in
|
||||
{
|
||||
config = lib.mkIf config.${feature}.enable {
|
||||
# keep-sorted start
|
||||
couchdb.enable = true;
|
||||
copyparty.enable = true;
|
||||
flaresolverr.enable = true;
|
||||
|
|
@ -22,6 +23,7 @@ in
|
|||
qbittorrent.enable = true;
|
||||
vaultwarden.enable = true;
|
||||
vscode-server.enable = true;
|
||||
# keep-sorted end
|
||||
|
||||
users.groups.media = { };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ in
|
|||
systemd-boot.enable = lib.mkDefault true;
|
||||
tailscale.enable = lib.mkDefault true;
|
||||
|
||||
# cli utils
|
||||
environment.systemPackages = with pkgs; [
|
||||
# keep-sorted start
|
||||
dua # disk use analyser
|
||||
fd # find
|
||||
hyperfine # benchmarking tool
|
||||
|
|
@ -38,5 +38,6 @@ in
|
|||
ripunzip
|
||||
wiki-tui # wikipedia tui
|
||||
xh # curl
|
||||
# keep-sorted end
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
lib,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ in
|
|||
{
|
||||
config = lib.mkIf config.${feature}.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# keep-sorted start
|
||||
heroic
|
||||
# TODO: break out into separate module
|
||||
lutris
|
||||
mangohud
|
||||
nexusmods-app
|
||||
|
|
@ -20,6 +20,7 @@ in
|
|||
wine64
|
||||
winetricks
|
||||
prismlauncher
|
||||
# keep-sorted end
|
||||
];
|
||||
|
||||
programs = {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ in
|
|||
environment = {
|
||||
# https://discourse.nixos.org/t/howto-disable-most-gnome-default-applications-and-what-they-are/13505
|
||||
gnome.excludePackages = with pkgs; [
|
||||
# keep-sorted start
|
||||
# baobab # disk usage analyzer
|
||||
# cheese # photo booth
|
||||
# eog # image viewer
|
||||
|
|
@ -29,8 +30,6 @@ in
|
|||
# file-roller # archive manager
|
||||
geary # email client
|
||||
seahorse # password manager
|
||||
|
||||
# these should be self explanatory
|
||||
gnome-calculator
|
||||
gnome-calendar
|
||||
gnome-characters
|
||||
|
|
@ -47,6 +46,7 @@ in
|
|||
gnome-weather
|
||||
# gnome-disk-utility
|
||||
gnome-connections
|
||||
# keep-sorted end
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ let
|
|||
'');
|
||||
|
||||
secrets = [
|
||||
# keep-sorted start
|
||||
"immich"
|
||||
"jellyfin"
|
||||
"lidarr"
|
||||
|
|
@ -29,6 +30,7 @@ let
|
|||
"prowlarr"
|
||||
"radarr"
|
||||
"sonarr"
|
||||
# keep-sorted end
|
||||
];
|
||||
in
|
||||
{
|
||||
|
|
@ -40,6 +42,7 @@ in
|
|||
listenPort = lib.toInt port;
|
||||
allowedHosts = "homepage-dashboard.fi33.buzz";
|
||||
services = [
|
||||
# keep-sorted start block=yes
|
||||
{
|
||||
"Media Management" = [
|
||||
{
|
||||
|
|
@ -217,6 +220,7 @@ in
|
|||
}
|
||||
];
|
||||
}
|
||||
# keep-sorted end
|
||||
];
|
||||
settings = {
|
||||
title = "Mission Control";
|
||||
|
|
|
|||
|
|
@ -14,11 +14,13 @@ in
|
|||
graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
# keep-sorted start
|
||||
intel-media-driver
|
||||
libva-vdpau-driver
|
||||
intel-compute-runtime
|
||||
vpl-gpu-rt
|
||||
intel-ocl
|
||||
# keep-sorted end
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
userName,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -20,14 +20,18 @@ in
|
|||
environment.systemPackages =
|
||||
with pkgs.kdePackages;
|
||||
[
|
||||
# keep-sorted start
|
||||
kontact
|
||||
ktorrent
|
||||
kget
|
||||
kzones
|
||||
# keep-sorted end
|
||||
]
|
||||
++ (with pkgs; [
|
||||
# keep-sorted start
|
||||
kile
|
||||
haruna
|
||||
# keep-sorted end
|
||||
]);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ let
|
|||
port = "5008";
|
||||
|
||||
devicesList = [
|
||||
# keep-sorted start block=yes
|
||||
{
|
||||
device = "desktop";
|
||||
id = "SKDADYB-DQVC2EG-BZ67OJR-DO25ZUR-URP2G5U-FXRNC65-OWPEKHN-STTRRQG";
|
||||
|
|
@ -26,6 +27,7 @@ let
|
|||
device = "server";
|
||||
id = "OP7EU3A-7A4CCMY-D4T3ND7-YWMRBNJ-KVE34FG-ZJQFSLS-WMLRWB4-FL2O7AZ";
|
||||
}
|
||||
# keep-sorted end
|
||||
];
|
||||
|
||||
devices = builtins.listToAttrs (
|
||||
|
|
|
|||
|
|
@ -11,11 +11,13 @@ in
|
|||
tlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
# keep-sorted start
|
||||
CPU_BOOST_ON_AC = 1;
|
||||
CPU_BOOST_ON_BAT = 0;
|
||||
CPU_SCALING_GOVERNOR_ON_AC = "performance";
|
||||
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
|
||||
STOP_CHARGE_THRESH_BAT0 = 95;
|
||||
# keep-sorted end
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
feature = "replace";
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
feature = "replace";
|
||||
port = "port";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue