Use alejandra formatter / fix warnings
This commit is contained in:
parent
c5b1041bbb
commit
693d4e3c70
70 changed files with 1424 additions and 1547 deletions
|
|
@ -2,11 +2,9 @@
|
|||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
username = config.conf.username;
|
||||
in
|
||||
{
|
||||
in {
|
||||
manual = {
|
||||
html.enable = false;
|
||||
json.enable = false;
|
||||
|
|
@ -18,7 +16,7 @@ in
|
|||
home = {
|
||||
username = username;
|
||||
homeDirectory = "/home/${username}";
|
||||
sessionPath = [ "$HOME/.cargo/bin" ];
|
||||
sessionPath = ["$HOME/.cargo/bin"];
|
||||
|
||||
enableNixpkgsReleaseCheck = false;
|
||||
sessionVariables = {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
mod,
|
||||
additionalHomeConfig,
|
||||
homeMods,
|
||||
additionalHomeMods,
|
||||
additionalInputs,
|
||||
config,
|
||||
homeMods,
|
||||
inputs,
|
||||
lib,
|
||||
mod,
|
||||
pkgs,
|
||||
root,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
xdg = {
|
||||
portal.config.common.default = "*";
|
||||
portal = {
|
||||
enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||
};
|
||||
};
|
||||
home-manager = {
|
||||
|
|
|
|||
|
|
@ -4,53 +4,56 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
username = config.mods.nextcloud.username;
|
||||
password =
|
||||
if (config.sops.secrets ? nextcloud.path) then config.sops.secrets.nextcloud.path else "";
|
||||
if (config.sops.secrets ? nextcloud.path)
|
||||
then config.sops.secrets.nextcloud.path
|
||||
else "";
|
||||
url = config.mods.nextcloud.url;
|
||||
synclist = config.mods.nextcloud.synclist;
|
||||
in
|
||||
lib.mkIf config.mods.nextcloud.enable {
|
||||
systemd.user = {
|
||||
services = (
|
||||
builtins.listToAttrs (
|
||||
map (opts: {
|
||||
name = "${opts.name}";
|
||||
value = {
|
||||
Unit = {
|
||||
Description = "Auto sync Nextcloud";
|
||||
After = "network-online.target";
|
||||
lib.mkIf config.mods.nextcloud.enable {
|
||||
systemd.user = {
|
||||
services = (
|
||||
builtins.listToAttrs (
|
||||
map (opts: {
|
||||
name = "${opts.name}";
|
||||
value = {
|
||||
Unit = {
|
||||
Description = "Auto sync Nextcloud";
|
||||
After = "network-online.target";
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.nextcloud-client}/bin/nextcloudcmd -h --path ${opts.remote} ${opts.local} https://${username}:$(bat ${password})@${url}'";
|
||||
TimeoutStopSec = "180";
|
||||
KillMode = "process";
|
||||
KillSignal = "SIGINT";
|
||||
};
|
||||
Install.WantedBy = ["multi-user.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.nextcloud-client}/bin/nextcloudcmd -h --path ${opts.remote} ${opts.local} https://${username}:$(bat ${password})@${url}'";
|
||||
TimeoutStopSec = "180";
|
||||
KillMode = "process";
|
||||
KillSignal = "SIGINT";
|
||||
})
|
||||
synclist
|
||||
)
|
||||
);
|
||||
timers = (
|
||||
builtins.listToAttrs (
|
||||
map (opts: {
|
||||
name = "${opts.name}";
|
||||
value = {
|
||||
Unit.Description = "Automatic sync files with Nextcloud when booted up after 1 minute then rerun every 60 minutes";
|
||||
Timer.OnBootSec = "1min";
|
||||
Timer.OnUnitActiveSec = "60min";
|
||||
Install.WantedBy = [
|
||||
"multi-user.target"
|
||||
"timers.target"
|
||||
];
|
||||
};
|
||||
Install.WantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
}) synclist
|
||||
)
|
||||
);
|
||||
timers = (
|
||||
builtins.listToAttrs (
|
||||
map (opts: {
|
||||
name = "${opts.name}";
|
||||
value = {
|
||||
Unit.Description = "Automatic sync files with Nextcloud when booted up after 1 minute then rerun every 60 minutes";
|
||||
Timer.OnBootSec = "1min";
|
||||
Timer.OnUnitActiveSec = "60min";
|
||||
Install.WantedBy = [
|
||||
"multi-user.target"
|
||||
"timers.target"
|
||||
];
|
||||
};
|
||||
}) synclist
|
||||
)
|
||||
);
|
||||
startServices = true;
|
||||
};
|
||||
}
|
||||
})
|
||||
synclist
|
||||
)
|
||||
);
|
||||
startServices = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,21 @@
|
|||
# This is ABSOLUTE GARGABE, KDE srsly, remove this!
|
||||
# props to catppuccin mocha for sparing me from doing this manually: https://github.com/catppuccin/kde/blob/main/Resources/Base.colors
|
||||
# props to catppuccin mocha for sparing me from doing this manually: https://github.com/catppuccin/kde/blob/main/Resources/Base.colors
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
base16 = pkgs.callPackage inputs.base16.lib { };
|
||||
}: let
|
||||
base16 = pkgs.callPackage inputs.base16.lib {};
|
||||
|
||||
baseScheme = (base16.mkSchemeAttrs config.stylix.base16Scheme);
|
||||
power =
|
||||
number: powerIndex:
|
||||
if powerIndex == 1 then
|
||||
number
|
||||
else if powerIndex == 0 then
|
||||
1
|
||||
else
|
||||
number * power number (powerIndex - 1);
|
||||
baseScheme = base16.mkSchemeAttrs config.stylix.base16Scheme;
|
||||
power = number: powerIndex:
|
||||
if powerIndex == 1
|
||||
then number
|
||||
else if powerIndex == 0
|
||||
then 1
|
||||
else number * power number (powerIndex - 1);
|
||||
|
||||
lookupTable = powerIndex: {
|
||||
"0" = 0 * (power 16 powerIndex);
|
||||
|
|
@ -39,16 +36,14 @@ let
|
|||
"f" = 15 * (power 16 powerIndex);
|
||||
};
|
||||
|
||||
convertHex =
|
||||
hexChars:
|
||||
convertHex = hexChars:
|
||||
recombineColors [
|
||||
(convertColor (lib.lists.take 2 hexChars))
|
||||
(convertColor (lib.lists.take 2 (lib.lists.drop 2 hexChars)))
|
||||
(convertColor (lib.lists.take 2 (lib.lists.drop 4 hexChars)))
|
||||
];
|
||||
|
||||
convertColor =
|
||||
color: (lookupTable 1).${(lib.lists.head color)} + (lookupTable 0).${(lib.lists.last color)};
|
||||
convertColor = color: (lookupTable 1).${(lib.lists.head color)} + (lookupTable 0).${(lib.lists.last color)};
|
||||
recombineColors = colors: lib.lists.foldr (a: b: (toString a) + "," + (toString b)) "end" colors;
|
||||
|
||||
scheme = {
|
||||
|
|
@ -101,9 +96,7 @@ let
|
|||
convertHex (lib.strings.stringToCharacters baseScheme.base0F)
|
||||
);
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
in {
|
||||
# temp
|
||||
# crust -> surface1
|
||||
# subtext0 -> surface2
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@
|
|||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
# at time of using this here, stylix might not be evaluated yet
|
||||
# hence ensure it is by using base16 mkSchemeAttrs
|
||||
base16 = pkgs.callPackage inputs.base16.lib { };
|
||||
scheme = (base16.mkSchemeAttrs config.stylix.base16Scheme);
|
||||
in
|
||||
{
|
||||
base16 = pkgs.callPackage inputs.base16.lib {};
|
||||
scheme = base16.mkSchemeAttrs config.stylix.base16Scheme;
|
||||
in {
|
||||
xdg.configFile."oxiced/theme.toml" = {
|
||||
source = (pkgs.formats.toml { }).generate "oxiced" {
|
||||
source = (pkgs.formats.toml {}).generate "oxiced" {
|
||||
name = scheme.scheme;
|
||||
base00 = scheme.base00;
|
||||
base01 = scheme.base01;
|
||||
|
|
|
|||
|
|
@ -4,23 +4,25 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
username = config.conf.username;
|
||||
# at time of using this here, stylix might not be evaluated yet
|
||||
# hence ensure it is by using base16 mkSchemeAttrs
|
||||
base16 = pkgs.callPackage inputs.base16.lib { };
|
||||
scheme = (base16.mkSchemeAttrs config.stylix.base16Scheme);
|
||||
base16 = pkgs.callPackage inputs.base16.lib {};
|
||||
scheme = base16.mkSchemeAttrs config.stylix.base16Scheme;
|
||||
# active_colors=#ffc0caf5, #${scheme.base00}, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ffc0caf5, #ffc0caf5, #ffc0caf5, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ffc0caf5, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ffc0caf5, #ffc0caf5
|
||||
# disabled_colors=#ff6d728d, #${scheme.base00}, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ff6d728d, #ff6d728d, #ff6d728d, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ff6d728d, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ff6d728d, #ff6d728d
|
||||
# inactive_colors=#ff6d728d, #${scheme.base00}, #ff373949, #ff2b2c3b, #ff1a1b26, #ff2b2c3b, #ff6d728d, #ff6d728d, #ff6d728d, #ff1a1b26, #ff1a1b26, #19000000, #ff2b2c3b, #ff6d728d, #ff3584e4, #ff1b6acb, #ff1a1b26, #ff242530, #ff1a1b26, #ff6d728d, #ff6d728d
|
||||
color = ''
|
||||
|
||||
|
||||
[ColorScheme]
|
||||
active_colors=#ff${scheme.base05}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base00}, #ff${scheme.base05}, #ff${scheme.base04}, #ff${scheme.base05}, #ff${scheme.base00}, #ff${scheme.base00}, #00${scheme.base01}, #ff${scheme.base02}, #ff${scheme.base04}, #ff${scheme.base08}, #ff${scheme.base04}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base01}, #ff${scheme.base05}, #ff${scheme.base04}
|
||||
disabled_colors=#ff${scheme.base05}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base00}, #ff${scheme.base05}, #ff${scheme.base04}, #ff${scheme.base05}, #ff${scheme.base00}, #ff${scheme.base00}, #00${scheme.base01}, #ff${scheme.base02}, #ff${scheme.base04}, #ff${scheme.base08}, #ff${scheme.base04}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base01}, #ff${scheme.base05}, #ff${scheme.base04}
|
||||
inactive_colors=#ff${scheme.base05}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base00}, #ff${scheme.base05}, #ff${scheme.base04}, #ff${scheme.base05}, #ff${scheme.base00}, #ff${scheme.base00}, #00${scheme.base01}, #ff${scheme.base02}, #ff${scheme.base04}, #ff${scheme.base08}, #ff${scheme.base04}, #ff${scheme.base01}, #ff${scheme.base00}, #ff${scheme.base01}, #ff${scheme.base05}, #ff${scheme.base04}
|
||||
'';
|
||||
qss = ''
|
||||
|
||||
QTabBar::tab:selected {
|
||||
color: palette(highlight);
|
||||
}
|
||||
|
|
@ -28,33 +30,7 @@ let
|
|||
border: none;
|
||||
}
|
||||
'';
|
||||
|
||||
## test
|
||||
#cfg = config.stylix.targets.qt;
|
||||
kvconfig = config.lib.stylix.colors {
|
||||
template = ./kvconfig.mustache;
|
||||
extension = ".kvconfig";
|
||||
};
|
||||
svg = config.lib.stylix.colors {
|
||||
template = ./kvantum-svg.mustache;
|
||||
extension = "svg";
|
||||
};
|
||||
kvantumPackage = pkgs.runCommandLocal "base16-kvantum" { } ''
|
||||
directory="$out/share/Kvantum/Base16Kvantum"
|
||||
mkdir --parents "$directory"
|
||||
cat ${kvconfig} >>"$directory/Base16Kvantum.kvconfig"
|
||||
cat ${svg} >>"$directory/Base16Kvantum.svg"
|
||||
'';
|
||||
|
||||
xdg.configFile."Kvantum/kvantum.kvconfig".source =
|
||||
(pkgs.formats.ini { }).generate "kvantum.kvconfig"
|
||||
{
|
||||
General.theme = "Base16Kvantum";
|
||||
};
|
||||
|
||||
xdg.configFile."Kvantum/Base16Kvantum".source = "${kvantumPackage}/share/Kvantum/Base16Kvantum";
|
||||
in
|
||||
{
|
||||
in {
|
||||
xdg.configFile."qt5ct/colors/tokyonight.conf" = {
|
||||
text = "${color}";
|
||||
};
|
||||
|
|
@ -64,34 +40,18 @@ in
|
|||
xdg.configFile."qt5ct/qss/tab.qss" = {
|
||||
text = "${qss}";
|
||||
};
|
||||
stylix.targets.qt = {
|
||||
enable = false;
|
||||
};
|
||||
qt = {
|
||||
enable = true;
|
||||
style.package = pkgs.libsForQt5.breeze-qt5;
|
||||
style.name = lib.mkForce "breeze-dark";
|
||||
};
|
||||
|
||||
# ## test
|
||||
# xdg.configFile."Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
|
||||
# General.theme = "Base16Kvantum";
|
||||
# };
|
||||
|
||||
# xdg.configFile."Kvantum/Base16Kvantum".source = "${kvantumPackage}/share/Kvantum/Base16Kvantum";
|
||||
|
||||
# xdg.configFile."qt5ct/qt5ct.conf".text = ''
|
||||
# [Appearance]
|
||||
# style=kvantum
|
||||
# '';
|
||||
|
||||
# #icon_theme=${cfg.iconThemeName}
|
||||
|
||||
# xdg.configFile."qt6ct/qt6ct.conf".text = ''
|
||||
# [Appearance]
|
||||
# style=kvantum
|
||||
# '';
|
||||
# #icon_theme=${cfg.iconThemeName}
|
||||
|
||||
xdg.configFile."qt5ct/qt5ct.conf" = {
|
||||
text = ''
|
||||
|
||||
[Appearance]
|
||||
color_scheme_path=/home/${username}/.config/qt5ct/colors/tokyonight.conf
|
||||
custom_palette=true
|
||||
|
|
@ -128,6 +88,7 @@ in
|
|||
};
|
||||
xdg.configFile."qt6ct/qt6ct.conf" = {
|
||||
text = ''
|
||||
|
||||
[Appearance]
|
||||
color_scheme_path=/home/${username}/.config/qt6ct/colors/tokyonight.conf
|
||||
custom_palette=true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue