Working on reshuffling
This commit is contained in:
+16
-14
@@ -1124,6 +1124,7 @@ 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
|
||||||
@@ -1137,16 +1138,16 @@ let
|
|||||||
enableWaybar = true;
|
enableWaybar = true;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Declare a top-level module option
|
|
||||||
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
||||||
|
|
||||||
# All actual module configuration wrapped safely
|
|
||||||
config = lib.mkIf enableWaybar {
|
config = lib.mkIf enableWaybar {
|
||||||
waybar = {
|
myApps = {
|
||||||
enable = true; # symbolic enable flag
|
waybar = {
|
||||||
user = username;
|
enable = true;
|
||||||
assetsDir = waybarAssets;
|
user = username;
|
||||||
files = waybarConfs; # contains "config" and "style.css" keys
|
assetsDir = waybarAssets;
|
||||||
|
files = waybarConfs;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1998,6 +1999,7 @@ the top of the file."
|
|||||||
** =generated/modules/apps/wofi.nix=
|
** =generated/modules/apps/wofi.nix=
|
||||||
This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
|
This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
|
||||||
#+BEGIN_SRC nix :tangle generated/modules/apps/wofi.nix :noweb tangle :mkdirp yes :eval never-html
|
#+BEGIN_SRC nix :tangle generated/modules/apps/wofi.nix :noweb tangle :mkdirp yes :eval never-html
|
||||||
|
# wofi.nix
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -2007,18 +2009,18 @@ let
|
|||||||
src = "${wofiAssets}/${name}";
|
src = "${wofiAssets}/${name}";
|
||||||
});
|
});
|
||||||
|
|
||||||
enableWofi = true; # toggle on/off
|
enableWofi = true;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
|
options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
|
||||||
|
|
||||||
# Everything is wrapped safely in config
|
|
||||||
config = lib.mkIf enableWofi {
|
config = lib.mkIf enableWofi {
|
||||||
# Just symbolic references to files, no pkgs or recursive config
|
myApps = {
|
||||||
programs.wofi = {
|
wofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = wofiAssets;
|
assetsDir = wofiAssets;
|
||||||
files = wofiConfs;
|
files = wofiConfs;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# wofi.nix
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -7,18 +8,18 @@ let
|
|||||||
src = "${wofiAssets}/${name}";
|
src = "${wofiAssets}/${name}";
|
||||||
});
|
});
|
||||||
|
|
||||||
enableWofi = true; # toggle on/off
|
enableWofi = true;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
|
options.enableWofi = lib.mkEnableOption "Enable Wofi terminal launcher";
|
||||||
|
|
||||||
# Everything is wrapped safely in config
|
|
||||||
config = lib.mkIf enableWofi {
|
config = lib.mkIf enableWofi {
|
||||||
# Just symbolic references to files, no pkgs or recursive config
|
myApps = {
|
||||||
programs.wofi = {
|
wofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
assetsDir = wofiAssets;
|
assetsDir = wofiAssets;
|
||||||
files = wofiConfs;
|
files = wofiConfs;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# waybar.nix
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -11,16 +12,16 @@ let
|
|||||||
enableWaybar = true;
|
enableWaybar = true;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Declare a top-level module option
|
|
||||||
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
options.enableWaybar = lib.mkEnableOption "Enable Waybar status bar";
|
||||||
|
|
||||||
# All actual module configuration wrapped safely
|
|
||||||
config = lib.mkIf enableWaybar {
|
config = lib.mkIf enableWaybar {
|
||||||
waybar = {
|
myApps = {
|
||||||
enable = true; # symbolic enable flag
|
waybar = {
|
||||||
user = username;
|
enable = true;
|
||||||
assetsDir = waybarAssets;
|
user = username;
|
||||||
files = waybarConfs; # contains "config" and "style.css" keys
|
assetsDir = waybarAssets;
|
||||||
|
files = waybarConfs;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user