treewide: format using nixfmt
Signed-off-by: Bloxx12 <charlie@charlieroot.dev> Change-Id: I6a6a69641c36f9763e104087a559c148d0449f00
This commit is contained in:
parent
f4464732e3
commit
e641dfa114
113 changed files with 1545 additions and 1019 deletions
|
@ -3,10 +3,11 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.meta) getExe;
|
||||
|
||||
toml = pkgs.formats.toml {};
|
||||
toml = pkgs.formats.toml { };
|
||||
jj-config = toml.generate "config.toml" {
|
||||
user = {
|
||||
name = "Bloxx12";
|
||||
|
@ -14,11 +15,20 @@
|
|||
};
|
||||
|
||||
ui = {
|
||||
pager = ["${getExe pkgs.bat}" "--plain"];
|
||||
pager = [
|
||||
"${getExe pkgs.bat}"
|
||||
"--plain"
|
||||
];
|
||||
default-command = "log";
|
||||
movement.edit = true;
|
||||
|
||||
diff.tool = ["${getExe pkgs.difftastic}" "--color" "always" "$left" "$right"];
|
||||
diff.tool = [
|
||||
"${getExe pkgs.difftastic}"
|
||||
"--color"
|
||||
"always"
|
||||
"$left"
|
||||
"$right"
|
||||
];
|
||||
};
|
||||
# FIXME: do this with agenix
|
||||
# "--scope" = [
|
||||
|
@ -44,26 +54,52 @@
|
|||
signing = {
|
||||
behaviour = "own";
|
||||
backend = "ssh";
|
||||
key = ["ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw=="];
|
||||
key = [
|
||||
"ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw=="
|
||||
];
|
||||
};
|
||||
|
||||
aliases = {
|
||||
c = ["commit"];
|
||||
ci = ["commit" "--interactive"];
|
||||
c = [ "commit" ];
|
||||
ci = [
|
||||
"commit"
|
||||
"--interactive"
|
||||
];
|
||||
|
||||
e = ["edit"];
|
||||
e = [ "edit" ];
|
||||
|
||||
# "new bookmark"
|
||||
nb = ["bookmark" "create" "-r @-"];
|
||||
nb = [
|
||||
"bookmark"
|
||||
"create"
|
||||
"-r @-"
|
||||
];
|
||||
|
||||
pull = ["git" "fetch"];
|
||||
push = ["git" "push" "--allow-new"];
|
||||
pull = [
|
||||
"git"
|
||||
"fetch"
|
||||
];
|
||||
push = [
|
||||
"git"
|
||||
"push"
|
||||
"--allow-new"
|
||||
];
|
||||
|
||||
r = ["rebase"];
|
||||
s = ["squash"];
|
||||
si = ["squash" "--interactive"];
|
||||
r = [ "rebase" ];
|
||||
s = [ "squash" ];
|
||||
si = [
|
||||
"squash"
|
||||
"--interactive"
|
||||
];
|
||||
|
||||
tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];
|
||||
tug = [
|
||||
"bookmark"
|
||||
"move"
|
||||
"--from"
|
||||
"closest_bookmark(@-)"
|
||||
"--to"
|
||||
"@-"
|
||||
];
|
||||
};
|
||||
revset-aliases = {
|
||||
"closest_bookmark(to)" = "heads(::to & bookmarks())";
|
||||
|
@ -89,14 +125,15 @@
|
|||
|
||||
jj-wrapped = pkgs.symlinkJoin {
|
||||
name = "jj-wrapped";
|
||||
paths = [pkgs.jj];
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
paths = [ pkgs.jj ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/mako --add-flags "\
|
||||
--config ${jj-config}
|
||||
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
# environment.systemPackages = [jj-wrapped];
|
||||
}
|
||||
|
|
|
@ -4,15 +4,17 @@
|
|||
pkgs,
|
||||
sources,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
cfg = config.modules.programs.nh;
|
||||
inherit (config.modules.other.system) username;
|
||||
inherit (lib.modules) mkIf;
|
||||
inherit (lib.options) mkEnableOption;
|
||||
nh = (pkgs.callPackage "${sources.nh}/package.nix" {}).overrideAttrs (_: {
|
||||
nh = (pkgs.callPackage "${sources.nh}/package.nix" { }).overrideAttrs (_: {
|
||||
doInstallCheck = false;
|
||||
});
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.modules.programs.nh.enable = mkEnableOption "nh";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
|
@ -3,25 +3,26 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (config.modules.system) isGraphical;
|
||||
inherit (lib.modules) mkIf;
|
||||
|
||||
bitwarden-desktop-wrapped = pkgs.symlinkJoin {
|
||||
name = "bitwarden-desktop-wrapped";
|
||||
paths = [pkgs.bitwarden-desktop];
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
paths = [ pkgs.bitwarden-desktop ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/bitwarden --set \
|
||||
BITWARDEN_SSH_AUTH_SOCK /run/user/1000/ssh-agent.sock
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = mkIf isGraphical {
|
||||
environment = {
|
||||
systemPackages = lib.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
bitwarden-cli
|
||||
;
|
||||
inherit bitwarden-desktop-wrapped;
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.lists) map;
|
||||
inherit (lib.strings) concatStringsSep;
|
||||
|
||||
|
@ -20,16 +21,15 @@
|
|||
brave-wrapped = pkgs.symlinkJoin {
|
||||
name = "brave";
|
||||
paths = [
|
||||
(
|
||||
pkgs.brave.override {vulkanSupport = true;}
|
||||
)
|
||||
(pkgs.brave.override { vulkanSupport = true; })
|
||||
];
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/brave --append-flags "${flags}"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [
|
||||
brave-wrapped
|
||||
];
|
||||
|
|
|
@ -3,15 +3,17 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.modules) mkIf;
|
||||
inherit (config.modules.system) isGraphical;
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = mkIf isGraphical {
|
||||
environment.systemPackages = with pkgs; [
|
||||
kdePackages.dolphin
|
||||
kdePackages.kio-fuse #to mount remote filesystems via FUSE
|
||||
kdePackages.kio-extras #extra protocols support (sftp, fish and more)
|
||||
kdePackages.kio-fuse # to mount remote filesystems via FUSE
|
||||
kdePackages.kio-extras # extra protocols support (sftp, fish and more)
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,137 +3,141 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.modules) mkIf;
|
||||
|
||||
inherit (config.meta.mainUser) username;
|
||||
cfg = config.modules.system.programs.terminals.foot;
|
||||
theme-colors = config.modules.style.colorScheme.colors;
|
||||
|
||||
foot-config = pkgs.writeText "foot.ini" (lib.generators.toINI {} {
|
||||
main = {
|
||||
term = "xterm-256color";
|
||||
app-id = "foot";
|
||||
title = "foot";
|
||||
locked-title = "no";
|
||||
foot-config = pkgs.writeText "foot.ini" (
|
||||
lib.generators.toINI { } {
|
||||
main = {
|
||||
term = "xterm-256color";
|
||||
app-id = "foot";
|
||||
title = "foot";
|
||||
locked-title = "no";
|
||||
|
||||
font = "JetBrainsMono Nerd Font Mono:size=14";
|
||||
font-bold = "JetBrainsMono Nerd Font Mono:size=14:style=Bold";
|
||||
font = "JetBrainsMono Nerd Font Mono:size=14";
|
||||
font-bold = "JetBrainsMono Nerd Font Mono:size=14:style=Bold";
|
||||
|
||||
line-height = 20;
|
||||
letter-spacing = 0;
|
||||
line-height = 20;
|
||||
letter-spacing = 0;
|
||||
|
||||
horizontal-letter-offset = 0;
|
||||
vertical-letter-offset = 0;
|
||||
box-drawings-uses-font-glyphs = "no";
|
||||
dpi-aware = "no";
|
||||
horizontal-letter-offset = 0;
|
||||
vertical-letter-offset = 0;
|
||||
box-drawings-uses-font-glyphs = "no";
|
||||
dpi-aware = "no";
|
||||
|
||||
bold-text-in-bright = "no";
|
||||
word-delimiters = ",│`|:\"'()[]{}<>";
|
||||
selection-target = "primary";
|
||||
bold-text-in-bright = "no";
|
||||
word-delimiters = ",│`|:\"'()[]{}<>";
|
||||
selection-target = "primary";
|
||||
|
||||
initial-window-size-chars = "104x36";
|
||||
initial-window-mode = "windowed";
|
||||
pad = "8x8 center";
|
||||
resize-delay-ms = 100;
|
||||
};
|
||||
initial-window-size-chars = "104x36";
|
||||
initial-window-mode = "windowed";
|
||||
pad = "8x8 center";
|
||||
resize-delay-ms = 100;
|
||||
};
|
||||
|
||||
desktop-notifications.command = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
|
||||
desktop-notifications.command = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
|
||||
|
||||
bell = {
|
||||
urgent = "yes";
|
||||
notify = "yes";
|
||||
command = "${pkgs.libnotify}/bin/notify-send bell";
|
||||
command-focused = "no";
|
||||
};
|
||||
bell = {
|
||||
urgent = "yes";
|
||||
notify = "yes";
|
||||
command = "${pkgs.libnotify}/bin/notify-send bell";
|
||||
command-focused = "no";
|
||||
};
|
||||
|
||||
scrollback = {
|
||||
lines = 10000;
|
||||
multiplier = 10.0;
|
||||
indicator-position = "relative";
|
||||
indicator-format = "line";
|
||||
};
|
||||
scrollback = {
|
||||
lines = 10000;
|
||||
multiplier = 10.0;
|
||||
indicator-position = "relative";
|
||||
indicator-format = "line";
|
||||
};
|
||||
|
||||
url = {
|
||||
launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
|
||||
label-letters = "sadfjklewcmpgh";
|
||||
osc8-underline = "always";
|
||||
};
|
||||
url = {
|
||||
launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
|
||||
label-letters = "sadfjklewcmpgh";
|
||||
osc8-underline = "always";
|
||||
};
|
||||
|
||||
tweak = {
|
||||
font-monospace-warn = "no";
|
||||
sixel = "yes";
|
||||
};
|
||||
cursor = {
|
||||
style = "beam";
|
||||
blink = "no";
|
||||
};
|
||||
tweak = {
|
||||
font-monospace-warn = "no";
|
||||
sixel = "yes";
|
||||
};
|
||||
cursor = {
|
||||
style = "beam";
|
||||
blink = "no";
|
||||
};
|
||||
|
||||
mouse = {
|
||||
hide-when-typing = "yes"; # not really needed since we already enable this in Hyprland.
|
||||
alternate-scroll-mode = "yes";
|
||||
};
|
||||
csd.preferred = "server";
|
||||
key-bindings = {
|
||||
scrollback-up-half-page = "Control+k";
|
||||
scrollback-up-page = "Control+Shift+k";
|
||||
scrollback-down-half-page = "Control+j";
|
||||
scrollback-down-page = "Control+Shift+j";
|
||||
};
|
||||
mouse-bindings = {
|
||||
selection-override-modifiers = "Shift";
|
||||
primary-paste = "BTN_MIDDLE";
|
||||
select-begin = "BTN_LEFT";
|
||||
select-begin-block = "Control+BTN_LEFT";
|
||||
select-extend = "BTN_RIGHT";
|
||||
select-extend-character-wise = "Control+BTN_RIGHT";
|
||||
select-word = "BTN_LEFT-2";
|
||||
select-word-whitespace = "Control+BTN_LEFT-2";
|
||||
};
|
||||
mouse = {
|
||||
hide-when-typing = "yes"; # not really needed since we already enable this in Hyprland.
|
||||
alternate-scroll-mode = "yes";
|
||||
};
|
||||
csd.preferred = "server";
|
||||
key-bindings = {
|
||||
scrollback-up-half-page = "Control+k";
|
||||
scrollback-up-page = "Control+Shift+k";
|
||||
scrollback-down-half-page = "Control+j";
|
||||
scrollback-down-page = "Control+Shift+j";
|
||||
};
|
||||
mouse-bindings = {
|
||||
selection-override-modifiers = "Shift";
|
||||
primary-paste = "BTN_MIDDLE";
|
||||
select-begin = "BTN_LEFT";
|
||||
select-begin-block = "Control+BTN_LEFT";
|
||||
select-extend = "BTN_RIGHT";
|
||||
select-extend-character-wise = "Control+BTN_RIGHT";
|
||||
select-word = "BTN_LEFT-2";
|
||||
select-word-whitespace = "Control+BTN_LEFT-2";
|
||||
};
|
||||
|
||||
colors = {
|
||||
foreground = theme-colors.base05; # Text
|
||||
background = theme-colors.base00; # Base
|
||||
regular0 = theme-colors.base03; # Surface 1
|
||||
regular1 = theme-colors.base08; # red
|
||||
regular2 = theme-colors.base0B; # green
|
||||
regular3 = theme-colors.base0A; # yellow
|
||||
regular4 = theme-colors.base0D; # blue
|
||||
regular5 = "f5c2e7"; # pink
|
||||
regular6 = "94e2d5"; # teal
|
||||
regular7 = "bac2de"; # Subtext 1
|
||||
colors = {
|
||||
foreground = theme-colors.base05; # Text
|
||||
background = theme-colors.base00; # Base
|
||||
regular0 = theme-colors.base03; # Surface 1
|
||||
regular1 = theme-colors.base08; # red
|
||||
regular2 = theme-colors.base0B; # green
|
||||
regular3 = theme-colors.base0A; # yellow
|
||||
regular4 = theme-colors.base0D; # blue
|
||||
regular5 = "f5c2e7"; # pink
|
||||
regular6 = "94e2d5"; # teal
|
||||
regular7 = "bac2de"; # Subtext 1
|
||||
|
||||
bright0 = theme-colors.base04; # Surface 2
|
||||
bright1 = theme-colors.base08; # red
|
||||
bright2 = theme-colors.base0B; # green
|
||||
bright3 = theme-colors.base0A; # yellow
|
||||
bright4 = "89b4fa"; # blue
|
||||
bright5 = "f5c2e7"; # pink
|
||||
bright6 = "94e2d5"; # teal
|
||||
bright7 = "a6adc8"; # Subtext 0
|
||||
bright0 = theme-colors.base04; # Surface 2
|
||||
bright1 = theme-colors.base08; # red
|
||||
bright2 = theme-colors.base0B; # green
|
||||
bright3 = theme-colors.base0A; # yellow
|
||||
bright4 = "89b4fa"; # blue
|
||||
bright5 = "f5c2e7"; # pink
|
||||
bright6 = "94e2d5"; # teal
|
||||
bright7 = "a6adc8"; # Subtext 0
|
||||
|
||||
selection-foreground = "cdd6f4";
|
||||
selection-background = "414356";
|
||||
selection-foreground = "cdd6f4";
|
||||
selection-background = "414356";
|
||||
|
||||
search-box-no-match = "11111b f38ba8";
|
||||
search-box-match = "cdd6f4 313244";
|
||||
search-box-no-match = "11111b f38ba8";
|
||||
search-box-match = "cdd6f4 313244";
|
||||
|
||||
jump-labels = "11111b fab387";
|
||||
urls = "89b4fa";
|
||||
jump-labels = "11111b fab387";
|
||||
urls = "89b4fa";
|
||||
|
||||
alpha = 0.9;
|
||||
};
|
||||
});
|
||||
alpha = 0.9;
|
||||
};
|
||||
}
|
||||
);
|
||||
foot-wrapped = pkgs.symlinkJoin {
|
||||
name = "foot-wrapped";
|
||||
paths = [pkgs.foot];
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
paths = [ pkgs.foot ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/foot --add-flags "--config=${foot-config} --working-directory=/home/${username}"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [foot-wrapped];
|
||||
environment.systemPackages = [ foot-wrapped ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.lists) elem;
|
||||
inherit (lib.meta) getExe;
|
||||
inherit (lib.attrsets) mapAttrsToList;
|
||||
|
@ -15,9 +16,16 @@
|
|||
# Shell integration for ghostty only supports
|
||||
# bash, fish and zsh for now.
|
||||
shell-integration =
|
||||
if elem name ["bash" "fish" "zsh"]
|
||||
then name
|
||||
else "none";
|
||||
if
|
||||
elem name [
|
||||
"bash"
|
||||
"fish"
|
||||
"zsh"
|
||||
]
|
||||
then
|
||||
name
|
||||
else
|
||||
"none";
|
||||
|
||||
ghostty-settings = {
|
||||
font-size = 14;
|
||||
|
@ -53,17 +61,21 @@
|
|||
command = getExe package;
|
||||
};
|
||||
|
||||
settingsFile = pkgs.writeText "config" <| concatStringsSep "\n" <| mapAttrsToList (name: value: "${name} = ${toString value}") ghostty-settings;
|
||||
settingsFile =
|
||||
pkgs.writeText "config"
|
||||
<| concatStringsSep "\n"
|
||||
<| mapAttrsToList (name: value: "${name} = ${toString value}") ghostty-settings;
|
||||
|
||||
ghostty-wrapped = pkgs.symlinkJoin {
|
||||
name = "ghostty-wrapped";
|
||||
paths = [pkgs.ghostty];
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
paths = [ pkgs.ghostty ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/ghostty --add-flags "--config-file=${settingsFile}"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit ghostty-wrapped;
|
||||
};
|
||||
|
|
|
@ -3,18 +3,20 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.options) mkEnableOption;
|
||||
inherit (lib.modules) mkIf;
|
||||
|
||||
cfg = config.modules.programs.minecraft;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.modules.programs.minecraft = {
|
||||
enable = mkEnableOption "minecraft";
|
||||
wayland = mkEnableOption "wayland";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [pkgs.prismlauncher];
|
||||
environment.systemPackages = [ pkgs.prismlauncher ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages =
|
||||
[
|
||||
pkgs.spotify
|
||||
]
|
||||
++ (with pkgs; [
|
||||
sptlrx
|
||||
]);
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [
|
||||
pkgs.spotify
|
||||
]
|
||||
++ (with pkgs; [
|
||||
sptlrx
|
||||
]);
|
||||
}
|
||||
|
|
|
@ -3,12 +3,14 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.modules) mkIf;
|
||||
inherit (lib.options) mkEnableOption;
|
||||
|
||||
cfg = config.modules.system.programs.steam;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.modules.system.programs.steam.enable = mkEnableOption "Steam games platform";
|
||||
config = mkIf cfg.enable {
|
||||
programs.steam = {
|
||||
|
@ -19,14 +21,15 @@ in {
|
|||
SDL_VIDEODRIVER = "x11";
|
||||
};
|
||||
|
||||
extraLibraries = p:
|
||||
extraLibraries =
|
||||
p:
|
||||
builtins.attrValues {
|
||||
inherit (p) atk;
|
||||
};
|
||||
};
|
||||
|
||||
gamescopeSession.enable = true;
|
||||
extraCompatPackages = [pkgs.proton-ge-bin.steamcompattool];
|
||||
extraCompatPackages = [ pkgs.proton-ge-bin.steamcompattool ];
|
||||
};
|
||||
# See
|
||||
# https://wiki.nixos.org/wiki/GameMode
|
||||
|
|
|
@ -3,18 +3,19 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.modules) mkIf;
|
||||
inherit (lib.options) mkEnableOption;
|
||||
cfg = config.modules.programs.thunar;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.modules.programs.thunar.enable = mkEnableOption "Thunar file manager";
|
||||
config = mkIf cfg.enable {
|
||||
programs.thunar = {
|
||||
enable = true;
|
||||
plugins = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs.xfce)
|
||||
inherit (pkgs.xfce)
|
||||
thunar-volman
|
||||
thunar-vcs-plugin
|
||||
thunar-archive-plugin
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
config = {
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
# We have to disable this and use nix-index instead. (Rust >>> Pearl)
|
||||
command-not-found = {
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.options) mkEnableOption;
|
||||
inherit (lib.modules) mkIf;
|
||||
|
||||
|
@ -33,15 +34,16 @@
|
|||
|
||||
btop-wrapped = pkgs.symlinkJoin {
|
||||
name = "btop-wrapped";
|
||||
paths = [btop-no-desktop-entry];
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
paths = [ btop-no-desktop-entry ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/btop --set XDG_CONFIG_HOME "${btop-settings}"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.modules.programs.btop.enable = mkEnableOption "btop";
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [btop-wrapped];
|
||||
environment.systemPackages = [ btop-wrapped ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
{pkgs, ...}: let
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
zellij-wrapped = pkgs.symlinkJoin {
|
||||
name = "zellij-wrapped";
|
||||
paths = [pkgs.zellij];
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
paths = [ pkgs.zellij ];
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/zellij --add-flags "\
|
||||
--config ${./config.kdl}"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit zellij-wrapped;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue