flake: reformat with nixfmt

This commit is contained in:
Infinidoge 2025-01-28 20:33:04 -05:00
parent a79e641851
commit eaf4f56ac0
Signed by: Infinidoge
SSH key fingerprint: SHA256:oAMyvotlNFraMmZmr+p6AxnNfW/GioTs1pOn3V4tQ7A
117 changed files with 2667 additions and 1592 deletions

View file

@ -1,4 +1,9 @@
{ config, main, pkgs, ... }:
{
config,
main,
pkgs,
...
}:
{
programs.gpg = {
enable = true;
@ -17,7 +22,13 @@
};
publicKeys = [
{ source = pkgs.fetchurl { url = "https://inx.moe/pub.txt"; sha256 = "sha256-Eocb+3TbeWmwkxQNQ3XKmRi5N9vz7QoLni0b8b0zw2k="; }; trust = "ultimate"; }
{
source = pkgs.fetchurl {
url = "https://inx.moe/pub.txt";
sha256 = "sha256-Eocb+3TbeWmwkxQNQ3XKmRi5N9vz7QoLni0b8b0zw2k=";
};
trust = "ultimate";
}
];
};

View file

@ -2,48 +2,57 @@
{
programs.htop = {
enable = true;
settings = {
fields = with config.lib.htop.fields; [
PID
USER
PRIORITY
NICE
M_SIZE
M_RESIDENT
M_SHARE
STATE
PERCENT_CPU
PERCENT_MEM
TIME
COMM
];
color_scheme = 0;
cpu_count_from_one = 0;
delay = 15;
highlight_base_name = 1;
highlight_megabytes = 1;
highlight_threads = 1;
find_comm_in_cmdline = 1;
tree_view = 1;
header_margin = 1;
show_cpu_usage = 1;
show_cpu_frequency = 1;
show_cpu_temperature = 1;
update_process_names = 1;
} // (with config.lib.htop; leftMeters [
(bar "AllCPUs")
(bar "CPU")
]) // (with config.lib.htop; rightMeters [
(bar "Memory")
(bar "Swap")
(text "Blank")
(text "Tasks")
(text "LoadAverage")
(text "Uptime")
(text "Systemd")
(text "DiskIO")
(text "NetworkIO")
]);
settings =
{
fields = with config.lib.htop.fields; [
PID
USER
PRIORITY
NICE
M_SIZE
M_RESIDENT
M_SHARE
STATE
PERCENT_CPU
PERCENT_MEM
TIME
COMM
];
color_scheme = 0;
cpu_count_from_one = 0;
delay = 15;
highlight_base_name = 1;
highlight_megabytes = 1;
highlight_threads = 1;
find_comm_in_cmdline = 1;
tree_view = 1;
header_margin = 1;
show_cpu_usage = 1;
show_cpu_frequency = 1;
show_cpu_temperature = 1;
update_process_names = 1;
}
// (
with config.lib.htop;
leftMeters [
(bar "AllCPUs")
(bar "CPU")
]
)
// (
with config.lib.htop;
rightMeters [
(bar "Memory")
(bar "Swap")
(text "Blank")
(text "Tasks")
(text "LoadAverage")
(text "Uptime")
(text "Systemd")
(text "DiskIO")
(text "NetworkIO")
]
);
};
}

View file

@ -1,6 +1,10 @@
{ main, lib, pkgs, ... }:
lib.mkIf main.universe.media.enable
{
main,
lib,
pkgs,
...
}:
lib.mkIf main.universe.media.enable {
services = {
mpris-proxy.enable = true;
playerctld.enable = true;

View file

@ -1,19 +1,40 @@
{ main, pkgs, lib, ... }:
{
main,
pkgs,
lib,
...
}:
let
flattenTree = lib.our.flattenTree' (val: val ? action) "";
mkLeader = { leader, mode }: name: value: {
key = leader + name;
inherit mode;
} // value;
mkLeader =
{ leader, mode }:
name: value:
{
key = leader + name;
inherit mode;
}
// value;
mkLeaderMap = tree:
builtins.concatMap
(leader: lib.mapAttrsToList (mkLeader leader) (flattenTree tree))
[
{ leader = "<leader>"; mode = [ "n" "v" ]; }
{ leader = "<M- >"; mode = [ "n" "v" "i" ]; }
];
mkLeaderMap =
tree:
builtins.concatMap (leader: lib.mapAttrsToList (mkLeader leader) (flattenTree tree)) [
{
leader = "<leader>";
mode = [
"n"
"v"
];
}
{
leader = "<M- >";
mode = [
"n"
"v"
"i"
];
}
];
inherit (main.universe) programming;
inherit (main) universe;
@ -34,7 +55,10 @@ in
shiftwidth = 4;
};
clipboard.register = [ "unnamedplus" "unnamed" ];
clipboard.register = [
"unnamedplus"
"unnamed"
];
globals = {
doom_one_cursor_coloring = true;
@ -51,50 +75,58 @@ in
globals.mapleader = " ";
autoCmd = [
{ event = [ "TermOpen" ]; command = "setlocal nonumber norelativenumber"; }
{
event = [ "TermOpen" ];
command = "setlocal nonumber norelativenumber";
}
];
keymaps = [
{
key = "<Space>";
action = "<Nop>";
mode = [ "n" "v" ];
options = {
silent = true;
keymaps =
[
{
key = "<Space>";
action = "<Nop>";
mode = [
"n"
"v"
];
options = {
silent = true;
};
}
{
key = "<C-w>n";
action = "<C-\\><C-n>";
mode = "t";
}
]
++ mkLeaderMap {
c = {
a.action.__raw = "vim.lsp.buf.code_action";
f.action = ":Format<Enter>";
t = {
f.action = ":FormatToggle<Enter>";
};
};
}
{
key = "<C-w>n";
action = "<C-\\><C-n>";
mode = "t";
}
] ++ mkLeaderMap {
c = {
a.action.__raw = "vim.lsp.buf.code_action";
f.action = ":Format<Enter>";
t = {
f.action = ":FormatToggle<Enter>";
w = {
q.action = ":close<Enter>";
d.action = ":close<Enter>";
v.action = ":vsplit<Enter>";
s.action = ":split<Enter>";
V.action = ":vsplit ";
S.action = ":split ";
n.action = ":next<Enter>";
p.action = ":previous<Enter>";
};
f = {
s.action = ":w<enter>";
};
q = {
q.action = ":q<Enter>";
Q.action = ":q!<Enter>";
x.action = ":x<Enter>";
};
};
w = {
q.action = ":close<Enter>";
d.action = ":close<Enter>";
v.action = ":vsplit<Enter>";
s.action = ":split<Enter>";
V.action = ":vsplit ";
S.action = ":split ";
n.action = ":next<Enter>";
p.action = ":previous<Enter>";
};
f = {
s.action = ":w<enter>";
};
q = {
q.action = ":q<Enter>";
Q.action = ":q!<Enter>";
x.action = ":x<Enter>";
};
};
plugins = {
autoclose = {
@ -119,10 +151,16 @@ in
neorg = {
enable = true;
settings = {
load = let empty = { __empty = null; }; in {
"core.defaults" = empty;
"core.concealer" = empty;
};
load =
let
empty = {
__empty = null;
};
in
{
"core.defaults" = empty;
"core.concealer" = empty;
};
};
};

View file

@ -1,4 +1,9 @@
{ config, main, pkgs, ... }:
{
config,
main,
pkgs,
...
}:
{
programs.zsh = rec {
enable = true;
@ -35,10 +40,13 @@
history.path = "$HOME/${dotDir}/.zsh_history";
shellAliases = builtins.removeAttrs
(main.environment.shellAliases // config.home.shellAliases // {
shellAliases = builtins.removeAttrs (
main.environment.shellAliases
// config.home.shellAliases
// {
lsdiskw = "while true; do clear; lsdisk; sleep 1; done";
}) [ "mktmp" ];
}
) [ "mktmp" ];
oh-my-zsh = {
enable = true;

View file

@ -1,6 +1,11 @@
{ config, main, lib, pkgs, ... }:
lib.mkIf main.info.graphical
{
config,
main,
lib,
pkgs,
...
}:
lib.mkIf main.info.graphical {
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";