comparing ecad271fba0dc74a1cabb4b597ebb115e682604a and main on aylac.top/nixcfg-own-knot

+1 -3

homes/ayla/default.nix

···

       135
        
             };

     

       136
        
       

     

       137
        
             myHome = {

     

       138
       -
               desktop = {

     

       139
       -
                 gnome.enable = true;

     

       140
       -
               };

     

       141
        
       

     

       142
        
               programs = {

     

       143
        
                 lutris.enable = true;

···

       135
        
             };

     

       136
        
       

     

       137
        
             myHome = {

     

       138
       +
               desktop.gnome.enable = true;

     

       0
        
       
     

       0
        
       
     

       139
        
       

     

       140
        
               programs = {

     

       141
        
                 lutris.enable = true;

+51

modules/home/desktop/cosmic/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         config,

     

       4
       +
         pkgs,

     

       5
       +
         ...

     

       6
       +
       }: {

     

       7
       +
         options.myHome.desktop.cosmic = {

     

       8
       +
           enable = lib.mkEnableOption "COSMIC desktop environment";

     

       9
       +
         };

     

       10
       +
       

     

       11
       +
         config = lib.mkIf config.myHome.desktop.cosmic.enable {

     

       12
       +
           dconf = {

     

       13
       +
             enable = true;

     

       14
       +
       

     

       15
       +
             settings = {

     

       16
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:close";

     

       17
       +
             };

     

       18
       +
           };

     

       19
       +
       

     

       20
       +
           myHome.profiles.defaultApps = {

     

       21
       +
             audioPlayer = {

     

       22
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       +
             };

     

       25
       +
             editor = {

     

       26
       +
               package = lib.mkDefault pkgs.cosmic-edit;

     

       27
       +
               icon = lib.mkDefault "com.system76.CosmicEdit";

     

       28
       +
             };

     

       29
       +
             fileManager = {

     

       30
       +
               package = lib.mkDefault pkgs.cosmic-files;

     

       31
       +
               icon = lib.mkDefault "com.system76.CosmicFiles";

     

       32
       +
             };

     

       33
       +
             imageViewer = {

     

       34
       +
               package = lib.mkDefault pkgs.loupe;

     

       35
       +
               icon = lib.mkDefault "org.gnome.Loupe";

     

       36
       +
             };

     

       37
       +
             pdfViewer = {

     

       38
       +
               package = lib.mkDefault pkgs.papers;

     

       39
       +
               icon = lib.mkDefault "org.gnome.Papers";

     

       40
       +
             };

     

       41
       +
             terminal = {

     

       42
       +
               package = lib.mkDefault pkgs.cosmic-term;

     

       43
       +
               icon = lib.mkDefault "com.system76.CosmicTerm";

     

       44
       +
             };

     

       45
       +
             videoPlayer = {

     

       46
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       47
       +
               icon = lib.mkDefault "mpv";

     

       48
       +
             };

     

       49
       +
           };

     

       50
       +
         };

     

       51
       +
       }

+1

modules/home/desktop/default.nix

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       0
        
       
     

       10
        
         ];

     

       11
        
       

     

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

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       10
       +
           ./cosmic

     

       11
        
         ];

     

       12
        
       

     

       13
        
         options.myHome.desktop.enable = lib.mkOption {

+2

modules/home/desktop/gnome/default.nix

···

       93
        
                 switch-to-workspace-up = [];

     

       94
        
                 toggle-fullscreen = ["<Super>w"];

     

       95
        
               };

     

       0
        
       
     

       0
        
       
     

       96
        
             };

     

       97
        
           };

     

       98

···

       93
        
                 switch-to-workspace-up = [];

     

       94
        
                 toggle-fullscreen = ["<Super>w"];

     

       95
        
               };

     

       96
       +
       

     

       97
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:close";

     

       98
        
             };

     

       99
        
           };

     

       100

+42 -1

modules/home/desktop/plasma/default.nix

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         config,

     

       0
        
       
     

       4
        
         ...

     

       5
        
       }: {

     

       6
        
         options.myHome.desktop.plasma = {

     

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

     

       8
        
         };

     

       9
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
       }

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         config,

     

       4
       +
         pkgs,

     

       5
        
         ...

     

       6
        
       }: {

     

       7
        
         options.myHome.desktop.plasma = {

     

       8
        
           enable = lib.mkEnableOption "KDE Plasma desktop environment";

     

       9
        
         };

     

       10
        
       

     

       11
       +
         config = lib.mkIf config.myHome.desktop.plasma.enable {

     

       12
       +
           dconf = {

     

       13
       +
             enable = true;

     

       14
       +
       

     

       15
       +
             settings = {

     

       16
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:minimize,maximize,close";

     

       17
       +
             };

     

       18
       +
           };

     

       19
       +
       

     

       20
       +
           myHome.profiles.defaultApps = {

     

       21
       +
             audioPlayer = {

     

       22
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       +
             };

     

       25
       +
             editor = {

     

       26
       +
               package = lib.mkDefault pkgs.kdePackages.kate;

     

       27
       +
               icon = lib.mkDefault "org.kde.kate";

     

       28
       +
             };

     

       29
       +
             fileManager = {

     

       30
       +
               package = lib.mkDefault pkgs.kdePackages.dolphin;

     

       31
       +
               exec = lib.mkDefault (lib.getExe config.myHome.profiles.defaultApps.fileManager.package);

     

       32
       +
               icon = lib.mkDefault "org.kde.dolphin";

     

       33
       +
             };

     

       34
       +
             imageViewer = {

     

       35
       +
               package = lib.mkDefault pkgs.kdePackages.gwenview;

     

       36
       +
               icon = lib.mkDefault "org.kde.gwenview";

     

       37
       +
             };

     

       38
       +
             pdfViewer = {

     

       39
       +
               package = lib.mkDefault pkgs.kdePackages.okular;

     

       40
       +
               icon = lib.mkDefault "org.kde.okular";

     

       41
       +
             };

     

       42
       +
             terminal = {

     

       43
       +
               package = lib.mkDefault pkgs.kdePackages.konsole;

     

       44
       +
               icon = lib.mkDefault "org.kde.konsole";

     

       45
       +
             };

     

       46
       +
             videoPlayer = {

     

       47
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       48
       +
               icon = lib.mkDefault "mpv";

     

       49
       +
             };

     

       50
       +
           };

     

       51
       +
         };

     

       52
        
       }

+24

modules/nixos/desktop/cosmic/default.nix

···

       1
       +
       {

     

       2
       +
         config,

     

       3
       +
         lib,

     

       4
       +
         pkgs,

     

       5
       +
         ...

     

       6
       +
       }: {

     

       7
       +
         options.myNixOS.desktop.cosmic.enable = lib.mkEnableOption "COSMIC desktop environment";

     

       8
       +
       

     

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

     

       10
       +
           home-manager.sharedModules = [

     

       11
       +
             {

     

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

     

       13
       +
             }

     

       14
       +
           ];

     

       15
       +
       

     

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

     

       17
       +
             cosmic-store

     

       18
       +
           ];

     

       19
       +
       

     

       20
       +
           services.desktopManager.cosmic.enable = true;

     

       21
       +
           system.nixos.tags = ["cosmic"];

     

       22
       +
           myNixOS.desktop.enable = true;

     

       23
       +
         };

     

       24
       +
       }

+1

modules/nixos/desktop/default.nix

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       0
        
       
     

       10
        
         ];

     

       11
        
       

     

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

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       10
       +
           ./cosmic

     

       11
        
         ];

     

       12
        
       

     

       13
        
         options.myNixOS.desktop.enable = lib.mkOption {

+2 -3

modules/nixos/desktop/gnome/default.nix

···

       51
        
             ];

     

       52
        
           };

     

       53
        
       

     

       54
       -
           myNixOS = {

     

       55
       -
             desktop.enable = true;

     

       56
       -
           };

     

       57
        
       

     

       58
        
           #qt = {

     

       59
        
           #  enable = true;

···

       51
        
             ];

     

       52
        
           };

     

       53
        
       

     

       54
       +
           myNixOS.desktop.enable = true;

     

       55
       +
           system.nixos.tags = ["gnome"];

     

       0
        
       
     

       56
        
       

     

       57
        
           #qt = {

     

       58
        
           #  enable = true;

+2

modules/nixos/desktop/plasma/default.nix

···

       21
        
           ];

     

       22
        
       

     

       23
        
           services.desktopManager.plasma6.enable = true;

     

       0
        
       
     

       0
        
       
     

       24
        
         };

     

       25
        
       }

···

       21
        
           ];

     

       22
        
       

     

       23
        
           services.desktopManager.plasma6.enable = true;

     

       24
       +
           system.nixos.tags = ["plasma"];

     

       25
       +
           myNixOS.desktop.enable = true;

     

       26
        
         };

     

       27
        
       }

-2

modules/nixos/profiles/workstation/default.nix

···

       111
        
               enableSystemSlice = true;

     

       112
        
               enableUserSlices = true;

     

       113
        
             };

     

       114
       -
             # i hate these guys

     

       115
       -
             coredump.enable = false;

     

       116
        
           };

     

       117
        
       

     

       118
        
           zramSwap = {

···

       111
        
               enableSystemSlice = true;

     

       112
        
               enableUserSlices = true;

     

       113
        
             };

     

       0
        
       
     

       0
        
       
     

       114
        
           };

     

       115
        
       

     

       116
        
           zramSwap = {

Compare changes