Working on reshuffling
This commit is contained in:
+13
-6
@@ -1124,29 +1124,36 @@ in
|
|||||||
** =generated/modules/desktop/waybar.nix=
|
** =generated/modules/desktop/waybar.nix=
|
||||||
This file installs and configures waybar
|
This file installs and configures waybar
|
||||||
#+BEGIN_SRC nix :tangle generated/modules/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html
|
#+BEGIN_SRC nix :tangle generated/modules/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html
|
||||||
# waybar.nix
|
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
username = "henrov";
|
username = "henrov";
|
||||||
waybarAssets = ../../../assets/system/conf/waybar;
|
waybarAssets = ../../../assets/system/conf/waybar;
|
||||||
waybarFiles = builtins.readDir waybarAssets;
|
waybarFiles = builtins.readDir waybarAssets;
|
||||||
waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: {
|
waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: {
|
||||||
src = "${waybarAssets}/${name}";
|
src = "${waybarAssets}/${name}";
|
||||||
});
|
});
|
||||||
|
|
||||||
enableWaybar = true;
|
enableWaybar = true;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# Declare a top-level option
|
||||||
|
options.myApps = lib.mkOption {
|
||||||
|
type = lib.types.attrsOf lib.types.any;
|
||||||
|
default = {};
|
||||||
|
description = "Top-level collection of custom apps";
|
||||||
|
};
|
||||||
|
|
||||||
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
||||||
|
|
||||||
|
# Everything goes under config safely
|
||||||
config = lib.mkIf enableWaybar {
|
config = lib.mkIf enableWaybar {
|
||||||
myApps = {
|
myApps = {
|
||||||
waybar = {
|
waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = username;
|
user = username;
|
||||||
assetsDir = waybarAssets;
|
assetsDir = waybarAssets;
|
||||||
files = waybarConfs;
|
files = waybarConfs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,26 +1,33 @@
|
|||||||
# waybar.nix
|
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
username = "henrov";
|
username = "henrov";
|
||||||
waybarAssets = ../../../assets/system/conf/waybar;
|
waybarAssets = ../../../assets/system/conf/waybar;
|
||||||
waybarFiles = builtins.readDir waybarAssets;
|
waybarFiles = builtins.readDir waybarAssets;
|
||||||
waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: {
|
waybarConfs = lib.genAttrs (builtins.attrNames waybarFiles) (name: {
|
||||||
src = "${waybarAssets}/${name}";
|
src = "${waybarAssets}/${name}";
|
||||||
});
|
});
|
||||||
|
|
||||||
enableWaybar = true;
|
enableWaybar = true;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
# Declare a top-level option
|
||||||
|
options.myApps = lib.mkOption {
|
||||||
|
type = lib.types.attrsOf lib.types.any;
|
||||||
|
default = {};
|
||||||
|
description = "Top-level collection of custom apps";
|
||||||
|
};
|
||||||
|
|
||||||
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
||||||
|
|
||||||
|
# Everything goes under config safely
|
||||||
config = lib.mkIf enableWaybar {
|
config = lib.mkIf enableWaybar {
|
||||||
myApps = {
|
myApps = {
|
||||||
waybar = {
|
waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = username;
|
user = username;
|
||||||
assetsDir = waybarAssets;
|
assetsDir = waybarAssets;
|
||||||
files = waybarConfs;
|
files = waybarConfs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user