SHELL: WORKS NOW!!!!!!!!!!!!!!!!!!!!!

This commit is contained in:
Charlie Root 2024-11-02 11:28:08 +01:00
commit 5082f7dc40
Signed by: faukah
SSH key fingerprint: SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
6 changed files with 32 additions and 3 deletions

View file

@ -42,3 +42,4 @@ The nix logo was designed by ![jacekpoz](https://jacekpoz.pl)!
![fufexan](https://github.com/fufexan) ![fufexan](https://github.com/fufexan)
![lokasku](https://github.com/lokasku/nix-config) ![lokasku](https://github.com/lokasku/nix-config)
![NotAShelf](https://github.com/notashelf/nyx) ![NotAShelf](https://github.com/notashelf/nyx)
![viperML](https://github.com/viperml/dotfiles)

View file

@ -9,7 +9,12 @@
devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {}; devShells.x86_64-linux.default = pkgs.callPackage ./shell.nix {};
formatter.x86_64-linux = pkgs.alejandra; formatter.x86_64-linux = pkgs.alejandra;
packages.x86_64-linux= user.packages; packages.x86_64-linux = user.packages;
apps.x86_64-linux.default = {
type = "app";
program = "${user.packages.fish}/bin/fish";
};
nixosModules = { nixosModules = {
user = user.module; user = user.module;
shell = import ./modules/shell {inherit pkgs;}; shell = import ./modules/shell {inherit pkgs;};

View file

@ -19,4 +19,6 @@ in {
cat = "${getExe pkgs.bat} --plain"; cat = "${getExe pkgs.bat} --plain";
kys = "shutdown now"; kys = "shutdown now";
cd = "z";
} }

View file

@ -10,10 +10,21 @@
pkgs.lib.concatStringsSep "\n" pkgs.lib.concatStringsSep "\n"
(pkgs.lib.mapAttrsToList (k: v: "alias ${k}=\"${v}\"") aliases); (pkgs.lib.mapAttrsToList (k: v: "alias ${k}=\"${v}\"") aliases);
packages = import ./packages.nix pkgs; packages = import ./packages.nix pkgs;
# this was taken from viperml, check out his config for this!
custom-fish = pkgs.fish.overrideAttrs (old: {
patches = [./fish-on-tmpfs.patch];
doCheck = false;
postInstall =
old.postInstall
+ ''
echo "source ${fishinit}" >> $out/etc/fish/config.fish
'';
});
in in
(pkgs.symlinkJoin { (pkgs.symlinkJoin {
name = "fish-wrapped"; name = "fish-wrapped";
paths = [pkgs.fish] ++ packages; paths = [custom-fish] ++ packages;
buildInputs = [pkgs.makeWrapper]; buildInputs = [pkgs.makeWrapper];
postBuild = '' postBuild = ''
wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \ wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \

View file

@ -0,0 +1,10 @@
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -384,7 +384,7 @@ static const base_directory_t &get_data_directory() {
}
static const base_directory_t &get_config_directory() {
- static base_directory_t s_dir = make_base_directory(L"XDG_CONFIG_HOME", L"/.config/fish");
+ static base_directory_t s_dir = make_base_directory(L"XDG_RUNTIME_DIR", L"/.config/fish");
return s_dir;
}

View file

@ -2,7 +2,7 @@
pkgs, pkgs,
aliasesStr, aliasesStr,
}: }:
pkgs.writeShellScriptBin "config.fish" '' pkgs.writeText "config.fish" ''
# source ${pkgs.fishPlugins.sponge}/share/zsh-defer/zsh-defer.plugin.zsh # source ${pkgs.fishPlugins.sponge}/share/zsh-defer/zsh-defer.plugin.zsh
${pkgs.atuin}/bin/atuin init fish | source ${pkgs.atuin}/bin/atuin init fish | source