fix ui
This commit is contained in:
@@ -4,10 +4,10 @@
|
|||||||
services.nextcloud-client.enable = true;
|
services.nextcloud-client.enable = true;
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
xfce.thunar
|
thunar
|
||||||
xfce.thunar-volman
|
thunar-volman
|
||||||
xfce.thunar-archive-plugin
|
thunar-archive-plugin
|
||||||
xfce.tumbler
|
tumbler
|
||||||
|
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
discord-canary
|
discord-canary
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ in {
|
|||||||
name = "${config.colorscheme.slug}-Dark";
|
name = "${config.colorscheme.slug}-Dark";
|
||||||
package = gtkThemeFromScheme;
|
package = gtkThemeFromScheme;
|
||||||
};
|
};
|
||||||
|
gtk4.theme = config.gtk.theme;
|
||||||
iconTheme = {
|
iconTheme = {
|
||||||
name = "tela-circle-icon-theme";
|
name = "tela-circle-icon-theme";
|
||||||
package = pkgs.tela-circle-icon-theme;
|
package = pkgs.tela-circle-icon-theme;
|
||||||
@@ -30,7 +31,7 @@ in {
|
|||||||
platformTheme.name = "gtk";
|
platformTheme.name = "gtk";
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = [ wallpaperGen pkgs.swww ];
|
home.packages = [ wallpaperGen pkgs.awww ];
|
||||||
|
|
||||||
xdg.configFile."script/wallpaper.sh".text = ''
|
xdg.configFile."script/wallpaper.sh".text = ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
@@ -49,7 +50,7 @@ in {
|
|||||||
|
|
||||||
IMG=$WPDIR/$(echo "$RES" | wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
|
IMG=$WPDIR/$(echo "$RES" | wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
|
||||||
IMG=$(echo "$IMG" | awk -F ':' '{print $2}')
|
IMG=$(echo "$IMG" | awk -F ':' '{print $2}')
|
||||||
swww img $IMG
|
awww img $IMG
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ let
|
|||||||
colors = config.colorScheme.palette;
|
colors = config.colorScheme.palette;
|
||||||
mediaImages = config.syscfg.media.main;
|
mediaImages = config.syscfg.media.main;
|
||||||
mediaNames = map (image: builtins.baseNameOf (toString image)) mediaImages;
|
mediaNames = map (image: builtins.baseNameOf (toString image)) mediaImages;
|
||||||
|
mediaSourceDir = pkgs.linkFarm "wallpaper-media" (
|
||||||
|
map (image: {
|
||||||
|
name = builtins.baseNameOf (toString image);
|
||||||
|
path = image;
|
||||||
|
}) mediaImages
|
||||||
|
);
|
||||||
|
|
||||||
dither = "atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
|
dither = "atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
|
||||||
paletteSize = 0;
|
paletteSize = 0;
|
||||||
@@ -99,10 +105,9 @@ let
|
|||||||
);
|
);
|
||||||
|
|
||||||
buildCommands =
|
buildCommands =
|
||||||
lib.concatMapStringsSep "\n" (image:
|
lib.concatMapStringsSep "\n" (name:
|
||||||
let
|
let
|
||||||
source = toString image;
|
source = "${mediaSourceDir}/${name}";
|
||||||
name = builtins.baseNameOf source;
|
|
||||||
target = "build/${name}";
|
target = "build/${name}";
|
||||||
in
|
in
|
||||||
if lib.hasSuffix ".gif" (lib.toLower name) then ''
|
if lib.hasSuffix ".gif" (lib.toLower name) then ''
|
||||||
@@ -110,7 +115,7 @@ let
|
|||||||
'' else ''
|
'' else ''
|
||||||
repalette ${lib.escapeShellArg source} ${lib.escapeShellArg target} -p ${lib.escapeShellArg paletteHex} --dither ${lib.escapeShellArg dither}
|
repalette ${lib.escapeShellArg source} ${lib.escapeShellArg target} -p ${lib.escapeShellArg paletteHex} --dither ${lib.escapeShellArg dither}
|
||||||
''
|
''
|
||||||
) mediaImages;
|
) mediaNames;
|
||||||
in
|
in
|
||||||
assert lib.assertMsg
|
assert lib.assertMsg
|
||||||
(builtins.length mediaNames == builtins.length (lib.unique mediaNames))
|
(builtins.length mediaNames == builtins.length (lib.unique mediaNames))
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
min_icon_size = 32;
|
min_icon_size = 32;
|
||||||
max_icon_size = 64;
|
max_icon_size = 64;
|
||||||
|
|
||||||
icon_path =
|
icon_path = lib.mkForce
|
||||||
"${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/status:${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/device ";
|
"${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/status:${pkgs.tela-circle-icon-theme}/share/icons/Tela-circle-dark/32/device ";
|
||||||
icon_theme = "Tela-circle-dark";
|
icon_theme = "Tela-circle-dark";
|
||||||
enable_recursive_icon_lookup = "true";
|
enable_recursive_icon_lookup = "true";
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ in {
|
|||||||
glib
|
glib
|
||||||
|
|
||||||
brightnessctl
|
brightnessctl
|
||||||
swww
|
awww
|
||||||
];
|
];
|
||||||
|
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
programs.xwayland.enable = true;
|
programs.xwayland.enable = true;
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
videoDrivers = [ "amd" ];
|
videoDrivers = [ "amdgpu" ];
|
||||||
xkb = {
|
xkb = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
variant = "intl";
|
variant = "intl";
|
||||||
|
|||||||
Reference in New Issue
Block a user