temporary fix for recursion, remove duplicate hostname in main config
This commit is contained in:
parent
d2f8f28143
commit
00c2c2afef
9 changed files with 37 additions and 58 deletions
|
@ -1,11 +1,8 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
}: let
|
||||
cfg = config.my;
|
||||
in {
|
||||
imports = [
|
||||
|
|
|
@ -6,18 +6,18 @@
|
|||
}: let
|
||||
cfg = config.my.gnome;
|
||||
|
||||
applyGnomeUserSettings = {
|
||||
home.packages = with pkgs; [
|
||||
gnome.gpaste
|
||||
amberol
|
||||
];
|
||||
#applyGnomeUserSettings = {
|
||||
# home.packages = with pkgs; [
|
||||
# gnome.gpaste
|
||||
# amberol
|
||||
# ];
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/peripherals/keyboard" = {
|
||||
numlock-state = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
# dconf.settings = {
|
||||
# "org/gnome/desktop/peripherals/keyboard" = {
|
||||
# numlock-state = true;
|
||||
# };
|
||||
# };
|
||||
#};
|
||||
in {
|
||||
options.my.gnome = {
|
||||
enable = lib.mkEnableOption "gnome desktop";
|
||||
|
@ -56,8 +56,8 @@ in {
|
|||
];
|
||||
|
||||
home-manager.users = {
|
||||
vinzenz = lib.mkIf config.my.home.vinzenz.enable applyGnomeUserSettings;
|
||||
ronja = lib.mkIf config.my.home.ronja.enable applyGnomeUserSettings;
|
||||
# vinzenz = lib.mkIf config.my.home.vinzenz.enable applyGnomeUserSettings;
|
||||
# ronja = lib.mkIf config.my.home.ronja.enable applyGnomeUserSettings;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
}: let
|
||||
cfg = config.my.kde;
|
||||
|
||||
applyKdeUserSettings = {
|
||||
#home = {
|
||||
# packages = with pkgs; [
|
||||
# ];
|
||||
#};
|
||||
# applyKdeUserSettings = {
|
||||
# #home = {
|
||||
# # packages = with pkgs; [
|
||||
# # ];
|
||||
# #};
|
||||
|
||||
services.kdeconnect = {
|
||||
enable = true;
|
||||
indicator = true;
|
||||
};
|
||||
};
|
||||
# services.kdeconnect = {
|
||||
# enable = true;
|
||||
# indicator = true;
|
||||
# };
|
||||
# };
|
||||
in {
|
||||
options.my.kde = {
|
||||
enable = lib.mkEnableOption "KDE desktop";
|
||||
|
@ -55,8 +55,8 @@ in {
|
|||
};
|
||||
|
||||
home-manager.users = {
|
||||
vinzenz = lib.mkIf config.my.home.vinzenz.enable applyKdeUserSettings;
|
||||
ronja = lib.mkIf config.my.home.ronja.enable applyKdeUserSettings;
|
||||
#vinzenz = lib.mkIf config.my.home.vinzenz.enable applyKdeUserSettings;
|
||||
#ronja = lib.mkIf config.my.home.ronja.enable applyKdeUserSettings;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
}: let
|
||||
cfg = config.my.home;
|
||||
in {
|
||||
imports = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue