commit fdc2328d0980cef55d0f7d46275701a0755cedf7 · pyrox.dev/nix

+1 -4

modules/home/programs/chromium/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         pkgs,

     

       3
       3
        
         inputs,

     

       4
       4
       -
         osConfig,

     

       5
       4
        
         config,

     

       6
       5
        
         lib,

     

       7
       6
        
         system,

     
···

       9
       8
        
       }:

     

       10
       9
        
       let

     

       11
       10
        
         cfg = config.py.programs.chromium;

     

       12
       12
       -
         osCfg = osConfig.py.programs.chromium;

     

       13
       13
       -
         osPro = osConfig.py.profiles;

     

       14
       11
        
       in

     

       15
       12
        
       {

     

       16
       13
        
         options.py.programs.chromium.enable = lib.mkEnableOption "Chromium";

     

       17
       14
        
       

     

       18
       18
       -
         config.programs.chromium = lib.mkIf (cfg.enable || osCfg.enable && osPro.graphical.enable) {

     

       15
       15
       +
         config.programs.chromium = lib.mkIf cfg.enable {

     

       19
       16
        
           enable = true;

     

       20
       17
        
           package = inputs.stable.legacyPackages.${system}.ungoogled-chromium;

     

       21
       18
        
           dictionaries = [ pkgs.hunspellDictsChromium.en_US ];

+1 -3

modules/home/programs/gpg/default.nix

···

       2
       2
        
         pkgs,

     

       3
       3
        
         lib,

     

       4
       4
        
         config,

     

       5
       5
       -
         osConfig,

     

       6
       5
        
         ...

     

       7
       6
        
       }:

     

       8
       7
        
       let

     

       9
       8
        
         cfg = config.py.programs.gpg;

     

       10
       10
       -
         osPro = osConfig.py.profiles;

     

       11
       9
        
       in

     

       12
       10
        
       {

     

       13
       11
        
         options.py.programs.gpg.enable = lib.mkEnableOption "gpg";

     

       14
       14
       -
         config.programs.gpg = lib.mkIf (cfg.enable && osPro.development.enable) {

     

       12
       12
       +
         config.programs.gpg = lib.mkIf cfg.enable {

     

       15
       13
        
           enable = true;

     

       16
       14
        
           settings = {

     

       17
       15
        
             personal-cipher-preferences = "AES256 AES192 AES";

+1 -2

modules/home/programs/kitty/default.nix

···

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

     

       2
       2
        
       let

     

       3
       3
        
         cfg = config.py.programs.kitty;

     

       4
       4
       -
         osPro = config.py.profiles;

     

       5
       4
        
       in

     

       6
       5
        
       {

     

       7
       6
        
         options.py.programs.kitty.enable = lib.mkEnableOption "kitty";

     

       8
       8
       -
         config.programs.kitty = lib.mkIf (cfg.enable && osPro.graphical.enable) {

     

       7
       7
       +
         config.programs.kitty = lib.mkIf cfg.enable {

     

       9
       8
        
           enable = true;

     

       10
       9
        
           catppuccin.enable = true;

     

       11
       10
        
           font.name = "BlexMono Nerd Font";

+6 -6

modules/home/programs/misc-programs/default.nix

···

       21
       21
        
         };

     

       22
       22
        
         config = {

     

       23
       23
        
           programs = {

     

       24
       24
       -
             bat = mkIf (cfg.bat.enable && osPro.cli.enable) {

     

       24
       24
       +
             bat = mkIf cfg.bat.enable {

     

       25
       25
        
               enable = true;

     

       26
       26
        
               catppuccin.enable = true;

     

       27
       27
        
             };

     

       28
       28
       -
             direnv = mkIf (cfg.direnv.enable && osPro.cli.enable) {

     

       28
       28
       +
             direnv = mkIf cfg.direnv.enable {

     

       29
       29
        
               enable = true;

     

       30
       30
        
               enableBashIntegration = true;

     

       31
       31
        
               enableNushellIntegration = true;

     
···

       33
       33
        
               nix-direnv.enable = true;

     

       34
       34
        
               stdlib = builtins.readFile ./direnv-stdlib.sh;

     

       35
       35
        
             };

     

       36
       36
       -
             fzf = mkIf (cfg.fzf.enable && osPro.cli.enable) {

     

       36
       36
       +
             fzf = mkIf cfg.fzf.enable {

     

       37
       37
        
               enable = true;

     

       38
       38
        
               enableBashIntegration = true;

     

       39
       39
        
               enableZshIntegration = true;

     

       40
       40
        
               catppuccin.enable = true;

     

       41
       41
        
             };

     

       42
       42
       -
             nix-index = mkIf (cfg.nix-index.enable && osPro.cli.enable) {

     

       42
       42
       +
             nix-index = mkIf cfg.nix-index.enable {

     

       43
       43
        
               enable = true;

     

       44
       44
        
               enableBashIntegration = true;

     

       45
       45
        
               enableFishIntegration = true;

     

       46
       46
        
               enableZshIntegration = true;

     

       47
       47
        
             };

     

       48
       48
       -
             pandoc = mkIf (cfg.pandoc.enable && osPro.cli.enable) { enable = true; };

     

       49
       49
       -
             zoxide = mkIf (cfg.zoxide.enable && osPro.cli.enable) {

     

       48
       48
       +
             pandoc = mkIf cfg.pandoc.enable { enable = true; };

     

       49
       49
       +
             zoxide = mkIf cfg.zoxide.enable {

     

       50
       50
        
               enable = true;

     

       51
       51
        
               enableBashIntegration = true;

     

       52
       52
        
               enableFishIntegration = true;

+2 -8

modules/home/programs/nushell/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         config,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         osConfig,

     

       5
       5
       -
         ...

     

       6
       6
       -
       }:

     

       1
       1
       +
       { config, lib, ... }:

     

       7
       2
        
       let

     

       8
       3
        
         cfg = config.py.programs.nushell;

     

       9
       9
       -
         osPro = config.py.profiles;

     

       10
       4
        
       in

     

       11
       5
        
       {

     

       12
       6
        
         options.py.programs.nushell.enable = lib.mkEnableOption "Nushell";

     

       13
       13
       -
         config.programs.nushell = lib.mkIf (cfg.enable && osPro.cli.enable) {

     

       7
       7
       +
         config.programs.nushell = lib.mkIf cfg.enable {

     

       14
       8
        
           enable = true;

     

       15
       9
        
           configFile.source = ./config.nu;

     

       16
       10
        
           envFile.source = ./env.nu;

+1 -1

modules/nixos/programs/chromium/default.nix

···

       5
       5
        
       {

     

       6
       6
        
         options.py.programs.chromium.enable = lib.mkEnableOption "Chromium";

     

       7
       7
        
       

     

       8
       8
       -
         config = lib.mkIf (cfg.enable && config.py.profiles.graphical.enable) {

     

       8
       8
       +
         config = lib.mkIf cfg.enable {

     

       9
       9
        
           programs.chromium = {

     

       10
       10
        
             enable = true;

     

       11
       11
        
             defaultSearchProviderEnabled = true;

+1 -1

modules/nixos/programs/firefox/default.nix

···

       14
       14
        
           enable = lib.mkEnableOption "Firefox configuration";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         config = lib.mkIf (cfg.enable && config.py.profiles.graphical.enable) {

     

       17
       17
       +
         config = lib.mkIf cfg.enable {

     

       18
       18
        
           programs.firefox = {

     

       19
       19
        
             enable = true;

     

       20
       20
        
             package = spkgs.firefox;

+1 -1

modules/nixos/programs/neovim/default.nix

···

       10
       10
        
       {

     

       11
       11
        
         options.py.programs.neovim = lib.mkEnableOption "Neovim configuration";

     

       12
       12
        
       

     

       13
       13
       -
         config.programs.neovim = lib.mkIf (cfg.enable && config.py.profiles.cli.enable) {

     

       13
       13
       +
         config.programs.neovim = lib.mkIf cfg.enable {

     

       14
       14
        
           enable = true;

     

       15
       15
        
           package = pkgs.py.nvim;

     

       16
       16
        
           defaultEditor = true;