KeksNino/nixos-conf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move all shell related configs into shell.nix

Browse Source
This commit is contained in:
KeksNino
2026-08-07 15:36:10 +02:00
parent ad700aa00f
commit e2285e5927
8 changed files with 84 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/desktop/configuration.nix
+1 -4
View File
@@ -113,6 +113,7 @@ in
enable = true;
xwayland.enable = true;
};
programs.hyprlock.enable = true;
# qt = {
# enable = true;
@@ -125,11 +126,7 @@ in
services.goxlr-utility.enable = true;
services.flatpak.enable = true;
services.lact.enable = true;
services.rsync.enable = true;
programs.kdeconnect.enable = true;
programs.neovim.enable = true;
programs.tmux.enable = true;
programs.bat.enable = true;
programs.git = {
enable = true;
config = {
hosts/desktop/home-manager/home.nix
+1 -11
View File
@@ -8,7 +8,7 @@
imports = [
./mpd.nix
./programs.nix
../../../modules/fish.nix
../../../modules/shell.nix
zen-browser.homeModules.beta
];
@@ -57,16 +57,6 @@
setAsDefaultBrowser = true;
};
programs.eza = {
enable = true;
enableFishIntegration = true;
git = true;
icons = "always";
extraOptions = [
"-1"
];
};
programs.rbw = {
enable = true;
settings = {
hosts/desktop/home-manager/programs.nix
-16
View File
@@ -1,16 +1,5 @@
{ pkgs, ... }:
{
programs.yazi.enable = true;
programs.yazi.enableFishIntegration = true;
programs.fzf.enable = true;
programs.fzf.enableFishIntegration = true;
programs.lazygit.enable = true;
programs.lazygit.enableFishIntegration = true;
programs.zoxide.enable = true;
programs.zoxide.enableFishIntegration = true;
programs.distrobox.enable = true;
services.podman.enable = true;
@@ -24,15 +13,12 @@
services.polkit-gnome.enable = true;
services.cliphist.enable = true;
programs.btop.enable = true;
services.udiskie.enable = true;
programs.cava.enable = true;
programs.equibop.enable = true;
services.awww.enable = true;
services.mpdris2.enable = true;
programs.fastfetch.enable = true;
programs.prismlauncher.enable = true;
programs.fd.enable = true;
programs.uv.enable = true;
programs.satty.enable = true;
programs.mpvpaper.enable = true;
@@ -40,8 +26,6 @@
programs.gcc.enable = true;
programs.mpv.enable = true;
programs.imv.enable = true;
programs.aria2.enable = true;
programs.ripgrep.enable = true;
programs.librewolf.enable = true;
programs.pywal = {
hosts/desktop/packages.nix
+3
View File
@@ -67,6 +67,9 @@
nvtopPackages.amd
android-tools
scrcpy
gocryptfs
proton-vpn
piper
];
fonts.packages = with pkgs; [
hosts/music-server/configuration.nix
-5
View File
@@ -59,11 +59,6 @@
virtualisation.docker.enable = true;
services.tailscale.enable = true;
services.rsync.enable = true;
programs.nix-ld.enable = true;
programs.neovim.enable = true;
programs.tmux.enable = true;
programs.bat.enable = true;
programs.git = {
enable = true;
config = {
hosts/music-server/home-manager/home.nix
+1 -34
View File
@@ -1,46 +1,13 @@
{ pkgs, config, ... }:
{
imports = [
./beets.nix
../../../modules/fish.nix
../../../modules/shell.nix
];
home.username = "user";
home.homeDirectory = "/home/user";
programs.yazi.enable = true;
programs.yazi.enableFishIntegration = true;
programs.fzf.enable = true;
programs.fzf.enableFishIntegration = true;
programs.zoxide.enable = true;
programs.zoxide.enableFishIntegration = true;
programs.lazygit.enable = true;
programs.lazygit.enableFishIntegration = true;
programs.gcc.enable = true;
programs.ripgrep.enable = true;
programs.eza = {
enable = true;
enableFishIntegration = true;
git = true;
icons = "always";
extraOptions = [
"-1"
];
};
programs.btop.enable = true;
programs.fastfetch.enable = true;
programs.fd.enable = true;
home.sessionVariables = {
EDITOR = "nvim";
};
home.stateVersion = "26.05";
}
modules/fish.nix
-28
View File
@@ -1,28 +0,0 @@
{
programs.fish = {
enable = true;
interactiveShellInit = ''
nitch
set -g fish_key_bindings fish_hybrid_key_bindings
set fish_greeting
'';
shellAliases = {
ls = "eza -al --no-time --no-user --no-permissions --no-filesize";
ll = "eza -la";
cat = "bat";
cd = "z";
cp = "cp -v";
ff = "fastfetch";
grep = "grep -i";
hyprland = "start-hyprland";
mv = "mv -v";
n = "nvim";
py = "uv run";
r = "rsync -avh --info=progress2";
rm = "gomi";
ssh = "kitty +kitten ssh";
nd = "nix develop";
df = "df -h -x tmpfs -x devtmpfs -x squashfs -x overlay -x efivarfs";
};
};
}
modules/shell.nix
+78
View File
@@ -0,0 +1,78 @@
{
programs.fish = {
enable = true;
interactiveShellInit = ''
nitch
set -g fish_key_bindings fish_hybrid_key_bindings
set fish_greeting
'';
shellAliases = {
ls = "eza -al --no-time --no-user --no-permissions --no-filesize";
ll = "eza -la";
cat = "bat";
cp = "cp -v";
ff = "fastfetch";
grep = "grep -i";
rg = "rg -i";
hyprland = "start-hyprland";
mv = "mv -v";
n = "nvim";
py = "uv run";
r = "rsync -avh --info=progress2";
rm = "gomi";
ssh = "+kitten ssh";
nd = "nix develop";
df = "df -h -x tmpfs -x devtmpfs -x squashfs -x overlay -x efivarfs";
};
};
programs.zoxide = {
enable = true;
enableFishIntegration = true;
options = [ "--cmd cd" ];
};
programs.eza = {
enable = true;
enableFishIntegration = true;
git = true;
icons = "always";
extraOptions = [
"-1"
];
};
programs.fzf.enable = true;
programs.fzf.enableFishIntegration = true;
programs.ripgrep.enable = true;
programs.fd.enable = true;
programs.aria2.enable = true;
programs.btop.enable = true;
programs.fastfetch.enable = true;
programs.yazi.enable = true;
programs.yazi.enableFishIntegration = true;
programs.lazygit.enable = true;
programs.lazygit.enableFishIntegration = true;
programs.neovim.enable = true;
programs.tmux.enable = true;
services.rsync.enable = true;
programs.bat = {
enable = true;
config = {
paging = "never";
style = "numbers,changes,rule";
theme = "TwoDark";
};
};
home.sessionVariables = {
EDITOR = "nvim";
};
}