feature(lib for bgs) adding a library for backgrounds
This commit is contained in:
@@ -110,6 +110,10 @@ in
|
||||
in
|
||||
{
|
||||
normal = {
|
||||
C-up = "move_visual_line_up";
|
||||
C-down = "move_visual_line_down";
|
||||
C-left = "move_prev_word_start";
|
||||
C-right = "move_next_word_start";
|
||||
d = {
|
||||
d = [
|
||||
"extend_to_line_bounds"
|
||||
@@ -146,6 +150,10 @@ in
|
||||
space = spaceMode;
|
||||
};
|
||||
insert = {
|
||||
C-up = "move_visual_line_up";
|
||||
C-down = "move_visual_line_down";
|
||||
C-left = "move_prev_word_start";
|
||||
C-right = "move_next_word_start";
|
||||
C-v = "paste_clipboard_after";
|
||||
C-c = "yank_to_clipboard";
|
||||
C-x = "completion";
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
config,
|
||||
lib,
|
||||
osConfig,
|
||||
cLib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -12,6 +13,9 @@ let
|
||||
|
||||
hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
|
||||
# hyprlockPkg = pkgs.hyprlock;
|
||||
#
|
||||
bg = osConfig.settings.theme.background;
|
||||
inherit (cLib.theme.bgs) resolve;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -33,7 +37,7 @@ in
|
||||
background = [
|
||||
{
|
||||
monitor = "";
|
||||
path = osConfig.settings.theme.background.lockscreen;
|
||||
path = resolve bg.lockscreen;
|
||||
}
|
||||
];
|
||||
input-field = [
|
||||
|
||||
@@ -115,11 +115,10 @@
|
||||
"disable-scroll": true,
|
||||
"format": "{icon}",
|
||||
"format-icons": {
|
||||
"4": "",
|
||||
"active": "",
|
||||
"default": "",
|
||||
"empty": "",
|
||||
"persistent": ""
|
||||
"active": "",
|
||||
"default": "",
|
||||
"empty": "",
|
||||
"persistent": ""
|
||||
},
|
||||
"on-click": "activate",
|
||||
"persistent-workspaces": {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
osConfig,
|
||||
cLib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -13,22 +14,29 @@ let
|
||||
|
||||
hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default;
|
||||
|
||||
bgs = {
|
||||
wallpaper_1 = "~/media/images/bg_1.jpg";
|
||||
wallpaper_2 = "~/media/images/bg_2.jpg";
|
||||
wallpaper_3 = "~/media/images/bg_3.jpg";
|
||||
wallpaper_4 = "~/media/images/waterwindow.jpg";
|
||||
wallpaper_5 = "~/media/images/barngreet.png";
|
||||
};
|
||||
|
||||
resolve = name: if name == null then null else bgs.${name};
|
||||
bg = osConfig.settings.theme.background;
|
||||
|
||||
wallpapers = builtins.filter (x: x != null) [
|
||||
"DP-3,${resolve bg.primary}"
|
||||
(if bg.secondary != null then "HDMI-A-1,${resolve bg.secondary}" else null)
|
||||
"eDP-1,${resolve bg.primary}"
|
||||
"DVI-D-1,${resolve bg.primary}"
|
||||
bgs = cLib.theme.bgs;
|
||||
|
||||
wallpapers = map (m: "${m.monitor},${bgs.resolve m.bg}") monitorMappings;
|
||||
|
||||
monitorMappings = [
|
||||
{
|
||||
monitor = "DP-3";
|
||||
bg = bg.primary;
|
||||
}
|
||||
{
|
||||
monitor = "HDMI-A-1";
|
||||
bg = bg.secondary;
|
||||
}
|
||||
{
|
||||
monitor = "eDP-1";
|
||||
bg = bg.primary;
|
||||
}
|
||||
{
|
||||
monitor = "DVI-D-1";
|
||||
bg = bg.primary;
|
||||
}
|
||||
];
|
||||
in
|
||||
{
|
||||
@@ -46,8 +54,7 @@ in
|
||||
splash = false;
|
||||
splash_offset = 2.0;
|
||||
|
||||
preload = builtins.attrValues bgs;
|
||||
|
||||
preload = bgs.all;
|
||||
wallpaper = wallpapers;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user