Switch to nixfmt

This commit is contained in:
SebastianStork 2024-05-19 20:00:58 +02:00
parent 1d70117186
commit b38d2df431
55 changed files with 1559 additions and 1540 deletions

View file

@ -1,9 +1,5 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.bottom;
flags = ["--group"];
basePackage = pkgs.bottom;
flags = [ "--group" ];
}

View file

@ -1,21 +1,24 @@
{
inputs,
pkgs,
lib,
...
}: let
assembleWrapper = wrapperConfig:
(inputs.wrapper-manager.lib {
inherit pkgs;
modules = [{wrappers.wrappedPackage = wrapperConfig;}];
})
.config
.wrappers
.wrappedPackage
.wrapped;
in {
_module.args.wrappers = lib.pipe (builtins.readDir ./.) [
(lib.filterAttrs (name: value: name != "default.nix"))
(lib.concatMapAttrs (name: _: {${lib.removeSuffix ".nix" name} = import ./${name} {inherit assembleWrapper pkgs lib;};}))
];
inputs,
pkgs,
lib,
...
}:
let
assembleWrapper =
wrapperConfig:
(inputs.wrapper-manager.lib {
inherit pkgs;
modules = [ { wrappers.wrappedPackage = wrapperConfig; } ];
}).config.wrappers.wrappedPackage.wrapped;
in
{
_module.args.wrappers = lib.pipe (builtins.readDir ./.) [
(lib.filterAttrs (name: value: name != "default.nix"))
(lib.concatMapAttrs (
name: _: {
${lib.removeSuffix ".nix" name} = import ./${name} { inherit assembleWrapper pkgs lib; };
}
))
];
}

View file

@ -1,25 +1,23 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.hyprlock;
basePackage = pkgs.hyprlock;
flags = let
hyprlock-config = pkgs.writeText "hyprlock-config" ''
background {
monitor =
path = screenshot
blur_size = 4
blur_passes = 1
}
input-field {
monitor =
}
'';
in [
"--config"
hyprlock-config
flags =
let
hyprlock-config = pkgs.writeText "hyprlock-config" ''
background {
monitor =
path = screenshot
blur_size = 4
blur_passes = 1
}
input-field {
monitor =
}
'';
in
[
"--config"
hyprlock-config
];
}

View file

@ -1,19 +1,17 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.hyprpaper;
basePackage = pkgs.hyprpaper;
flags = let
hyprpaper-config = pkgs.writeText "hyprpaper-config" ''
preload = ~/Pictures/.wallpaper
wallpaper = , ~/Pictures/.wallpaper
splash = false
'';
in [
"--config"
hyprpaper-config
flags =
let
hyprpaper-config = pkgs.writeText "hyprpaper-config" ''
preload = ~/Pictures/.wallpaper
wallpaper = , ~/Pictures/.wallpaper
splash = false
'';
in
[
"--config"
hyprpaper-config
];
}

View file

@ -1,39 +1,45 @@
{
assembleWrapper,
pkgs,
lib,
...
}: {theme ? "dark"}:
assembleWrapper,
pkgs,
lib,
...
}:
{
theme ? "dark",
}:
assembleWrapper {
basePackage = pkgs.kitty;
basePackage = pkgs.kitty;
flags = let
toKittyConfig = lib.generators.toKeyValue {
mkKeyValue = key: value: let
value' = (
if lib.isBool value
then lib.hm.booleans.yesNo value
else toString value
);
in "${key} ${value'}";
};
kitty-config = pkgs.writeText "kitty-config" (toKittyConfig {
font_family = "JetBrainsMono Nerd Font";
confirm_os_window_close = 0;
background_opacity = "0.85";
enable_audio_bell = false;
update_check_interval = 0;
cursor_shape = "beam";
});
kitty-theme = pkgs.writeText "kitty-theme" "include ${pkgs.kitty-themes}/share/kitty-themes/themes/${{
dark = "default.conf";
light = "GitHub_Light.conf";
flags =
let
toKittyConfig = lib.generators.toKeyValue {
mkKeyValue =
key: value:
let
value' = (if lib.isBool value then lib.hm.booleans.yesNo value else toString value);
in
"${key} ${value'}";
};
kitty-config = pkgs.writeText "kitty-config" (toKittyConfig {
font_family = "JetBrainsMono Nerd Font";
confirm_os_window_close = 0;
background_opacity = "0.85";
enable_audio_bell = false;
update_check_interval = 0;
cursor_shape = "beam";
});
kitty-theme = pkgs.writeText "kitty-theme" "include ${pkgs.kitty-themes}/share/kitty-themes/themes/${
{
dark = "default.conf";
light = "GitHub_Light.conf";
}
.${theme}}";
in [
"--config"
kitty-config
"--config"
kitty-theme
.${theme}
}";
in
[
"--config"
kitty-config
"--config"
kitty-theme
];
}

View file

@ -1,9 +1,5 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.marktext;
flags = ["--disable-gpu"];
basePackage = pkgs.marktext;
flags = [ "--disable-gpu" ];
}

View file

@ -1,9 +1,5 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.obsidian;
flags = ["--disable-gpu"];
basePackage = pkgs.obsidian;
flags = [ "--disable-gpu" ];
}

View file

@ -1,22 +1,30 @@
{
assembleWrapper,
pkgs,
lib,
...
}: {theme ? "dark"}:
assembleWrapper,
pkgs,
lib,
...
}:
{
theme ? "dark",
}:
assembleWrapper {
basePackage = pkgs.rofi-wayland;
basePackage = pkgs.rofi-wayland;
flags = let
color-file =
{
dark = ./dark.rasi;
light = ./light.rasi;
}
.${theme};
rofi-config = pkgs.concatText "rofi-config" [./config.rasi color-file];
in [
"-config"
rofi-config
flags =
let
color-file =
{
dark = ./dark.rasi;
light = ./light.rasi;
}
.${theme};
rofi-config = pkgs.concatText "rofi-config" [
./config.rasi
color-file
];
in
[
"-config"
rofi-config
];
}

View file

@ -1,9 +1,5 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.spotify;
flags = ["--disable-gpu"];
basePackage = pkgs.spotify;
flags = [ "--disable-gpu" ];
}

View file

@ -1,116 +1,114 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.waybar;
basePackage = pkgs.waybar;
flags = let
waybar-config = (pkgs.formats.json {}).generate "waybar-config" {
layer = "top";
position = "bottom";
spacing = 10;
flags =
let
waybar-config = (pkgs.formats.json { }).generate "waybar-config" {
layer = "top";
position = "bottom";
spacing = 10;
modules-left = ["clock"];
modules-center = ["hyprland/workspaces"];
modules-right = [
"tray"
"network"
"wireplumber"
"backlight"
"battery"
];
modules-left = [ "clock" ];
modules-center = [ "hyprland/workspaces" ];
modules-right = [
"tray"
"network"
"wireplumber"
"backlight"
"battery"
];
"hyprland/workspaces" = {
active-only = false;
all-outputs = true;
};
clock = {
format = " {:%H.%M}";
tooltip-format = "{:%d.%m.%Y}";
};
network = {
interval = 10;
format = "";
format-wifi = "{icon}";
format-icons = [
"󰤟"
"󰤢"
"󰤥"
"󰤨"
];
tooltip-format-wifi = "{essid} 󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}";
format-ethernet = "󰌗";
tooltip-format-ethernet = "󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}";
format-disconnected = "󰪎";
tooltip-format-disconnected = "Disconnected";
};
wireplumber = {
format = "{icon} {volume}%";
format-muted = "󰝟";
format-icons = [
"󰕿"
"󰖀"
"󰕾"
];
scroll-step = "5";
};
tray = {
icon-size = 20;
spacing = 6;
};
backlight = {
device = "amdgpu_bl1";
format = "{icon} {percent}%";
format-icons = [
"󰃞"
"󰃟"
"󰃠"
];
};
battery = {
states = {
warning = 15;
critical = 5;
};
format = "{icon} {capacity}%";
format-icons = [
"󰂎"
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
};
"hyprland/workspaces" = {
active-only = false;
all-outputs = true;
};
waybar-style = pkgs.writeText "waybar-style" ''
* {
border: none;
border-radius: 0px;
font-family: "Open Sans, Symbols Nerd Font Mono";
font-size: 15px;
}
'';
in [
"--config"
waybar-config
"--style"
waybar-style
clock = {
format = " {:%H.%M}";
tooltip-format = "{:%d.%m.%Y}";
};
network = {
interval = 10;
format = "";
format-wifi = "{icon}";
format-icons = [
"󰤟"
"󰤢"
"󰤥"
"󰤨"
];
tooltip-format-wifi = "{essid} 󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}";
format-ethernet = "󰌗";
tooltip-format-ethernet = "󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}";
format-disconnected = "󰪎";
tooltip-format-disconnected = "Disconnected";
};
wireplumber = {
format = "{icon} {volume}%";
format-muted = "󰝟";
format-icons = [
"󰕿"
"󰖀"
"󰕾"
];
scroll-step = "5";
};
tray = {
icon-size = 20;
spacing = 6;
};
backlight = {
device = "amdgpu_bl1";
format = "{icon} {percent}%";
format-icons = [
"󰃞"
"󰃟"
"󰃠"
];
};
battery = {
states = {
warning = 15;
critical = 5;
};
format = "{icon} {capacity}%";
format-icons = [
"󰂎"
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
};
};
waybar-style = pkgs.writeText "waybar-style" ''
* {
border: none;
border-radius: 0px;
font-family: "Open Sans, Symbols Nerd Font Mono";
font-size: 15px;
}
'';
in
[
"--config"
waybar-config
"--style"
waybar-style
];
}

View file

@ -1,9 +1,5 @@
{
assembleWrapper,
pkgs,
...
}:
{ assembleWrapper, pkgs, ... }:
assembleWrapper {
basePackage = pkgs.webcord;
flags = ["--disable-gpu"];
basePackage = pkgs.webcord;
flags = [ "--disable-gpu" ];
}