소스 검색

updated shell-aliases and added nushell

Zander Hawke 1 년 전
부모
커밋
5951133eae
5개의 변경된 파일18개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 0
      users/thomas/cli/default.nix
  2. 8 0
      users/thomas/cli/nushell.nix
  3. 6 6
      users/thomas/cli/shell-aliases.nix
  4. 1 1
      users/thomas/default.nix
  5. 2 2
      users/thomas/desktop/ghostty.nix

+ 1 - 0
users/thomas/cli/default.nix

@@ -8,6 +8,7 @@
     ./git.nix
     ./github.nix
     ./gnupg.nix
+    ./nushell.nix
     ./ssh.nix
     ./starship.nix
     ./yazi.nix

+ 8 - 0
users/thomas/cli/nushell.nix

@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  home.sessionVariables.SHELL = "${config.programs.nushell.package}/bin/nu";
+  programs.nushell = {
+    enable = true;
+    shellAliases = import ./shell-aliases.nix;
+  };
+}

+ 6 - 6
users/thomas/cli/shell-aliases.nix

@@ -9,14 +9,14 @@
   ghic = "gh issue create --body '' ";
 
   # nix stuff
-  hmb = "nix run github:nix-community/home-manager -- build";
-  hms = "nix run github:nix-community/home-manager -- switch";
+  hmb = "nix run github:nix-community/home-manager -- build --flake .#(whoami)@(hostname)";
+  hms = "nix run github:nix-community/home-manager -- switch --flake .#(whoami)@(hostname)";
 
   home-manager = "nix run github:nix-community/home-manager --";
 
-  drb = "nix run github:lnl7/nix-darwin -- build";
-  drs = "nix run github:lnl7/nix-darwin -- switch";
+  drb = "nix run github:lnl7/nix-darwin -- build --flake .#(hostname)";
+  drs = "nix run github:lnl7/nix-darwin -- switch --flake .#(hostname)";
 
-  nrb = "nix run github:nixos/nixpkgs -- build";
-  nrs = "nix run github:nixos/nixpkgs -- switch";
+  nrb = "nix run github:nixos/nixpkgs -- build --flake .#(hostname)";
+  nrs = "nix run github:nixos/nixpkgs -- switch --flake .#(hostname)";
 }

+ 1 - 1
users/thomas/default.nix

@@ -19,7 +19,7 @@ in
     homeDirectory = lib.mkDefault "${homeLocation}/${config.home.username}";
     sessionVariables = {
       EDITOR = "${pkgs.neovim}/bin/nvim";
-      SHELL = "${pkgs.fish}/bin/fish";
+      SHELL = "${pkgs.nushell}/bin/nu";
     };
     stateVersion = lib.mkDefault "24.11";
   };

+ 2 - 2
users/thomas/desktop/ghostty.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   programs.ghostty-darwin = {
     enable = true;
@@ -48,7 +48,7 @@
     };
 
     settings = {
-      command = "${pkgs.lib.meta.getExe pkgs.fish}";
+      command = "${pkgs.lib.meta.getExe config.programs.nushell.package}";
 
       background-opacity = 0.8;
       font-family = "FiraCode Nerd Font";