Compare commits
2 commits
7620362fd5
...
3d4a76f145
Author | SHA1 | Date | |
---|---|---|---|
3d4a76f145 | |||
ce6c3a1d49 |
7 changed files with 57 additions and 56 deletions
|
@ -2,8 +2,47 @@
|
|||
nifoc-treesitter (require :nifoc.treesitter)
|
||||
disable-parsers []]
|
||||
(nifoc-treesitter.setup)
|
||||
(treesitter-config.setup {:ensure_installed []
|
||||
:sync_install true
|
||||
(treesitter-config.setup {:parser_install_dir _G.nvim_treesitter_parser_directory
|
||||
:ensure_installed [:angular
|
||||
:bash
|
||||
:css
|
||||
:diff
|
||||
:dockerfile
|
||||
:eex
|
||||
:elixir
|
||||
:erlang
|
||||
:fennel
|
||||
:fish
|
||||
:git_config
|
||||
:git_rebase
|
||||
:gitattributes
|
||||
:gitcommit
|
||||
:gitignore
|
||||
:graphql
|
||||
:heex
|
||||
:html
|
||||
:http
|
||||
:java
|
||||
:javascript
|
||||
:jsdoc
|
||||
:json
|
||||
:lua
|
||||
:make
|
||||
:markdown
|
||||
:markdown_inline
|
||||
:nix
|
||||
:python
|
||||
:query
|
||||
:regex
|
||||
:ruby
|
||||
:scss
|
||||
:sql
|
||||
:svelte
|
||||
:toml
|
||||
:tsx
|
||||
:typescript
|
||||
:vim]
|
||||
:sync_install false
|
||||
:auto_install false
|
||||
:highlight {:enable true :disable disable-parsers}
|
||||
:indent {:enable true :disable disable-parsers}
|
||||
|
|
|
@ -51,54 +51,10 @@ in
|
|||
xcbuild
|
||||
];
|
||||
|
||||
extraLuaConfig =
|
||||
let
|
||||
treesitter-parsers = pkgs.symlinkJoin {
|
||||
name = "treesitter-parsers";
|
||||
paths = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
|
||||
p.angular
|
||||
p.bash
|
||||
#p.comment # slow
|
||||
p.css
|
||||
p.diff
|
||||
p.dockerfile
|
||||
p.eex
|
||||
p.elixir
|
||||
p.erlang
|
||||
p.fennel
|
||||
p.fish
|
||||
p.graphql
|
||||
p.heex
|
||||
p.html
|
||||
p.http
|
||||
p.java
|
||||
p.javascript
|
||||
p.jsdoc
|
||||
p.json
|
||||
p.kotlin
|
||||
p.lua
|
||||
p.make
|
||||
p.markdown
|
||||
p.markdown_inline
|
||||
p.nix
|
||||
p.python
|
||||
p.query
|
||||
p.regex
|
||||
p.ruby
|
||||
p.scss
|
||||
p.sql
|
||||
p.svelte
|
||||
p.toml
|
||||
p.tsx
|
||||
p.typescript
|
||||
p.vim
|
||||
p.yaml
|
||||
])).dependencies;
|
||||
};
|
||||
in
|
||||
/* lua */ ''
|
||||
extraLuaConfig = /* lua */ ''
|
||||
vim.loader.enable()
|
||||
vim.opt.runtimepath:prepend("${treesitter-parsers}")
|
||||
_G.nvim_treesitter_parser_directory = os.getenv("HOME") .. "/.local/share/nvim/nvim-treesitter_parser"
|
||||
vim.opt.runtimepath:prepend(_G.nvim_treesitter_parser_directory)
|
||||
|
||||
require('nifoc.nix')
|
||||
require('configuration.init')
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
../nixos/chrony.nix
|
||||
|
||||
(import ../nixos/forgejo-runner.nix (args // { name = "argon"; tag = "ubuntu-latest-arm64"; nixTag = "arm64"; }))
|
||||
(import ../nixos/forgejo-runner.nix (args // { inherit secret; name = "argon"; tag = "ubuntu-latest-arm64"; nixTag = "arm64"; }))
|
||||
|
||||
../nixos/grafana.nix
|
||||
../nixos/loki.nix
|
||||
|
|
|
@ -34,7 +34,7 @@ in
|
|||
../nixos/fedifetcher.nix
|
||||
|
||||
../nixos/forgejo.nix
|
||||
(import ../nixos/forgejo-runner.nix (args // { name = "tanker"; tag = "ubuntu-latest-amd64"; nixTag = "amd64"; }))
|
||||
(import ../nixos/forgejo-runner.nix (args // { inherit secret; name = "tanker"; tag = "ubuntu-latest-amd64"; nixTag = "amd64"; }))
|
||||
|
||||
../nixos/headscale.nix
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, name, tag, nixTag, ... }:
|
||||
{ pkgs, config, secret, name, tag, nixTag, ... }:
|
||||
|
||||
# Based on: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix
|
||||
|
||||
|
@ -53,8 +53,14 @@ in
|
|||
cat <<NIX_CONFIG > etc/nix/nix.conf
|
||||
accept-flake-config = true
|
||||
experimental-features = nix-command flakes
|
||||
substituters = https://attic.cache.daniel.sx/nifoc-ci?priority=1 https://nix-community.cachix.org?priority=2 https://cache.nixos.org/
|
||||
trusted-public-keys = nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
|
||||
NIX_CONFIG
|
||||
|
||||
cat <<NIX_NETRC > etc/nix/netrc
|
||||
${secret.forgejo_runner.netrc}
|
||||
NIX_NETRC
|
||||
|
||||
cat <<NSSWITCH > etc/nsswitch.conf
|
||||
passwd: files mymachines systemd
|
||||
group: files mymachines systemd
|
||||
|
|
Loading…
Reference in a new issue