teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity
1687 commits 8 branches 43 tags 12 MiB
Commit graph

1687 commits

This branch
This branch
All branches
Author SHA1 Message Date
teutat3s 4e1807ba05
flora-6: switch forgejo runner docker image to custom 
built nix-flakes-node image, source:
https://git.pub.solar/pub-solar/nix-flakes-node
 2023-10-31 23:38:02 +01:00
teutat3s 50614131d2
flora-6: disable migrated services, enable ci runner 
for forgejo actions

https://forgejo.org/docs/latest/admin/actions
 2023-10-30 02:14:52 +01:00
teutat3s ad5b1ba65b
chore: bump flake inputs nixos-23.05 and nixos-unstable 2023-10-30 02:14:00 +01:00
hensoko d5670ac8d2
Merge pull request 'chore: add Mastodon maintenance page' (#259) from chore/mastodon-maintenance into infra 
Reviewed-on: pub-solar/os#259
Reviewed-by: hensoko <hensoko@gssws.de>
 2023-10-27 23:12:47 +02:00
Benjamin Bädorf dd9af147c7
chore: add Mastodon maintenance page 
Depends on pub-solar/pub.solar#15 being
merged and deployed.
 2023-10-27 22:54:39 +02:00
b12f b97fd41b92
Merge pull request 'infra: fix deploy-rs + collabora container' (#256) from infra-fix-deploy-collabora into infra 
Reviewed-on: pub-solar/os#256
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-10-13 11:26:43 +02:00
teutat3s 2579cc5284
Add some more docs to flora-6 README 
Document how to deploy to flora-6

Document how to get SSH access
 2023-10-08 14:35:47 +02:00
teutat3s c6675e75a6
Fix: always pull new docker images 2023-09-15 12:16:23 +02:00
teutat3s b0596b9f44
Fix collabora docker container 2023-09-15 12:15:57 +02:00
teutat3s 7715a89401
Fix deploy-rs, use flake binary again 
Can be reverted once deploy-rs nixpkgs binary is up-to-date
See: https://github.com/serokell/deploy-rs/issues/232
 2023-09-15 12:13:47 +02:00
b12f df50f9ff2d
Merge pull request 'chore: merge main into infra' (#255) from chore/infra-merge-main into infra 
Reviewed-on: pub-solar/os#255
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-09-13 13:29:18 +02:00
teutat3s 12307872d6
Merge branch 'main' into chore/infra-merge-main 2023-09-13 13:17:11 +02:00
teutat3s 4a7b5f3bb2
Merge pull request 'Bump flake inputs in lock file' (#254) from feat/main-bump-flake-lock into main 
Reviewed-on: pub-solar/os#254
 2023-09-13 13:13:57 +02:00
teutat3s d83389b1dd
Use docker version 24 2023-09-13 12:38:31 +02:00
teutat3s dfd80c0e95
Fix nvfetcher by using forked nixpkgs 
See upstream issue: https://github.com/NixOS/nixpkgs/issues/249962
 2023-09-13 12:38:12 +02:00
b12f e260839584
Merge pull request 'Fix git ref git.b12f.io -> git.pub.solar' (#253) from infra-fix-git-ref-vm-tools into infra 
Reviewed-on: pub-solar/os#253
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-09-13 12:36:48 +02:00
teutat3s 9685baa34b
Fix formatting 2023-09-13 12:19:16 +02:00
teutat3s 110e0aefad
Bump flake inputs in lock file 
• Updated input 'latest':
    'github:nixos/nixpkgs/5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0' (2023-07-20)
  → 'github:nixos/nixpkgs/3a2786eea085f040a66ecde1bc3ddc7099f6dbeb' (2023-09-11)
• Updated input 'nixos':
    'github:nixos/nixpkgs/08700de174bc6235043cb4263b643b721d936bdb' (2023-07-18)
  → 'github:nixos/nixpkgs/e5f018cf150e29aac26c61dac0790ea023c46b24' (2023-09-12)
• Updated input 'darwin':
    'github:LnL7/nix-darwin/b06bab83bdf285ea0ae3c8e145a081eb95959047' (2023-07-02)
  → 'github:LnL7/nix-darwin/4496ab26628c5f43d2a5c577a06683c753e32fe2' (2023-09-12)
• Updated input 'deploy':
    'github:serokell/deploy-rs/724463b5a94daa810abfc64a4f87faef4e00f984' (2023-06-14)
  → 'github:serokell/deploy-rs/31c32fb2959103a796e07bbe47e0a5e287c343a8' (2023-09-12)
• Updated input 'home':
    'github:nix-community/home-manager/07c347bb50994691d7b0095f45ebd8838cf6bc38' (2023-06-27)
  → 'github:nix-community/home-manager/9787dffff5d315c9593d3f9fb0f9bf2097e1b57b' (2023-09-11)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/429f232fe1dc398c5afea19a51aad6931ee0fb89' (2023-06-15)
  → 'github:nixos/nixos-hardware/3ccd87fcdae4732fe33773cefa4375c641a057e7' (2023-09-13)
 2023-09-13 12:12:25 +02:00
teutat3s 93ccb899ba
Fix git ref git.b12f.io -> git.pub.solar 2023-09-13 12:06:28 +02:00
b12f 6691801d0f
Merge pull request 'feat: add collabora' (#252) from infra-collabora into infra 
Reviewed-on: pub-solar/os#252
Reviewed-by: teutat3s <teutates@mailbox.org>
 2023-09-13 11:11:15 +02:00
Benjamin Bädorf c5f0dca0d5
feat: add collabora 2023-09-13 10:25:23 +02:00
teutat3s fcf960a70f
Merge pull request 'nvfetcher: use version 0.6.1.0 from latest instead of flake' (#249) from main-nvfetcher-override into main 
Reviewed-on: pub-solar/os#249
 2023-07-21 12:33:05 +02:00
teutat3s 5acbaa3dd5
flake: update nixos + latest inputs 
• Updated input 'latest':
    'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
  → 'github:nixos/nixpkgs/5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0' (2023-07-20)
• Updated input 'nixos':
    'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13)
  → 'github:nixos/nixpkgs/08700de174bc6235043cb4263b643b721d936bdb' (2023-07-18)
 2023-07-21 12:23:33 +02:00
teutat3s 88404be55b
Bump nvfetcher 2023-07-21 12:23:23 +02:00
teutat3s 5a05079e17
graphical: fix network-manager-applet service description 2023-07-21 12:10:47 +02:00
teutat3s 2d27b9c315
nvfetcher: use version 0.6.1.0 from latest instead of flake 2023-07-21 12:04:14 +02:00
teutat3s 8f4f5687f2
Merge pull request 'feat: use nnn and treesitter' (#235) from feat/nnn into main 
Reviewed-on: pub-solar/os#235
Reviewed-by: teutat3s <teutates@mailbox.org>
 2023-07-21 11:46:26 +02:00
Benjamin Bädorf 9bade4eb64
feat: add line length indicators to gitmessage 2023-07-20 23:59:36 +02:00
Benjamin Bädorf d951e821b3
feat: add back vim-gutentags to nvim 2023-07-20 23:59:08 +02:00
teutat3s 0691f3b4c7
Merge pull request 'keycloak: enable feature declarative-user-profile' (#248) from flora-6/keycloak-enable-custom-user-profile into infra 
Reviewed-on: pub-solar/os#248
 2023-07-20 20:14:31 +02:00
teutat3s f4a29822fb
keycloak: enable feature declarative-user-profile 
This is useful for setting required attributes, e.g. to exclude
firstName and lastName from the required attributes in the user profile
 2023-07-20 20:10:02 +02:00
teutat3s 6af5bcf09f
Merge pull request 'keycloak: several fixes for the pub.solar keycloak theme' (#247) from flora-6/fix-keycloak-theme into infra 
Reviewed-on: pub-solar/os#247
 2023-07-20 19:57:03 +02:00
teutat3s 75b97bb6c1
keycloak: several fixes for the pub.solar keycloak theme 
See:
pub-solar/keycloak-theme#1
 2023-07-20 19:53:46 +02:00
teutat3s 077241a9d9
Merge pull request 'chore/update-infra-07-23' (#236) from chore/update-infra-07-23 into infra 
Reviewed-on: pub-solar/os#236
Reviewed-by: teutat3s <teutates@mailbox.org>
 2023-07-15 03:17:39 +02:00
teutat3s 1fe6d34f6e
neovim: add syntax highlighting for ini, lua, 
bash, make, ninja, diff, php

Sort nvim-treesitter.withPlugins alphabetically
 2023-07-14 13:38:01 +02:00
teutat3s 9271e8d037
Fix merge conflict leftovers 2023-07-14 13:13:13 +02:00
teutat3s fd74f59c39
Bump flake inputs nixos + latest in lockfile 
• Updated input 'latest':
    'github:nixos/nixpkgs/645ff62e09d294a30de823cb568e9c6d68e92606' (2023-07-01)
  → 'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
• Updated input 'nixos':
    'github:nixos/nixpkgs/b72aa95f7f096382bff3aea5f8fde645bca07422' (2023-06-30)
  → 'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13)
 2023-07-14 13:12:50 +02:00
teutat3s 17c76ec7b1
caddy: use module from latest to enable gracefully 
reloading upon config change instead of restarting
 2023-07-13 21:16:12 +02:00
teutat3s bce484f55b
Bump flake inputs nixos + latest in lockfile 
• Updated input 'latest':
    'github:nixos/nixpkgs/645ff62e09d294a30de823cb568e9c6d68e92606' (2023-07-01)
  → 'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
• Updated input 'nixos':
    'github:nixos/nixpkgs/b72aa95f7f096382bff3aea5f8fde645bca07422' (2023-06-30)
  → 'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13)
 2023-07-13 21:15:57 +02:00
Benjamin Bädorf d909f093b2
Merge branch 'main' into chore/update-infra-07-23 2023-07-13 18:16:02 +02:00
Benjamin Bädorf e36709613c
fix: load schemastore for nvim 2023-07-13 18:07:58 +02:00
Benjamin Bädorf 41c2d668f7
feat: use nnn and treesitter 
vifm is removed in favour of nnn, with the keybindings in nvim being
changed. TODO: improve the colorscheme of `nnn` to match `ls`.

All nvim plugins that were responsible for language syntax highlighting
are removed in favour of treesitter[1], a syntax highlighter that parses
AST instead of being regex-based. This is still experimental, but my
tests so far have not encountered any issues.

1) https://github.com/nvim-treesitter/nvim-treesitter
 2023-07-13 17:15:53 +02:00
b12f 3ef9ba217e
Merge pull request 'fix: move pre-commit treefmt hook into CI' (#234) from fix/fmt-lint into main 
Reviewed-on: pub-solar/os#234
Reviewed-by: teutat3s <teutates@mailbox.org>
 2023-07-13 17:11:26 +02:00
Benjamin Bädorf 3c3abec238
fix: move pre-commit treefmt hook into CI 
The logic inside the hook was rather broken, causing confusing merges,
stashes, and aborts. Unfortunately `treefmt` does not provide a pure
lint option that checks without writing the changes. So instead, we do
this in CI.
 2023-07-13 17:05:27 +02:00
b12f 8d23a7df43
Merge pull request 'Shiny cherrypicks from teutat3s branch' (#231) from main-cherrypick-from-teutat3s into main 
Reviewed-on: pub-solar/os#231
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-07-13 16:15:05 +02:00
b12f a25d399575
Merge pull request 'flora-6: add back openssh MACs that got removed' (#233) from infra-openssh-mac-defaults into infra 
Reviewed-on: pub-solar/os#233
Reviewed-by: Akshay Mankar <axeman@noreply.git.pub.solar>
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-07-07 14:43:51 +02:00
teutat3s 6fd2903516
flora-6: add back openssh MACs that got removed 
from defaults

NixOS default openssh MACs have changed to use "encrypt-then-mac" only.
This breaks compatibilty with clients that do not offer these MACs. For
compatibility reasons, we add back the old defaults.
See: https://github.com/NixOS/nixpkgs/pull/231165

https://blog.stribik.technology/2015/01/04/secure-secure-shell.html
https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67
 2023-07-07 12:13:57 +02:00
b12f 747fbd5dff
Merge pull request 'Init CONTRIBUTING.md' (#210) from docs/add-contributing into main 
Reviewed-on: pub-solar/os#210
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-07-05 13:53:10 +02:00
teutat3s b2d0c80f79
flake: fix broken deploy-rs usage 
Still doesn't use deploy-rs from nixpkgs because of usage in digga:
https://github.com/divnix/digga/blob/main/src/generators.nix#L77
 2023-07-04 01:42:50 +02:00
teutat3s be42efff50
nvfetcher: update sources 2023-07-04 01:42:50 +02:00