use same fish config for desktop and server + enable cleaning service

This commit is contained in:
2026-08-02 22:05:05 +02:00
parent 535a3e6d6e
commit 04e42db270
6 changed files with 35 additions and 47 deletions
Generated
+24 -24
View File
@@ -192,11 +192,11 @@
]
},
"locked": {
"lastModified": 1785085647,
"narHash": "sha256-VerKUIpQHGnXgpmRXzh767X0BJNjpACWdVp391t8n1s=",
"lastModified": 1785593957,
"narHash": "sha256-16DqCLB7701mKEvsNCMNay/Mv69ZGvNnQ8nsvNQCdIQ=",
"owner": "rPlakama",
"repo": "gsr-ui-nix",
"rev": "1f9a46bcdde0e805ced86a0e995f1449f8f7a12f",
"rev": "c1ac4ac2fd962b7c985edb1e420bdc5b3dce56f6",
"type": "github"
},
"original": {
@@ -212,11 +212,11 @@
]
},
"locked": {
"lastModified": 1785306346,
"narHash": "sha256-DScBkW0fOgpGPK2trNoX3ryLTlaC14+gglFo/BhGJ4g=",
"lastModified": 1785531816,
"narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e705714e918c3b11affcdd15db2cbe3a070420a0",
"rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe",
"type": "github"
},
"original": {
@@ -656,11 +656,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1785350410,
"narHash": "sha256-wXYrsdit8Z54aOAUf7/83LDhkY9+RgSuFBO/rFJeHb8=",
"lastModified": 1785698632,
"narHash": "sha256-wIfKcnvpkHUQBdR/aokjRO9T/L9gzNKYcVR6Qu7Rmzk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "00d4d9bc4d406965d1e0081300dd8c854fd4ba11",
"rev": "5b04e91630b267d6493a88e634bc235cdaad2720",
"type": "github"
},
"original": {
@@ -734,11 +734,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1785332987,
"narHash": "sha256-Eiw4ie++bC7tDWyBEZmcbEeKv1xv0UAihkVTjD4C5VM=",
"lastModified": 1785698632,
"narHash": "sha256-wIfKcnvpkHUQBdR/aokjRO9T/L9gzNKYcVR6Qu7Rmzk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "97478ef76c1f4c40b12fd4a42c1feba41e60650d",
"rev": "5b04e91630b267d6493a88e634bc235cdaad2720",
"type": "github"
},
"original": {
@@ -818,11 +818,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1785364321,
"narHash": "sha256-BLuHl+nZKb+FDq3GAM6L+UBEiyVepXANA31fT1F56pw=",
"lastModified": 1785527278,
"narHash": "sha256-rYFSM491MFFA1V6oax5PngXbevGt6n0o8sKhwFoItE0=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "acd69cc15d57004e8cb4495034320263a3d362ea",
"rev": "a19efae6c1afe426e8243d79f6dfbab186be6df8",
"type": "github"
},
"original": {
@@ -898,11 +898,11 @@
]
},
"locked": {
"lastModified": 1785275929,
"narHash": "sha256-3IbhTuHEqh2tokPGNKnv6x0HcsjOu3hk1MbLYRtzyRQ=",
"lastModified": 1785594941,
"narHash": "sha256-hnbTg0PQYnQx9w/UxVxXRF26srIrSUKVE6rO/uQ/nSo=",
"owner": "AceSLS",
"repo": "SLSsteam",
"rev": "1906382a482f35b2bc9b124f3849538ab432e4f3",
"rev": "7cf66365ea533d9fa1ee642a451fbff3f65f4200",
"type": "github"
},
"original": {
@@ -1064,11 +1064,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1785301727,
"narHash": "sha256-Z9g04KWv8aEowWW+QIiADE6ct36oIZmrykTzEh5sQ4M=",
"lastModified": 1785650918,
"narHash": "sha256-MicAaPMrueLTI2D2HmXttbhTHeHW3wBIGnYzzueOg68=",
"owner": "sxyazi",
"repo": "yazi",
"rev": "319f90e0eab185a231eef5562215ba322e320286",
"rev": "bfa01e56da0b7ab63161bd9605cb77000e864603",
"type": "github"
},
"original": {
@@ -1083,11 +1083,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1785224333,
"narHash": "sha256-8DNJUVM10ktK02V9ZIV064CH+fuPF272VCAZBn6arig=",
"lastModified": 1785652409,
"narHash": "sha256-0273OvIPfkJcdv0+Z3iPL8+eSRavAwGRCnr+Y6tRjYY=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "5f1a4be4d280e1ae06d61a75775a234b1714da3f",
"rev": "12224626d0d1cead79603f19601666360c715379",
"type": "github"
},
"original": {
+1 -1
View File
@@ -8,7 +8,7 @@
imports = [
./mpd.nix
./programs.nix
./fish.nix
../../../modules/fish.nix
zen-browser.homeModules.beta
];
+6 -1
View File
@@ -51,10 +51,15 @@
shell = pkgs.fish;
};
programs.nh = {
enable = true;
clean.enable = true;
flake = "/home/user/nix-config";
};
services.tailscale.enable = true;
services.rsync.enable = true;
programs.nix-ld.enable = true;
programs.nh.enable = true;
programs.neovim.enable = true;
programs.tmux.enable = true;
programs.bat.enable = true;
+3 -21
View File
@@ -2,6 +2,7 @@
{
imports = [
./beets.nix
../../../modules/fish.nix
];
home.username = "user";
@@ -21,6 +22,8 @@
programs.gcc.enable = true;
programs.ripgrep.enable = true;
programs.eza = {
enable = true;
enableFishIntegration = true;
@@ -39,26 +42,5 @@
EDITOR = "nvim";
};
programs.fish = {
enable = true;
interactiveShellInit = ''
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";
mv = "mv -v";
n = "nvim";
r = "rsync -avh --info=progress2";
rm = "gomi";
};
};
home.stateVersion = "26.05";
}
+1
View File
@@ -19,6 +19,7 @@
croc
mp3val
flac
nitch
(python314.withPackages (
ps: with ps; [
requests