commit 74b1302aa5339542ca5559d506ed14962e9746cc · aylac.top/nixcfg-own-knot

+2 -1

modules/home/desktop/default.nix

···

       6
       6
        
       }: {

     

       7
       7
        
         imports = [

     

       8
       8
        
           ./gnome

     

       9
       9
       +
           ./plasma

     

       9
       10
        
         ];

     

       10
       11
        
       

     

       11
       12
        
         options.myHome.desktop.enable = lib.mkOption {

     

       12
       12
       -
           default = config.myHome.desktop.gnome.enable;

     

       13
       13
       +
           default = config.myHome.desktop.gnome.enable or config.myHome.desktop.plasma.enable;

     

       13
       14
        
           description = "Desktop environment configuration.";

     

       14
       15
        
           type = lib.types.bool;

     

       15
       16
        
         };

+11

modules/home/desktop/plasma/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }: {

     

       6
       6
       +
         options.myHome.desktop.plasma = {

     

       7
       7
       +
           enable = lib.mkEnableOption "KDE Plasma desktop environment";

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         config = lib.mkIf config.myHome.desktop.plasma.enable {};

     

       11
       11
       +
       }

+4 -1

modules/nixos/desktop/default.nix

···

       4
       4
        
         lib,

     

       5
       5
        
         ...

     

       6
       6
        
       }: {

     

       7
       7
       -
         imports = [./gnome];

     

       7
       7
       +
         imports = [

     

       8
       8
       +
           ./gnome

     

       9
       9
       +
           ./plasma

     

       10
       10
       +
         ];

     

       8
       11
        
       

     

       9
       12
        
         options.myNixOS.desktop.enable = lib.mkOption {

     

       10
       13
        
           default =

+1 -3

modules/nixos/desktop/gnome/default.nix

···

       13
       13
        
             }

     

       14
       14
        
           ];

     

       15
       15
        
       

     

       16
       16
       -
           services = {

     

       17
       17
       -
             desktopManager.gnome.enable = true;

     

       18
       18
       -
           };

     

       16
       16
       +
           services.desktopManager.gnome.enable = true;

     

       19
       17
        
       

     

       20
       18
        
           environment.gnome.excludePackages = with pkgs; [

     

       21
       19
        
             decibels

+25

modules/nixos/desktop/plasma/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         config,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: {

     

       7
       7
       +
         options.myNixOS.desktop.plasma.enable = lib.mkEnableOption "use kde plasma desktop environment";

     

       8
       8
       +
       

     

       9
       9
       +
         config = lib.mkIf config.myNixOS.desktop.plasma.enable {

     

       10
       10
       +
           home-manager.sharedModules = [

     

       11
       11
       +
             {

     

       12
       12
       +
               config.myHome.desktop.plasma.enable = true;

     

       13
       13
       +
             }

     

       14
       14
       +
           ];

     

       15
       15
       +
       

     

       16
       16
       +
           environment.plasma6.excludePackages = with pkgs; [

     

       17
       17
       +
             kdePackages.kwallet

     

       18
       18
       +
             kdePackages.kwallet-pam

     

       19
       19
       +
             kdePackages.kwalletmanager

     

       20
       20
       +
             kdePackages.wacomtablet

     

       21
       21
       +
           ];

     

       22
       22
       +
       

     

       23
       23
       +
           services.desktopManager.plasma6.enable = true;

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+1

modules/nixos/services/default.nix

···

       25
       25
        
           ./qbittorrent

     

       26
       26
        
           ./radicale

     

       27
       27
        
           ./redlib

     

       28
       28
       +
           ./sddm

     

       28
       29
        
           ./syncthing

     

       29
       30
        
           ./tailscale

     

       30
       31
        
           ./tangled-knot

+40

modules/nixos/services/sddm/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }: {

     

       6
       6
       +
         options.myNixOS.services.sddm = {

     

       7
       7
       +
           enable = lib.mkEnableOption "use sddm";

     

       8
       8
       +
       

     

       9
       9
       +
           autoLogin = lib.mkOption {

     

       10
       10
       +
             description = "User to autologin.";

     

       11
       11
       +
             default = null;

     

       12
       12
       +
             type = lib.types.nullOr lib.types.str;

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         config = lib.mkIf config.myNixOS.services.sddm.enable {

     

       17
       17
       +
           security.pam.services.sddm = {

     

       18
       18
       +
             enableGnomeKeyring = true;

     

       19
       19
       +
             gnupg.enable = true;

     

       20
       20
       +
             kwallet.enable = false;

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
           services = {

     

       24
       24
       +
             displayManager = {

     

       25
       25
       +
               autoLogin = lib.mkIf (config.myNixOS.services.sddm.autoLogin != null) {

     

       26
       26
       +
                 enable = true;

     

       27
       27
       +
                 user = config.myNixOS.services.sddm.autoLogin;

     

       28
       28
       +
               };

     

       29
       29
       +
       

     

       30
       30
       +
               sddm = {

     

       31
       31
       +
                 enable = true;

     

       32
       32
       +
                 wayland = {

     

       33
       33
       +
                   enable = true;

     

       34
       34
       +
                   compositor = "kwin";

     

       35
       35
       +
                 };

     

       36
       36
       +
               };

     

       37
       37
       +
             };

     

       38
       38
       +
           };

     

       39
       39
       +
         };

     

       40
       40
       +
       }