averageatchris/nixos-configs - Change WVAJNAJ4EVTTIREWQDTBMGASLMWJUVBHIM2MKKOFTFYVIIMR6CBAC

add hm_modules/shell, use it instead of imports

Created by Chris Cummings on June 3, 2023

WVAJNAJ4EVTTIREWQDTBMGASLMWJUVBHIM2MKKOFTFYVIIMR6CBAC

Dependencies

In channels

main

Change contents

Replacement in nixpkgs/shell/default.nix at line 1 [7.279]
∅:D[5.143] → [6.432:434]
B:BD[6.432] → [6.432:434]
B:BD[6.434] → [8.8333:8351]
B:BD[8.8351] → [9.62:69]
∅:D[9.69] → [8.8351:8364]
B:BD[8.8351] → [8.8351:8364]
B:BD[8.8364] → [3.70:165]
∅:D[3.165] → [10.1064:1162]
B:BD[8.8413] → [10.1064:1162]
B:BD[10.1162] → [9.70:81]
B:BD[9.81] → [3.166:202]
∅:D[3.202] → [9.129:145]
B:BD[9.129] → [9.129:145]
∅:D[9.145] → [8.8413:8418]
∅:D[10.1162] → [8.8413:8418]
B:BD[8.8413] → [8.8413:8418]
∅:D[8.8418] → [11.83:152]
B:BD[6.434] → [11.83:152]
```
{
  config,
  pkgs,
  lib,
  ...
}: let
  inherit (pkgs.stdenv.hostPlatform) isLinux;
  isHelixEnabled = config.programs.helix.enable;
  isGPGenabled = true; # 😂 FIXME: config points to home-manager here, but need nixos's config?
  EDITOR =
    if isHelixEnabled
    then "hx"
    else "vim";
in {
  # starship is the shell prompt
  programs.starship.enable = true;
```
[7.279]
[7.306]
```
{pkgs, ...}: {
  imports = [./aliases.nix];
```
Deletion in nixpkgs/shell/default.nix at line 4 [7.279]
B:BD[7.325] → [7.325:345]
```
    enable = true;
```
Deletion in nixpkgs/shell/default.nix at line 10 [7.279]
∅:D[3.311] → [12.1293:1294]
∅:D[8.8709] → [12.1293:1294]
B:BD[12.1293] → [12.1293:1294]
B:BD[12.1440] → [8.8866:8923]
```
    shellAliases = import ./aliases.nix {inherit pkgs;};
```
Deletion in nixpkgs/shell/default.nix at line 15 [7.279]
B:BD[7.623] → [7.623:644]
```
      enable = true;
```

Replacement in nixpkgs/shell/default.nix at line 22 [7.279]

B:BD[7.714] → [9.146:215]

∅:D[9.215] → [8.9059:9146]

B:BD[8.9059] → [8.9059:9146]

B:BD[9.284] → [9.284:359]

    sessionVariables = lib.mkMerge [
      {
        inherit EDITOR;
        GIT_EDITOR = EDITOR;
        KEYTIMEOUT = "1";
        LESS = "-SRXF";
      }
      (lib.mkIf isGPGenabled {
        GPG_TTY = "$(tty)";
      })
    ];

[7.714]

[7.962]

    sessionVariables.LESS = "-SRXF";

Deletion in nixpkgs/shell/default.nix at line 26 [7.279]
B:BD[13.75] → [13.75:94]
```
    enable = true;
```

Deletion in nixpkgs/shell/default.nix at line 38 [7.279]

B:BD[13.260] → [14.50:51]

B:BD[14.51] → [8.9262:9437]

B:BD[8.9437] → [3.630:752]


  home.packages = with pkgs;
    [
      curl
      direnv
      fd
      htop
      jq
      neofetch
      pre-commit
      procs
      ripgrep
      sshfs
      wget
    ]
    ++ (
      if isLinux
      then builtins.attrValues (import ./shell_extras.nix {inherit pkgs;})
      else []
    );

Replacement in nixpkgs/shell/aliases.nix at line 1 [15.2601]
B:BD[15.2601] → [8.9511:9534]
∅:D[8.9534] → [16.2316:2357]
B:BD[17.53] → [16.2316:2357]
B:BD[16.2357] → [8.9535:9540]
∅:D[17.330] → [15.2604:2642]
∅:D[6.660] → [15.2604:2642]
∅:D[8.9540] → [15.2604:2642]
B:BD[15.2604] → [15.2604:2642]
```
{pkgs}:
with pkgs; let
  inherit (stdenv.hostPlatform) isLinux;
in {
  # warning, verbose
  cp = "cp -iv";
```
[15.2601]
[15.2642]
```
{
  pkgs,
  config,
  ...
}: {
  programs.zsh.shellAliases = {
    # warning, verbose
    cp = "cp -iv";
```
Replacement in nixpkgs/shell/aliases.nix at line 10 [15.2601]
B:BD[15.2643] → [15.2643:2681]
```
  # warning, verbose
  mv = "mv -iv";
```
[15.2643]
[15.2681]
```
    # warning, verbose
    mv = "mv -iv";
```

Replacement in nixpkgs/shell/aliases.nix at line 13 [15.2601]

B:BD[15.2682] → [15.2682:2728]

B:BD[15.2728] → [17.331:332]

B:BD[17.332] → [18.602:666]

B:BD[18.666] → [6.661:672]

B:BD[6.672] → [8.9541:9614]

  # make path, verbose
  mkdir = "mkdir -pv";
  # replecate pbcopy and pbpaste from macos everywhere 😎👍
  pbcopy =
    if isLinux
    then "${wl-clipboard}/bin/wl-copy"
    else "pbcopy";

[15.2682]

[18.756]

    # make path, verbose
    mkdir = "mkdir -pv";

Replacement in nixpkgs/shell/aliases.nix at line 16 [15.2601]

B:BD[18.757] → [6.693:705]

B:BD[6.705] → [8.9615:9690]

  pbpaste =
    if isLinux
    then "${wl-clipboard}/bin/wl-paste"
    else "pbpaste";

[18.757]

[19.85]

    pbcopy = config.dotfiles.shell.commands.copy;
    pbpaste = config.dotfiles.shell.commands.paste;

Replacement in nixpkgs/shell/aliases.nix at line 19 [15.2601]

B:BD[19.86] → [19.86:145]

B:BD[19.145] → [4.453:508]

  nixos-switch = "nixos-rebuild switch --use-remote-sudo";
  nixos-test = "nixos-rebuild test --use-remote-sudo";

[19.86]

[16.2433]

    nixos-switch = "nixos-rebuild switch --use-remote-sudo";
    nixos-test = "nixos-rebuild test --use-remote-sudo";

Replacement in nixpkgs/shell/aliases.nix at line 22 [15.2601]
B:BD[16.2434] → [16.2434:2462]
```
  today = "date +%Y-%m-%d";
```
[16.2434]
[17.420]
```
    today = "date +%Y-%m-%d";
  };
```
Deletion in nixpkgs/nixos/users/chris.nix at line 27 [21.1607]
∅:D[10.1697] → [20.636:654]
B:BD[20.636] → [20.636:654]
```
      ../../emacs
```
Deletion in nixpkgs/nixos/users/chris.nix at line 31 [21.1607]
∅:D[22.123] → [11.168:190]
B:BD[20.755] → [11.168:190]
```
      ../../nerdfonts
```
Insertion in nixpkgs/nixos/users/chris.nix at line 36 [21.1607]
[10.1750]
[23.6355]
```
    dotfiles.shell.nerdfonts.enable = true;
```
Replacement in nixpkgs/nixos/users/chris.nix at line 41 [21.1607]
B:BD[23.6454] → [23.6454:6471]
```
      size = 14;
```
[23.6454]
[23.6471]
```
      size = 12;
```
Replacement in nixpkgs/nixos/users/chris.nix at line 43 [21.1607]
B:BD[23.6485] → [23.6485:6509]
```
        enable = false;
```
[23.6485]
[23.6509]
```
        enable = true;
```
Replacement in nixpkgs/nixos/users/chris-minimal.nix at line 34 [24.304]
B:BD[24.787] → [24.787:822]
```
      ../../git
      ../../neovim
```
[24.787]
[25.2072]
```
      ../../../hm_modules/shell.nix
```
Deletion in nixpkgs/nixos/users/chris-minimal.nix at line 37 [24.304]
B:BD[24.841] → [24.841:876]
```
      ../../shell
      ../../tmux
```
Insertion in nixpkgs/nixos/users/chris-minimal.nix at line 38 [24.304]
[24.883]
[24.883]
```
    dotfiles.shell.enable = true;
```

Replacement in nixpkgs/nerdfonts/default.nix at line 1 [11.226]

B:BD[11.226] → [8.15017:15032]

∅:D[8.15032] → [11.244:289]

B:BD[11.244] → [11.244:289]

{pkgs, ...}: {
  config.xdg.dataFile.".fonts/nerdfonts" = {

[11.226]

[11.289]

{
  pkgs,
  config,
  lib,
  ...
}: {
  config.xdg.dataFile.".fonts/nerdfonts" = lib.mkIf config.dotfiles.shell.nerdfonts.enable {

Deletion in nixpkgs/neovim/default.nix at line 7 [7.1400]
B:BD[7.1668] → [7.1668:1687]
```
    enable = true;
```
Deletion in nixpkgs/helix.nix at line 3 [23.6585]
B:BD[23.6616] → [23.6616:6636]
```
    enable = true;
```
Deletion in nixpkgs/gitui/default.nix at line 3 [4.8401]
B:BD[4.8432] → [4.8432:8451]
```
    enable = true;
```
Deletion in nixpkgs/git/default.nix at line 3 [26.122]
B:BD[26.159] → [26.159:178]
```
    enable = true;
```
Insertion in nixpkgs/emacs/default.nix at line 3 [27.12973]
[8.18705]
[8.18705]
```
  lib,
```

Replacement in nixpkgs/emacs/default.nix at line 37 [27.12973]

∅:D[8.18807] → [21.17596:17690]

B:BD[28.1693] → [21.17596:17690]

B:BD[21.17690] → [29.169:253]

  config.home.packages = pkgs-markdownMode ++ pkgs-pythonMode ++ pkgs-shellMode ++ pkgs-misc;
  config.programs.direnv = {
    enable = true;
    nix-direnv.enable = true;
  };

[8.18807]

[28.1813]

  config.home.packages = lib.mkIf config.dotfiles.shell.emacs.enable (pkgs-markdownMode ++ pkgs-pythonMode ++ pkgs-shellMode ++ pkgs-misc);

Deletion in nixpkgs/emacs/default.nix at line 40 [27.12973]
∅:D[30.5771] → [21.17724:17743]
B:BD[21.17724] → [21.17724:17743]
```
    enable = true;
```
Deletion in nixpkgs/emacs/default.nix at line 54 [27.12973]
∅:D[21.18161] → [31.79:80]
B:BD[27.13465] → [31.79:80]
B:BD[31.80] → [2.847:886]
∅:D[2.886] → [10.3035:3081]
B:BD[21.18204] → [10.3035:3081]
```
  config.services.emacs.enable = true;
  config.services.emacs.defaultEditor = true;
```
Deletion in hosts/xps.nix at line 35 [32.87]
B:BD[32.607] → [23.9696:9763]
B:BD[23.9763] → [4.8592:8615]
∅:D[4.8615] → [23.9763:9770]
B:BD[23.9763] → [23.9763:9770]
```
    imports = [
      ../nixpkgs/helix.nix
      ../nixpkgs/zellij
      ../nixpkgs/gitui
    ];
```
File addition: hm_modules (d--x------)
[33.2]

File addition: shell.nix (----------)

[0.1138]

{
  config,
  lib,
  pkgs,
  ...
}: let
  inherit (pkgs.stdenv.hostPlatform) isLinux;
  cfg = config.dotfiles.shell;
  mkDefaultEnabledOption = description:
    lib.mkOption {
      type = lib.types.bool;
      default = true;
      example = false;
      description = lib.mdDoc description;
    };
  extra_shell_scripts = builtins.attrValues (import ./shell_extras.nix {inherit pkgs;});
in
  with lib; {
    imports = [
      ../nixpkgs/helix.nix
      ../nixpkgs/zellij
      ../nixpkgs/shell
      ../nixpkgs/gitui
      ../nixpkgs/nerdfonts
      ../nixpkgs/neovim
      ../nixpkgs/git
    ];
    options.dotfiles.shell = {
      enable = mkEnableOption "my dotfiles shell config.";
      emacs.enable = mkEnableOption "enable my highly configured doom emacs setup.";
      neovim.enable = mkEnableOption "enable configured neovim setup.";
      nerdfonts.enable = mkEnableOption "install nerdfonts.";
      # default enabled
      git.enable = mkDefaultEnabledOption "enable configured git.";
      gitui.enable = mkDefaultEnabledOption "enable gitui, configured to be integrated with zellij + helix.";
      gpg.enable = mkEnableOption "right now this only sets up the GPG_TTY env variable, but in the future it might do more.";
      helix.enable = mkDefaultEnabledOption "enable my highly configured helix.";
      shell_scripts.enable = mkDefaultEnabledOption "enable the various shell scripts i've written.";
      zellij.enable = mkDefaultEnabledOption "enable my highly configured zellij.";
      # config values with good minimal defaults
      env.editor = mkOption {
        type = types.enum ["hx" "nvim" "vim" "emacsclient -t" "emacs"];
        default =
          if cfg.helix.enable
          then "hx"
          else "nvim";
        example = "emacsclient -t";
        description = "The shell command used as the EDITOR environment variable.";
      };
      commands = {
        copy = mkOption {
          type = types.str;
          default =
            if isLinux
            then "${pkgs.wl-clipboard}/bin/wl-copy"
            else "pbcopy";
          example = "pbcopy";
          description = ''
             The shell command used to send data to the system clipboard
            It can be the full path, or just the command name if it's installed
            in your shell environment's $PATH variable.
            The default value assumes you're using wayland on linux.
          '';
        };
        paste = mkOption {
          type = types.str;
          default =
            if isLinux
            then "${pkgs.wl-clipboard}/bin/wl-paste"
            else "pbpaste";
          example = "pbpaste";
          description = ''
             The shell command used to send data to the system clipboard
            It can be the full path, or just the command name if it's installed
            in your shell environment's $PATH variable.
            The default value assumes you're using wayland on linux.
          '';
        };
      };
    };
    config = mkIf cfg.enable {
      programs.direnv.enable = true;
      programs.direnv.nix-direnv.enable = true;
      programs.doom-emacs.enable = cfg.emacs.enable;
      programs.fzf.enable = true;
      programs.git.enable = cfg.git.enable;
      programs.gitui.enable = true;
      programs.helix.enable = cfg.helix.enable;
      programs.neovim.enable = cfg.neovim.enable;
      programs.starship.enable = true; # shell prompt
      programs.zellij.enable = cfg.zellij.enable;
      programs.zsh.enable = true;
      programs.zsh.oh-my-zsh.enable = true;
      services.emacs.enable = cfg.emacs.enable;
      programs.zsh.sessionVariables.EDITOR = cfg.env.editor;
      programs.zsh.sessionVariables.GIT_EDITOR = cfg.env.editor;
      # programs.zsh.sessionVariables.GPG_TTY = mkIf cfg.gpg.enable "$(tty)";
      home.packages = with pkgs; [
        curl
        direnv
        fd
        htop
        jq
        pre-commit
        procs
        ripgrep
      ];
      # ] ++ mkIf cfg.shell_scripts.enable extra_shell_scripts;
    };
  }

add hm_modules/shell, use it instead of imports

Dependencies

In channels

Change contents

Replacement in nixpkgs/shell/default.nix at line 1 [7.279]

Deletion in nixpkgs/shell/default.nix at line 4 [7.279]

Deletion in nixpkgs/shell/default.nix at line 10 [7.279]

Deletion in nixpkgs/shell/default.nix at line 15 [7.279]

Replacement in nixpkgs/shell/default.nix at line 22 [7.279]

Deletion in nixpkgs/shell/default.nix at line 26 [7.279]

Deletion in nixpkgs/shell/default.nix at line 38 [7.279]

Replacement in nixpkgs/shell/aliases.nix at line 1 [15.2601]

Replacement in nixpkgs/shell/aliases.nix at line 10 [15.2601]

Replacement in nixpkgs/shell/aliases.nix at line 13 [15.2601]

Replacement in nixpkgs/shell/aliases.nix at line 16 [15.2601]

Replacement in nixpkgs/shell/aliases.nix at line 19 [15.2601]

Replacement in nixpkgs/shell/aliases.nix at line 22 [15.2601]

Deletion in nixpkgs/nixos/users/chris.nix at line 27 [21.1607]

Deletion in nixpkgs/nixos/users/chris.nix at line 31 [21.1607]

Insertion in nixpkgs/nixos/users/chris.nix at line 36 [21.1607]

Replacement in nixpkgs/nixos/users/chris.nix at line 41 [21.1607]

Replacement in nixpkgs/nixos/users/chris.nix at line 43 [21.1607]

Replacement in nixpkgs/nixos/users/chris-minimal.nix at line 34 [24.304]

Deletion in nixpkgs/nixos/users/chris-minimal.nix at line 37 [24.304]

Insertion in nixpkgs/nixos/users/chris-minimal.nix at line 38 [24.304]

Replacement in nixpkgs/nerdfonts/default.nix at line 1 [11.226]

Deletion in nixpkgs/neovim/default.nix at line 7 [7.1400]

Deletion in nixpkgs/helix.nix at line 3 [23.6585]

Deletion in nixpkgs/gitui/default.nix at line 3 [4.8401]

Deletion in nixpkgs/git/default.nix at line 3 [26.122]

Insertion in nixpkgs/emacs/default.nix at line 3 [27.12973]

Replacement in nixpkgs/emacs/default.nix at line 37 [27.12973]

Deletion in nixpkgs/emacs/default.nix at line 40 [27.12973]

Deletion in nixpkgs/emacs/default.nix at line 54 [27.12973]

Deletion in hosts/xps.nix at line 35 [32.87]

File addition: hm_modules (d--x------)

File addition: shell.nix (----------)