daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Styx: Use nix-darwin to init fish

Browse source
This commit is contained in:
Daniel Kempkens 2023-03-19 21:47:23 +01:00
parent c78a5376c9
commit c4cc5cf244
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
5 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -119,11 +119,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1679067095, "lastModified": 1679246045,
"narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", "narHash": "sha256-6yK601M0RpG9o0CqCl++9OCWEH+q+va6lEncLNg8iQ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", "rev": "bcc417b80f3bef3e0cf21160850525d8a03387e6",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
home/programs/fish.nix
View file

@ -14,17 +14,6 @@ in
enable = true; enable = true;
plugins = [ plugins = [
# https://github.com/oh-my-fish/plugin-foreign-env
{
name = "foreign-env";
src = pkgs.fetchFromGitHub {
owner = "oh-my-fish";
repo = "plugin-foreign-env";
rev = "b3dd471bcc885b597c3922e4de836e06415e52dd";
sha256 = "sha256-3h03WQrBZmTXZLkQh1oVyhv6zlyYsSDS7HTHr+7WjY8=";
};
}
# https://github.com/dracula/fish # https://github.com/dracula/fish
{ {
name = "dracula"; name = "dracula";
@ -151,13 +140,6 @@ in
# Disable greeting # Disable greeting
set fish_greeting set fish_greeting
if test (uname) = "Darwin"; and test -z "$__NIX_DARWIN_SET_ENVIRONMENT_DONE"
set __nifoc_nix_darwin_set_env (grep '-set-environment' /run/current-system/etc/bashrc | cut -d '.' -f 2)
set __nifoc_old_editor "$EDITOR"
fenv source "$__nifoc_nix_darwin_set_env"
set -g EDITOR "$__nifoc_old_editor"
end
if test -d "$HOME/.bin" if test -d "$HOME/.bin"
set -gx PATH "$HOME/.bin" $PATH set -gx PATH "$HOME/.bin" $PATH
end end

22
home/programs/nvim/plugins.nix
View file

@ -127,8 +127,8 @@ rec {
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "HiPhish"; owner = "HiPhish";
repo = "nvim-ts-rainbow2"; repo = "nvim-ts-rainbow2";
rev = "cee4601ff8aac73dee4afa1074814343bb5a0b80"; rev = "742049ef6716f59c7202644a026d8dc09fc60c52";
sha256 = "0g0jy6jcpmpia6k8c0i91yjajx9crin4lgwmmmr0dl20yd77gqki"; sha256 = "1d5p5w3vsz9pajdz4j2wmfv5nkv4bdhp084h5lhh58z0vcj62z1m";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -181,12 +181,12 @@ rec {
}; };
todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "todo-comments.nvim"; pname = "todo-comments.nvim";
version = "2023-03-12"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "todo-comments.nvim"; repo = "todo-comments.nvim";
rev = "6ccb0bebeb22dbe31940776a750db54b844ae653"; rev = "14e2cd9a6e5e67483a03660f08471ca9a981c4a5";
sha256 = "1dmvry7m4rdwrqmb7kaa4zx9mcda8n1yagabyg7nds7jyld671gw"; sha256 = "1mk0adblrfjhhrngc3zvrp2f348cdvj4nx7mmpjv8vq7vpvr5b4h";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -467,12 +467,12 @@ rec {
}; };
nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "2023-03-13"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "5b2bcb9ca8315879181f468b37a897100d631005"; rev = "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a";
sha256 = "0ij8jgvhyqrlw077296dx9ck0agjdd2p5r5fiizsvxrwv0jc6ikj"; sha256 = "11dm8vyxsy1b7c93f8gx5n6x4qf86b821myqaa09k1g761skrsvz";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -577,12 +577,12 @@ rec {
}; };
noice-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { noice-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "noice.nvim"; pname = "noice.nvim";
version = "2023-03-15"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "noice.nvim"; repo = "noice.nvim";
rev = "0c493e5d243c39adf3d6ce7683a16e610cc44e0a"; rev = "92b058ad183fccd3b970f03ae49094596a6c735b";
sha256 = "1x774zzf835my8nk8q750jb6d38rr059yj416r1chbygw4y4zvyk"; sha256 = "0k6nl575m3kfq4xls12kr0zpq924q58y8qp4y034xzfzvbibim8n";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

9
system/darwin/fish.nix Normal file
View file

@ -0,0 +1,9 @@
{ pkgs, ... }:
{
programs.fish = {
enable = true;
useBabelfish = true;
babelfishPackage = pkgs.babelfish;
};
}

1
system/hosts/Styx.nix
View file

@ -10,6 +10,7 @@ in
../darwin/defaults.nix ../darwin/defaults.nix
../darwin/fonts.nix ../darwin/fonts.nix
../darwin/sudo.nix ../darwin/sudo.nix
../darwin/fish.nix
]; ];
nix = { nix = {