zaphar/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix vimrc and zshrc

Browse Source
This commit is contained in:
Jeremy Wall 2023-06-26 17:33:26 -04:00
parent eb5034f110
commit 21c5e483ec
7 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.vimrc → nix/base-system/.vimrc
View File

0
.zshrc → nix/base-system/.zshrc
View File

7
nix/base-system/flake.nix
View File

@ -24,7 +24,7 @@
systemModule = system: let systemModule = system: let
runwhen = runwhen-flake.defaultPackage."${system}"; runwhen = runwhen-flake.defaultPackage."${system}";
durnitisp = durnitisp-flake.defaultPackage."${system}"; durnitisp = durnitisp-flake.defaultPackage."${system}";
rust-overlay = rust-overlay-flake.overlay; rust-overlay = rust-overlay-flake.overlays.default;
sile = sile-flake.defaultPackage.${system}; sile = sile-flake.defaultPackage.${system};
jj = jj-flake.packages."${system}".jujutsu; jj = jj-flake.packages."${system}".jujutsu;
age = agenix-flake.packages."${system}".default; age = agenix-flake.packages."${system}".default;
@ -32,6 +32,7 @@
imports = [ imports = [
agenix-flake.nixosModules.default agenix-flake.nixosModules.default
./program-neovim.nix
]; ];
config = { config = {
@ -48,7 +49,7 @@
programs = with pkgs; { programs = with pkgs; {
neovim.enable = true; neovim.enable = true;
neovim.configure = { neovim.configure = {
#customRC = (builtins.readFile ../.vimrc); customRc = (builtins.readFile ./.vimrc);
packages.myVimPackage = with pkgs.vimPlugins; { packages.myVimPackage = with pkgs.vimPlugins; {
start = [ start = [
coc-nvim coc-nvim
@ -74,7 +75,7 @@
}; };
}; };
zsh.enable = true; # default shell on catalina zsh.enable = true; # default shell on catalina
#zsh.interactiveShellInit = (builtins.readFile ../.zshrc); zsh.interactiveShellInit = (builtins.readFile ./.zshrc);
}; };
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
nodejs nodejs

8
nix/darwin/program-neovim.nix → nix/base-system/program-neovim.nix
View File

@ -61,9 +61,6 @@ in {
default = {}; default = {};
example = literalExpression '' example = literalExpression ''
{ {
customRC = '''
" here your custom configuration goes!
''';
packages.myVimPackage = with pkgs.vimPlugins; { packages.myVimPackage = with pkgs.vimPlugins; {
# loaded on launch # loaded on launch
start = [ fugitive ]; start = [ fugitive ];
@ -156,10 +153,7 @@ in {
programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package { programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
inherit (cfg) viAlias vimAlias withPython3 withNodeJs withRuby; inherit (cfg) viAlias vimAlias withPython3 withNodeJs withRuby;
configure = cfg.configure // { configure = cfg.configure // {
customRC = (cfg.configure.customRC or "");
customRC = (cfg.configure.customRC or "") + ''
set runtimepath^=${runtime}/etc
'';
}; };
}; };
}; };

6
nix/darwin/darwin-configuration.nix
View File

@ -3,16 +3,12 @@
nix = { nix = {
package = pkgs.nix; package = pkgs.nix;
useSandbox = true; settings.sandbox = true;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
}; };
imports = [
./program-neovim.nix
];
# Right now the documentation build is broken. # Right now the documentation build is broken.
# TODO(jwall): Add this back when they work again. # TODO(jwall): Add this back when they work again.
documentation.enable = false; documentation.enable = false;

23
nix/darwin/flake.lock generated
View File

@ -32,12 +32,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-wsNz9Dl40+AXhNPHEuWxGtczgPQxCJ3P08iRdKu06+o=", "narHash": "sha256-FYoAPOEpojtsQR3jHFL7H1yC5hvffXWUhTNehjxiicM=",
"path": "/nix/store/r8nbb698wy9pvybh7207jl7zv8fj19k6-source/nix/base-system", "path": "/nix/store/9s2a41g96r1hgr9832cl0wbwij08s8yf-source/nix/base-system",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/r8nbb698wy9pvybh7207jl7zv8fj19k6-source/nix/base-system", "path": "/nix/store/9s2a41g96r1hgr9832cl0wbwij08s8yf-source/nix/base-system",
"type": "path" "type": "path"
} }
}, },
@ -69,11 +69,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1648278671, "lastModified": 1687691275,
"narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=", "narHash": "sha256-VVywT8ubStvDPF5TscDBokT3T0l3zsOzCW056noh5zc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79", "rev": "25ae710ba3cd448c5d5678788d37f3d149378bc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -472,12 +472,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1687701825, "lastModified": 1687274257,
"narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=", "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"owner": "NixOS", "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"repo": "nixpkgs", "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea", "type": "path"
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",

1
nix/darwin/flake.nix
View File

@ -21,7 +21,6 @@
modules = [ modules = [
(base-system.systemModule system) (base-system.systemModule system)
./darwin-configuration.nix ./darwin-configuration.nix
]; ];
}); });
in in