switched to fish

oh-my-fish/theme-agnoster has issues on nix so i forked it and am
working on fixing it, for now i have it in a state where the annoying
thing doesnt happen, and this means i have the same functionality

actually better because the autocomplete and syntax highlighting is much
nicer

fish ftw
This commit is contained in:
Gabriella Bere 2025-06-04 16:59:43 +01:00
parent 661356a198
commit ff65efd702
6 changed files with 43 additions and 63 deletions

35
home-manager/fish.nix Normal file
View file

@ -0,0 +1,35 @@
{ pkgs, ... }:
{
programs.fish = {
enable = true;
generateCompletions = true;
shellAliases = {
ls = "eza -lh";
ip = "ip --color=auto";
nano = "nvim";
cd = "z";
cat = "bat";
# Aliases for my nixos workflow
nixos-switch = "sudo nixos-rebuild switch --flake ~/nixconf &| nom";
home-switch = "home-manager switch --flake ~/nixconf &| nom";
server-switch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo &| nom";
};
shellInit = "
set --global --export theme_virtual_env_prompt_enabled no
set --global --export VIRTUAL_ENV_DISABLE_PROMPT 1
set --global --export theme_env_packages_hide binutils-wrapper hyprland-qtutils pciutils pkgconf-wrapper
";
plugins = [
{
name = "agnoster";
src = pkgs.fetchFromGitHub {
owner = "IBeTheBlueCat";
repo = "theme-agnoster";
rev = "c6b1e6b5671f75d30d2d81a11963ef445e78d8e6";
hash = "sha256-hO5ow+7nBqFeXWj8sjd6whuSYqsKYCpvcINU6zpAzsU=";
};
}
];
};
}

View file

@ -12,7 +12,7 @@
./waybar.nix ./waybar.nix
./swaync.nix ./swaync.nix
./hyprlock.nix ./hyprlock.nix
./zsh.nix ./fish.nix
./eza.nix ./eza.nix
./nvf.nix ./nvf.nix
./nextcloud.nix ./nextcloud.nix
@ -30,7 +30,7 @@
services.gnome-keyring.enable = true; # used for nextcloud-client services.gnome-keyring.enable = true; # used for nextcloud-client
home.sessionVariables = { home.sessionVariables = {
DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}"; # even though im using floorp this still works, and pkgs.floorp doesnt DEFAULT_BROWSER = "${lib.getExe pkgs.floorp}";
# Allow XWayland apps to not be weird after turning off xwayland scaling in hyprland.conf # Allow XWayland apps to not be weird after turning off xwayland scaling in hyprland.conf
GDK_SCALE = 1; GDK_SCALE = 1;
XCURSOR_SIZE = 24; XCURSOR_SIZE = 24;

View file

@ -65,7 +65,7 @@
"$mod, F, exec, floorp" "$mod, F, exec, floorp"
"$mod, 1, exec, alacritty" "$mod, 1, exec, alacritty"
"$mod, D, exec, vesktop" "$mod, D, exec, vesktop"
"$mod, space, exec, zsh -c 'wofi --show drun, run'" "$mod, space, exec, bash -c 'wofi --show drun, run'"
# Screenshot tool # Screenshot tool
", Print, exec, grimblast copy area" ", Print, exec, grimblast copy area"

View file

@ -2,7 +2,7 @@
{ {
programs.zellij = { programs.zellij = {
enable = true; enable = true;
enableZshIntegration = true; enableFishIntegration = true;
exitShellOnExit = true; exitShellOnExit = true;
attachExistingSession = true; attachExistingSession = true;
}; };

View file

@ -1,43 +0,0 @@
{
pkgs,
...
}:
{
programs.zsh = {
enable = true;
autocd = true;
dotDir = ".config/zsh";
autosuggestion.enable = true;
enableCompletion = true;
shellAliases = {
ls = "eza -lh";
ip = "ip --color=auto";
nano = "nvim";
cd = "z";
cat = "bat";
# Aliases for my nixos workflow
switch = "sudo nixos-rebuild switch --flake ~/nixconf |& nom";
homeswitch = "home-manager switch --flake ~/nixconf |& nom";
serverswitch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo |& nom";
};
plugins = with pkgs; [
{
name = "zsh-syntax-highlighting";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-syntax-highlighting";
rev = "0.6.0";
sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
};
file = "agkozak-zsh-prompt.plugin.zsh";
}
];
oh-my-zsh = {
enable = true;
theme = "agnoster";
};
};
}

View file

@ -116,19 +116,6 @@
}; };
}; };
musnix.enable = true;
# pam.services = [
# { name = "gnome_keyring"
# text = ''
# auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
# session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
#
# password optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
# '';
# }
# ];
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
nix.settings.trusted-users = [ nix.settings.trusted-users = [
@ -136,7 +123,7 @@
"blue" "blue"
]; ];
programs.zsh.enable = true; programs.fish.enable = true;
users.users.blue = { users.users.blue = {
isNormalUser = true; isNormalUser = true;
description = "Gabriella Bere"; description = "Gabriella Bere";
@ -146,12 +133,11 @@
"dialout" "dialout"
"audio" "audio"
]; ];
shell = pkgs.zsh; shell = pkgs.fish;
}; };
# Enable fingerprint daemon # Enable fingerprint daemon
services.fprintd.enable = true; services.fprintd.enable = true;
# services.fprintd.tod.enable = true;
# Enable bluetooth and blueman # Enable bluetooth and blueman
hardware.bluetooth = { hardware.bluetooth = {
@ -178,6 +164,8 @@
programs.steam.remotePlay.openFirewall = true; programs.steam.remotePlay.openFirewall = true;
programs.gamemode.enable = true; programs.gamemode.enable = true;
# Enable musnix for realtime audio and other such useful things
musnix.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
43391 # used to forward minecraft traffic to minecraft.gabbie.blue:33991 43391 # used to forward minecraft traffic to minecraft.gabbie.blue:33991