commit c99ed148bc987f520031ef0aac0c00f948fbaefe · kitten.sh/system

+6 -41

home/desktop/theme.nix

···

       1
       1
       -
       { lib, config, pkgs, ... }:

     

       1
       1
       +
       { lib, config, pkgs, ... } @ inputs:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       let

     

       5
       5
       +
         inherit (import ../../lib/theme.nix inputs) cursorTheme defaultFont iconTheme gtkTheme kvantumTheme;

     

       5
       6
        
         cfg = config.modules.desktop;

     

       6
       6
       -
       

     

       7
       7
       -
         cursorTheme = {

     

       8
       8
       -
           name = "macOS";

     

       9
       9
       -
           package = pkgs.apple-cursor;

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         iconTheme = {

     

       13
       13
       -
           name = "WhiteSur";

     

       14
       14
       -
           package = pkgs.whitesur-icon-theme.override {

     

       15
       15
       -
             boldPanelIcons = true;

     

       16
       16
       -
             alternativeIcons = true;

     

       17
       17
       -
           };

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         gtkTheme = {

     

       21
       21
       -
           name = "WhiteSur-Dark-solid";

     

       22
       22
       -
           package = pkgs.whitesur-gtk-theme;

     

       23
       23
       -
         };

     

       24
       24
       -
       

     

       25
       25
       -
         kvantumTheme = rec {

     

       26
       26
       -
           name = "WhiteSur-opaqueDark";

     

       27
       27
       -
           package = pkgs.stdenv.mkDerivation {

     

       28
       28
       -
             pname = "whitesur-kde";

     

       29
       29
       -
             version = pkgs.whitesur-kde.version;

     

       30
       30
       -
             src = pkgs.whitesur-kde.src;

     

       31
       31
       -
             installPhase = /*sh*/''

     

       32
       32
       -
               mkdir -p "$out/share/Kvantum/${name}"

     

       33
       33
       -
               cp -R Kvantum/**/* "$out/share/Kvantum/${name}"

     

       34
       34
       -
             '';

     

       35
       35
       -
           };

     

       36
       36
       -
         };

     

       37
       7
        
       in {

     

       38
       8
        
         options.modules.desktop.theme = {

     

       39
       9
        
           enable = mkOption {

     
···

       54
       24
        
           };

     

       55
       25
        
       

     

       56
       26
        
           home.packages = with pkgs; [

     

       57
       57
       -
             catppuccin-kvantum

     

       58
       27
        
             libsForQt5.qtstyleplugin-kvantum

     

       59
       28
        
             libsForQt5.qt5ct

     

       60
       29
        
           ];

     
···

       85
       54
        
             enable = true;

     

       86
       55
        
             inherit iconTheme;

     

       87
       56
        
             theme = gtkTheme;

     

       88
       88
       -
             font = {

     

       89
       89
       -
               name = "SF Pro Display";

     

       90
       90
       -
               package = pkgs.sf-pro;

     

       91
       91
       -
               size = 11;

     

       92
       92
       -
             };

     

       57
       57
       +
             font = defaultFont;

     

       93
       58
        
             gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";

     

       94
       59
        
             gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;

     

       95
       60
        
             gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;

     
···

       105
       70
        
           fonts.fontconfig = {

     

       106
       71
        
             enable = true;

     

       107
       72
        
             defaultFonts = {

     

       108
       108
       -
               serif = [ "Noto Serif" "Noto Color Emoji" ];

     

       109
       109
       -
               sansSerif = [ "Inter" "Noto Color Emoji" ];

     

       110
       110
       -
               monospace = [ "Dank Mono" "Roboto Mono" "Noto Color Emoji" ];

     

       73
       73
       +
               serif = [ "New York" "Noto Serif" "Noto Color Emoji" ];

     

       74
       74
       +
               sansSerif = [ "SF Pro Display" "Inter" "Noto Color Emoji" ];

     

       75
       75
       +
               monospace = [ "Dank Mono" "SF Mono" "Noto Color Emoji" ];

     

       111
       76
        
               emoji = [ "Noto Color Emoji" ];

     

       112
       77
        
             };

     

       113
       78
        
           };

+36

lib/theme.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         cursorTheme = {

     

       5
       5
       +
           name = "macOS";

     

       6
       6
       +
           package = pkgs.apple-cursor;

     

       7
       7
       +
         };

     

       8
       8
       +
         defaultFont = {

     

       9
       9
       +
           name = "SF Pro Display";

     

       10
       10
       +
           package = pkgs.sf-pro;

     

       11
       11
       +
           size = 11;

     

       12
       12
       +
         };

     

       13
       13
       +
         iconTheme = {

     

       14
       14
       +
           name = "WhiteSur";

     

       15
       15
       +
           package = pkgs.whitesur-icon-theme.override {

     

       16
       16
       +
             boldPanelIcons = true;

     

       17
       17
       +
             alternativeIcons = true;

     

       18
       18
       +
           };

     

       19
       19
       +
         };

     

       20
       20
       +
         gtkTheme = {

     

       21
       21
       +
           name = "WhiteSur-Dark-solid";

     

       22
       22
       +
           package = pkgs.whitesur-gtk-theme;

     

       23
       23
       +
         };

     

       24
       24
       +
         kvantumTheme = rec {

     

       25
       25
       +
           name = "WhiteSur-opaqueDark";

     

       26
       26
       +
           package = pkgs.stdenv.mkDerivation {

     

       27
       27
       +
             pname = "whitesur-kde";

     

       28
       28
       +
             version = pkgs.whitesur-kde.version;

     

       29
       29
       +
             src = pkgs.whitesur-kde.src;

     

       30
       30
       +
             installPhase = /*sh*/''

     

       31
       31
       +
               mkdir -p "$out/share/Kvantum/${name}"

     

       32
       32
       +
               cp -R Kvantum/**/* "$out/share/Kvantum/${name}"

     

       33
       33
       +
             '';

     

       34
       34
       +
           };

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+10 -2

modules/desktop/session.nix

···

       1
       1
       -
       { lib, config, pkgs, user, ... }:

     

       1
       1
       +
       { lib, config, pkgs, user, ... } @ inputs:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       let

     

       5
       5
       +
         inherit (import ../../lib/theme.nix inputs) cursorTheme defaultFont iconTheme gtkTheme kvantumTheme;

     

       5
       6
        
         cfg = config.modules.desktop;

     

       6
       7
        
       in {

     

       7
       8
        
         options.modules.desktop.session = {

     
···

       45
       46
        
           };

     

       46
       47
        
       

     

       47
       48
        
           programs = {

     

       48
       48
       -
             regreet.enable = true;

     

       49
       49
       +
             regreet = {

     

       50
       50
       +
               enable = true;

     

       51
       51
       +
               cageArgs = [ "-s" "-mlast" ];

     

       52
       52
       +
               inherit cursorTheme iconTheme;

     

       53
       53
       +
               font = defaultFont;

     

       54
       54
       +
               theme = gtkTheme;

     

       55
       55
       +
               settings.GTK.application_prefer_dark_theme = true;

     

       56
       56
       +
             };

     

       49
       57
        
             hyprlock.enable = true;

     

       50
       58
        
             hyprland = {

     

       51
       59
        
               enable = true;