mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fish->zsh

Browse Source
This commit is contained in:
mjallen18
2024-06-15 14:17:59 -05:00
parent a1d184a76e
commit d84d6109a1
5 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/default.nix
View File

@@ -85,7 +85,7 @@ in
}; };
programs = { programs = {
fish.enable = lib.mkDefault true; zsh.enable = lib.mkDefault true;
gnupg.agent = { gnupg.agent = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
# pinentryPackage = pkgs.pinentry-curses; # pinentryPackage = pkgs.pinentry-curses;

6
hosts/desktop/configuration.nix
View File

@@ -173,8 +173,8 @@ in
borgbackup borgbackup
clinfo clinfo
efibootmgr efibootmgr
fishPlugins.bass # fishPlugins.bass
fishPlugins.sponge # fishPlugins.sponge
gparted gparted
kmod kmod
lact lact
@@ -209,7 +209,7 @@ in
"networkmanager" "networkmanager"
"ratbagd" "ratbagd"
]; # Enable ‘sudo’ for the user. ]; # Enable ‘sudo’ for the user.
shell = pkgs.fish; shell = pkgs.zsh;
}; };
services = { services = {

22
hosts/desktop/home.nix
View File

@@ -10,9 +10,29 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs = { programs = {
fish.enable = true; fish.enable = false;
mangohud.enable = true; mangohud.enable = true;
java.enable = true; java.enable = true;
zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
ll = "ls -alh";
update = "sudo nixos-rebuild switch";
nas-update = "nixos-rebuild switch --use-remote-sudo --target-host admin@jallen-nas.local --build-host localhost --flake ~/nix-config/flake.nix#jallen-nas";
nas-ssh = "ssh admin@jallen-nas.local";
};
oh-my-zsh = {
enable = true;
plugins = [ "git" ];
theme = "fishy";
};
};
}; };
programs.git = { programs.git = {

4
hosts/nas/configuration.nix
View File

@@ -407,7 +407,7 @@ in
# Configure programs # Configure programs
programs = { programs = {
fish.enable = true; fish.enable = false;
virt-manager.enable = true; virt-manager.enable = true;
nix-ld.enable = true; nix-ld.enable = true;
}; };
@@ -490,7 +490,7 @@ in
"jallen-nas" "jallen-nas"
]; # Enable ‘sudo’ for the user. ]; # Enable ‘sudo’ for the user.
initialHashedPassword = password; initialHashedPassword = password;
shell = pkgs.fish; shell = pkgs.zsh;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
# macBook # macBook
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw9zq8DLGByI5v2gAn95hKNyOsm3g61a2buxu2BBMFysQJgmZPCCLUqRJKhSM5Vm/JOgsAmdpRBRZQoHD+6S844CJHb4v4VIbjkyQgYCuM7Rst2IOZ5QybvsA2/D0nwytZ+HXQqDj2AagUYDbz0gyyIHkDQ5YGBMkvkWz/h1Vci6aoBM7VihEDM4KlWoTVuPeASGM8r5IZ2FS83Djbqo4ov6AYvLMrKB9Z7hmFgH6R3LE0gxOkzbGVXtSuvJyrjvgytoT22UhATjjxSQ9D+YJXXkQoB3lUdg8OoIquUPjMZpl4mR8ffvseWPfcvD1XlD5t+TOHFqKpESO547tlOBYhdpew+NSgAXpamCU6oyV8tDCywLQu2ucxHRn78u6WXzWHkDtffdhzmk6TZaPhWqVHuTGjR4higBgGqUfSaKOMszt+FDRZAr3HtuQ2+zJ8bowK9fW5OqilTtK2HtQqroD9ApegDNbqOz6kGy5IycSXvqPURy/M4lxZxbtBPuemcJs= mattjallen@MacBook-Pro.local" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw9zq8DLGByI5v2gAn95hKNyOsm3g61a2buxu2BBMFysQJgmZPCCLUqRJKhSM5Vm/JOgsAmdpRBRZQoHD+6S844CJHb4v4VIbjkyQgYCuM7Rst2IOZ5QybvsA2/D0nwytZ+HXQqDj2AagUYDbz0gyyIHkDQ5YGBMkvkWz/h1Vci6aoBM7VihEDM4KlWoTVuPeASGM8r5IZ2FS83Djbqo4ov6AYvLMrKB9Z7hmFgH6R3LE0gxOkzbGVXtSuvJyrjvgytoT22UhATjjxSQ9D+YJXXkQoB3lUdg8OoIquUPjMZpl4mR8ffvseWPfcvD1XlD5t+TOHFqKpESO547tlOBYhdpew+NSgAXpamCU6oyV8tDCywLQu2ucxHRn78u6WXzWHkDtffdhzmk6TZaPhWqVHuTGjR4higBgGqUfSaKOMszt+FDRZAr3HtuQ2+zJ8bowK9fW5OqilTtK2HtQqroD9ApegDNbqOz6kGy5IycSXvqPURy/M4lxZxbtBPuemcJs= mattjallen@MacBook-Pro.local"

19
hosts/nas/home.nix
View File

@@ -7,9 +7,26 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs = { programs = {
fish.enable = true; fish.enable = false;
mangohud.enable = true; mangohud.enable = true;
java.enable = true; java.enable = true;
zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
update = "sudo nixos-rebuild switch";
};
oh-my-zsh = {
enable = true;
plugins = [ "git" ];
theme = "fishy";
};
};
}; };
programs.git = { programs.git = {