Compare commits
3 commits
bf7cd5544c
...
fe37f8ad86
Author | SHA1 | Date | |
---|---|---|---|
fe37f8ad86 | |||
077de7bd0d | |||
b0440fa4c1 |
5 changed files with 32 additions and 17 deletions
|
@ -9,6 +9,10 @@ with lib; let
|
||||||
in {
|
in {
|
||||||
options.local.defaultDesktopPack = {
|
options.local.defaultDesktopPack = {
|
||||||
enable = mkEnableOption "common desktop programs and services";
|
enable = mkEnableOption "common desktop programs and services";
|
||||||
|
laptop = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
|
@ -12,7 +12,13 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.firefox.enable = true;
|
programs.firefox = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.firefox.override {
|
||||||
|
nativeMessagingHosts = [pkgs.passff-host];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
xdg = {
|
xdg = {
|
||||||
mimeApps = {
|
mimeApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
cfg = config.local.gui;
|
cfg = config.local.gui;
|
||||||
laptop = config.trivium.laptop.enable;
|
laptop = config.local.defaultDesktopPack.laptop;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
|
@ -26,20 +26,22 @@ in {
|
||||||
"clock"
|
"clock"
|
||||||
];
|
];
|
||||||
|
|
||||||
modules-right = [
|
modules-right =
|
||||||
"privacy"
|
[
|
||||||
"cpu"
|
"privacy"
|
||||||
"memory"
|
"cpu"
|
||||||
"disk"
|
"memory"
|
||||||
"temperature"
|
"disk"
|
||||||
"keyboard-state"
|
"temperature"
|
||||||
"tray"
|
"keyboard-state"
|
||||||
] ++ lists.optionals laptop [
|
"tray"
|
||||||
"battery"
|
]
|
||||||
];
|
++ lists.optionals laptop [
|
||||||
|
"battery"
|
||||||
|
];
|
||||||
"battery" = mkIf laptop {
|
"battery" = mkIf laptop {
|
||||||
format = "{capacity}% {icon}";
|
format = "{capacity}% {icon}";
|
||||||
format-icons = ["" "" "" "" ""];
|
format-icons = ["" "" "" "" ""];
|
||||||
};
|
};
|
||||||
"keyboard-state" = {
|
"keyboard-state" = {
|
||||||
numlock = true;
|
numlock = true;
|
||||||
|
|
|
@ -11,7 +11,10 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
local = {
|
local = {
|
||||||
defaultDesktopPack.enable = true;
|
defaultDesktopPack = {
|
||||||
|
enable = true;
|
||||||
|
laptop = true;
|
||||||
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
gpg.defaultKey = "7206D8EE2474F3DF18EA876F0EC1691FF8C1A81F";
|
gpg.defaultKey = "7206D8EE2474F3DF18EA876F0EC1691FF8C1A81F";
|
||||||
|
|
|
@ -23,7 +23,7 @@ with lib; {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
server = {
|
server = {
|
||||||
hosts = [ "127.0.0.1:5232" ];
|
hosts = ["127.0.0.1:5232"];
|
||||||
};
|
};
|
||||||
auth = {
|
auth = {
|
||||||
type = "htpasswd";
|
type = "htpasswd";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue