erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:1a37a82af9d576b1e1e91583e616a3639b575497
Branches Tags
erwin:main
..
compare: erwin:560260f36cd1720375ad23d4d4f82fe1fdf035a7
Branches Tags
erwin:main

No commits in common. "1a37a82af9d576b1e1e91583e616a3639b575497" and "560260f36cd1720375ad23d4d4f82fe1fdf035a7" have entirely different histories.
1a37a82af9 ... 560260f36c

2 changed files with 9 additions and 18 deletions
Show stats Expand all files Collapse all files

21
home-manager/modules/emacs/default.nix
View file

@ -12,17 +12,6 @@ with lib; let
cp ${initFile} $out cp ${initFile} $out
''; '';
tree-sitter-hare = pkgs.tree-sitter.buildGrammar {
language = "tree-sitter-hare";
version = "unstable-2023-12-31";
src = pkgs.fetchFromSourcehut {
owner = "~ecs";
repo = "tree-sitter-hare";
rev = "9408bb8fd6c110307f7c92fa834eb5dbd92e36d8";
sha256 = "iqaj+7Ax5zfXGXsJw5pesTlTeah2X4Li4LpInDSUTcU=";
};
};
emacsWithPackages = pkgs.emacsWithPackagesFromUsePackage { emacsWithPackages = pkgs.emacsWithPackagesFromUsePackage {
config = config =
let let
@ -61,7 +50,6 @@ with lib; let
tree-sitter-gomod tree-sitter-gomod
tree-sitter-gowork tree-sitter-gowork
tree-sitter-graphql tree-sitter-graphql
tree-sitter-hare
tree-sitter-haskell tree-sitter-haskell
tree-sitter-hcl tree-sitter-hcl
tree-sitter-heex tree-sitter-heex
@ -77,7 +65,14 @@ with lib; let
tree-sitter-markdown tree-sitter-markdown
tree-sitter-markdown-inline tree-sitter-markdown-inline
tree-sitter-nix tree-sitter-nix
tree-sitter-nu (tree-sitter-nu.overrideAttrs (_prevAttr: {
src = pkgs.fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "307559b6a3885ef0c55bcd5e23e9e164a7ce03bd";
sha256 = "RuvR2Yb2CTxpxyXgr+2uUQa9N75sIhYlS9moyedZo8A=";
};
}))
tree-sitter-pioasm tree-sitter-pioasm
tree-sitter-python tree-sitter-python
tree-sitter-query tree-sitter-query

6
home-manager/modules/nushell/default.nix
View file

@ -27,8 +27,6 @@ in
${config.programs.zoxide.package}/bin/zoxide init nushell ${zoxideOptions} | save --force ${config.xdg.cacheHome}/zoxide/init.nu ${config.programs.zoxide.package}/bin/zoxide init nushell ${zoxideOptions} | save --force ${config.xdg.cacheHome}/zoxide/init.nu
# Temporary fix until zoxide releases new version # Temporary fix until zoxide releases new version
sed -i 's/def-env/def --env/g' ${config.xdg.cacheHome}/zoxide/init.nu sed -i 's/def-env/def --env/g' ${config.xdg.cacheHome}/zoxide/init.nu
$env.NU_LIB_DIRS = ($env.NU_LIB_DIRS | append ${pkgs.nu_scripts}/share/nu_scripts)
''; '';
extraConfig = '' extraConfig = ''
alias vim = nvim alias vim = nvim
@ -42,9 +40,7 @@ in
use kink.nu use kink.nu
# use ${pkgs.nu_scripts}/share/nu_scripts/themes/nu-themes/dracula.nu use ${pkgs.nu_scripts}/share/nu_scripts/themes/nu-themes/dracula.nu
use themes/nu-themes/dracula.nu
$env.config = ($env.config | merge { color_config: (dracula)}) $env.config = ($env.config | merge { color_config: (dracula)})
source ${config.xdg.cacheHome}/zoxide/init.nu source ${config.xdg.cacheHome}/zoxide/init.nu