axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into b12f

Browse source
This commit is contained in:
Benjamin Bädorf 2021-09-22 00:22:37 +00:00
parent 2e6fe672d2 1c47036e79
commit 6039a73b04
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.drone.yml
View file

@ -11,8 +11,6 @@ steps:
- cron - cron
cron: cron:
- sync-master-with-upstream - sync-master-with-upstream
- sync-b12f-with-master
- sync-teutat3s-with-master
environment: environment:
GITEA_SSH_KEY: GITEA_SSH_KEY:
from_secret: gitea_ssh_key from_secret: gitea_ssh_key

1
modules/terminal-life/default.nix
View file

@ -33,7 +33,6 @@ in
watson watson
nnn nnn
fd fd
direnv
]; ];
programs.neovim = import ./nvim { inherit config; inherit pkgs; }; programs.neovim = import ./nvim { inherit config; inherit pkgs; };