Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f

This commit is contained in:
Benjamin Bädorf 2021-11-01 10:11:14 +01:00
commit 61e87ee30b
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
14 changed files with 57 additions and 44 deletions

View file

@ -22,6 +22,7 @@ steps:
- git checkout -b devos --track origin/devos
- git merge -X theirs devos/main
- git push origin devos
- git remote set-url origin https://git.b12f.io/pub-solar/os.git
- name: "Sync $BRANCH with upstream"
image: alpine/git
@ -36,7 +37,7 @@ steps:
GITEA_SSH_KEY:
from_secret: gitea_ssh_key
commands:
- git fetch --all
- git fetch origin
- git checkout origin/main
- ./.drone/setup_ssh.sh
- git remote set-url origin git@git.b12f.io:pub-solar/os
@ -84,6 +85,6 @@ steps:
template: "Upstreaming {{ build.status }} [{{ build.branch }}#{{ truncate build.commit 8 }}]({{ build.link }}) by {{ build.author }}. [Pull requests](https://git.b12f.io/pub-solar/os/pulls)"
---
kind: signature
hmac: 145dff5d1aac21f4c68f186cc2dbd98ccb8f08f23af8df3528de6a21defee1c7
hmac: 07d9a95e8f577483d753e9eea76229ffe0c369ecd642bfc364ae183f662d2167
...

View file

@ -1,4 +0,0 @@
# Do not edit this file. To specify the files to encrypt, create your own
# .gitattributes file in the directory where your files are.
* !filter !diff
*.gpg binary

View file

@ -2,7 +2,7 @@ name: "Check & Cachix"
on:
push:
branches:
- master
- main
- trying
- staging
jobs:

View file

@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages
on:
push:
branches:
- master
- main
jobs:
deploy:

View file

@ -19,7 +19,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: master
ref: main
- name: Update Changelog
uses: heinrichreimer/github-changelog-generator-action@v2.1.1
with:
@ -49,7 +49,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: master
ref: main
- name: Get Changelog Entry
id: changelog_reader

View file

@ -82,7 +82,7 @@ DevOS is licensed under the [MIT License][mit].
[giants]: https://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants
[home-manager]: https://nix-community.github.io/home-manager
[mit]: https://mit-license.org
[mk-flake]: https://github.com/divnix/digga/tree/master/src/mkFlake
[mk-flake]: https://github.com/divnix/digga/tree/main/src/mkFlake
[nix]: https://nixos.org/manual/nix/stable
[nixos]: https://nixos.org/manual/nixos/stable
[nixpkgs]: https://github.com/NixOS/nixpkgs

View file

@ -47,8 +47,5 @@ This calls `nixos-rebuild` with sudo to build and install your configuration.
> ##### _Notes:_
> - Instead of `switch`, you can pass `build`, `test`, `boot`, etc just as with
> `nixos-rebuild`.
>
> - It is convenient to have the template living at `/etc/nixos` so you can
> simply `sudo nixos-rebuild switch` from anywhere on the system, but it is
> not required.

View file

@ -3,7 +3,7 @@ set $middle "Hewlett Packard HP E231 3CQ4290S5J"
set $standup "Hewlett Packard HP E231 3CQ4251F33"
output $internal {
scale 1.3
scale 1
pos 0 500
}

View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... }:
{ lib, config, pkgs, self, ... }:
with lib;
let
psCfg = config.pub-solar;
@ -37,7 +37,7 @@ in
programs.neovim = import ./nvim { inherit config; inherit pkgs; };
programs.fzf = import ./fzf { inherit config; inherit pkgs; };
programs.zsh = import ./zsh { inherit config; inherit pkgs; };
programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; };
};
};
}

View file

@ -78,74 +78,75 @@ in
];
extraPackages = with pkgs; [
nodejs
ccls
code-minimap
gopls
nodejs
nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs
nodePackages.svelte-language-server
nodePackages.typescript-language-server
nodePackages.typescript
nodePackages.typescript-language-server
nodePackages.vim-language-server
nodePackages.vue-language-server
nodePackages.yaml-language-server
nodePackages.vscode-json-languageserver-bin
nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-css-languageserver-bin
python3Full
nodePackages.vscode-html-languageserver-bin
nodePackages.vscode-json-languageserver-bin
nodePackages.yaml-language-server
python-language-server
python3Full
solargraph
rust-analyzer
universal-ctags
ccls
rnix-lsp
rust-analyzer
terraform-ls
universal-ctags
];
plugins = with pkgs.vimPlugins; [
nvim-lspconfig
lsp_extensions-nvim
completion-nvim
lsp_extensions-nvim
nvim-lspconfig
suda
ack-vim
syntastic
airline
workspace
editorconfig-vim
vim-vinegar
vim-gutentags
minimap-vim
nnn-vim
suda
syntastic
vim-gutentags
vim-vinegar
workspace
sonokai
fugitive
vim-rhubarb
vim-gitgutter
vim-rhubarb
vimagit
vim-highlightedyank
fzf-vim
fzfWrapper
vim-highlightedyank
beautify
vim-surround
vim-sensible
vim-bufkill
vim-sensible
ansible-vim
emmet-vim
rust-vim
vim-go
vim-vue
vim-javascript
vim-json
vim-markdown
yats-vim
vim-nix
vim-ruby
vim-toml
vim-nix
vim-vue
yats-vim
vim-mdx-js
];
}

View file

@ -6,7 +6,7 @@ let g:gutentags_file_list_command = 'git ls-files'
" Golang
" Go test shortcut
nmap <Leader>got :GoTest<CR>
nmap <Leader>got :GoTest<CR>:botright copen<CR>
" Go formatting
autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, pkgs, self, ... }:
let
psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
@ -32,7 +32,7 @@ in
drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";
no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
# fix nixos-option
nixos-option = "nixos-option -I nixpkgs=/etc/nixos/lib/compat";
nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
};
zplug = {
enable = true;

View file

@ -20,13 +20,31 @@ in
matchBlocks = {
"git.b12f.io" = {
hostname = "git.b12f.io";
port = 2222;
user = "git";
port = 2222;
};
"aur.archlinux.org" = {
user = "aur";
};
"leavieler.art" = {
hostname = "web5svsvy.wh.hosting.zone";
user = "web5svsvy_cgzqa3";
port = 2244;
};
"benjaminbaedorf.eu" = {
hostname = "web5svsvy.wh.hosting.zone";
user = "web5svsvy_cgzqa3";
port = 2244;
};
"miom.space" = {
hostname = "web7dgkba.wh.hosting.zone";
user = "web7dgkba_c9em8f";
port = 2244;
};
};
};