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

1646 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Bädorf d909f093b2
Merge branch 'main' into chore/update-infra-07-23 2023-07-13 18:16:02 +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
teutat3s 6bc4cd72e9
nvfetcher: bump sources 2023-07-04 01:42:49 +02:00
teutat3s 002e6970ed
flake: update lock file 
• Updated input 'darwin':
    'github:LnL7/nix-darwin/7c16d31383a90e0e72ace0c35d2d66a18f90fb4f' (2023-06-09)
  → 'github:LnL7/nix-darwin/b06bab83bdf285ea0ae3c8e145a081eb95959047' (2023-07-02)
• Updated input 'deploy':
    'github:serokell/deploy-rs/65211db63ba1199f09b4c9f27e5eba5ec50d76ac' (2023-06-05)
  → 'github:serokell/deploy-rs/724463b5a94daa810abfc64a4f87faef4e00f984' (2023-06-14)
• Updated input 'home':
    'github:nix-community/home-manager/e753d659c64c7d158433d87ef7d6151ca1d1817a' (2023-06-12)
  → 'github:nix-community/home-manager/07c347bb50994691d7b0095f45ebd8838cf6bc38' (2023-06-27)
• Updated input 'latest':
    'github:nixos/nixpkgs/75a5ebf473cd60148ba9aec0d219f72e5cf52519' (2023-06-11)
  → 'github:nixos/nixpkgs/645ff62e09d294a30de823cb568e9c6d68e92606' (2023-07-01)
• Updated input 'nixos':
    'github:nixos/nixpkgs/d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2' (2023-06-10)
  → 'github:nixos/nixpkgs/b72aa95f7f096382bff3aea5f8fde645bca07422' (2023-06-30)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/2a807ad6e8dc458db08588b78cc3c0f0ec4ff321' (2023-06-11)
  → 'github:nixos/nixos-hardware/429f232fe1dc398c5afea19a51aad6931ee0fb89' (2023-06-15)
• Updated input 'nvfetcher':
    'github:berberman/nvfetcher/c5ae2cb436a04f4590306589e71638d023a33bd4' (2023-05-27)
  → 'github:berberman/nvfetcher/44196458acc2c28c32e456c50277d6148e71e708' (2023-06-22)
• Updated input 'nvfetcher/flake-utils':
    'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
  → 'github:numtide/flake-utils/abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c' (2023-06-19)
 2023-07-04 01:42:49 +02:00
teutat3s ef0d7ca68d
base-user: add to video group, less should use our keybindings 2023-07-04 01:42:49 +02:00
teutat3s c73a49d4d2
nvfetcher: clean up unsused waybar entry 2023-07-04 01:42:49 +02:00
teutat3s 62933459b9
sway: add explanatory comment to launcher script 2023-07-04 01:42:49 +02:00
teutat3s ead398b835
bash: use latest ble.sh version 
Use fzf for completion again

Fix starship with newest ble.sh version, eval a second time after ble.sh
 2023-07-04 01:42:49 +02:00
teutat3s 442ba90068
chore: delete unused files 2023-07-04 01:42:49 +02:00
teutat3s 3d2aed46ab
neovim: trim final newline when copying to clipboard 2023-07-04 01:42:49 +02:00
teutat3s a479b8e544
devshell: stash only unstaged changes in pre-commit hook 2023-07-04 01:42:40 +02:00
b12f e834cc685c
Merge pull request 'flora-6: use renamed options in gitea.settings.server and openssh.settings' (#232) from infra-gitea-module-settings into infra 
Reviewed-on: pub-solar/os#232
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-07-03 14:38:57 +02:00
teutat3s c36a22c556
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-02 17:56:17 +02:00
teutat3s 9dbfb4eaaa
flora-6: use renamed openssh settings 
trace: warning: The option `services.openssh.permitRootLogin' defined in `/nix/store/ha98lp4l8ccspyfn5liq0k9ds3cs20zl-source/hosts/flora-6/flora-6.nix' has been renamed to `services.openssh.settings.PermitRootLogin'.
trace: warning: The option `services.openssh.passwordAuthentication' defined in `/nix/store/ha98lp4l8ccspyfn5liq0k9ds3cs20zl-source/hosts/flora-6/flora-6.nix' has been renamed to `services.openssh.settings.PasswordAuthentication'.
 2023-07-02 17:55:58 +02:00
teutat3s fc0768d353
gitea: use renamed options in gitea.settings.server 
trace: warning: The option `services.gitea.rootUrl' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.ROOT_URL'.
trace: warning: The option `services.gitea.httpPort' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.HTTP_PORT'.
trace: warning: The option `services.gitea.httpAddress' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.HTTP_ADDR'.
trace: warning: The option `services.gitea.domain' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.DOMAIN'.
 2023-07-02 17:55:58 +02:00
teutat3s ea69c1d12c
neovim: use nixd as nix language server 2023-07-02 15:57:00 +02:00
teutat3s c30c1700f4
bash: replace $USER with ~ in PROMPT_COMMAND 2023-07-02 15:55:42 +02:00
teutat3s b38c378003
Merge pull request 'infra: update to nixos-23.05' (#230) from infra-23.05 into infra 
Reviewed-on: pub-solar/os#230
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-07-02 14:59:04 +02:00
teutat3s 35ddf5d798
flake: update lock file 
• Updated input 'darwin':
    'github:LnL7/nix-darwin/252541bd05a7f55f3704a3d014ad1badc1e3360d' (2023-05-10)
  → 'github:LnL7/nix-darwin/43587cdb726f73b962f12028055520dbd1d7233f' (2023-06-30)
• Updated input 'deploy':
    'github:serokell/deploy-rs/c80189917086e43d49eece2bd86f56813500a0eb' (2023-05-11)
  → 'github:serokell/deploy-rs/724463b5a94daa810abfc64a4f87faef4e00f984' (2023-06-14)
• Updated input 'home':
    'github:nix-community/home-manager/f9edbedaf015013eb35f8caacbe0c9666bbc16af' (2023-04-10)
  → 'github:nix-community/home-manager/07c347bb50994691d7b0095f45ebd8838cf6bc38' (2023-06-27)
• Removed input 'home/utils'
• Updated input 'latest':
    'github:nixos/nixpkgs/897876e4c484f1e8f92009fd11b7d988a121a4e7' (2023-05-06)
  → 'github:nixos/nixpkgs/645ff62e09d294a30de823cb568e9c6d68e92606' (2023-07-01)
• Updated input 'nixos':
    'github:nixos/nixpkgs/9656e85a15a0fe67847ee8cdb99a20d8df499962' (2023-05-12)
  → 'github:nixos/nixpkgs/b72aa95f7f096382bff3aea5f8fde645bca07422' (2023-06-30)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/81cd886719e10d4822b2a6caa96e95d56cc915ef' (2023-05-13)
  → 'github:nixos/nixos-hardware/429f232fe1dc398c5afea19a51aad6931ee0fb89' (2023-06-15)
• Added input 'nvfetcher':
    'github:berberman/nvfetcher/44196458acc2c28c32e456c50277d6148e71e708' (2023-06-22)
• Added input 'nvfetcher/flake-compat':
    follows 'flake-compat'
• Added input 'nvfetcher/flake-utils':
    'github:numtide/flake-utils/abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c' (2023-06-19)
• Added input 'nvfetcher/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'nvfetcher/nixpkgs':
    follows 'nixos'
 2023-07-02 13:29:39 +02:00
teutat3s 91a89f172d
flake: fix leftover merge conflict 2023-07-02 13:27:04 +02:00
teutat3s 38ebdcf0dc
Merge branch 'main' into infra 2023-07-02 13:26:12 +02:00
teutat3s 1459aa9ada
Merge pull request 'nixos-23.05' (#229) from nixos-23.05 into main 
Reviewed-on: pub-solar/os#229
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-06-28 19:31:27 +02:00
teutat3s ab39518867
Merge branch 'main' into nixos-23.05 2023-06-28 19:22:46 +02:00
teutat3s 2b9def0a76
Merge branch main into origin/nixos-23.05 2023-06-28 19:20:11 +02:00
teutat3s 75f7d813d3
Merge pull request 'feature: init bash+blesh+starship' (#166) from feature/bash-blesh-starship into main 
Reviewed-on: pub-solar/os#166
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
 2023-06-28 19:07:35 +02:00
Benjamin Bädorf 4c37713f2d
Update user & hostname display in starship 2023-06-28 19:03:12 +02:00
teutat3s c9c874ab00
bash: show current directory on top in alacritty 2023-06-20 23:37:28 +02:00
teutat3s a2733eee73
zsh: enable until we switch to bash to fix assertion 
631b7f6f88
 2023-06-13 16:22:52 +02:00
teutat3s 3569216294
graphical: switch to ungoogled-chromium 2023-06-13 15:06:07 +02:00
teutat3s a6bec82fb7
core: use linux 6.1 2023-06-13 15:05:53 +02:00
teutat3s 323a3bd189
sway: use ExecStartPre in systemd service, like upstream wiki 2023-06-13 15:01:15 +02:00
teutat3s 972e0af361
nvfetcher: bump versions 2023-06-13 14:58:31 +02:00
teutat3s d664702dc8
ci.b12f.io -> ci.pub.solar 2023-06-13 14:58:03 +02:00
teutat3s d28da2e1e6
lint: exclude file generated by nvfetcher 
Fix pre-commit hook to only format staged files
 2023-06-13 14:52:39 +02:00
teutat3s c65f185773
pre-commit hook: only format modified lines 
instead of entire files
 2023-06-13 14:52:31 +02:00
teutat3s a7d4be4af5
neovim: add ansible-language-server 2023-06-13 14:50:34 +02:00
teutat3s 4a8c97ff74
waybar: use version from nixos-23.05 2023-06-13 14:43:58 +02:00
teutat3s f964dd3803
flake: use nixos-23.05 
Use overlay for nvfetcher for recent fixes from master branch
 2023-06-13 14:42:53 +02:00
teutat3s 5131912195
overrides: use version from nixos-23.05 2023-06-13 14:37:00 +02:00
teutat3s a3ad8e57f8
deploy-rs: use nixpkgs version, avoid rebuilding 
https://github.com/serokell/deploy-rs/pull/207
https://github.com/serokell/deploy-rs/issues/163
 2023-06-13 14:33:56 +02:00
teutat3s f4f67b3197
chore: python3{9,10}Packages -> python3Packages 
- Apply treefmt
 2023-06-13 14:28:56 +02:00
teutat3s 97239d1fbb
inputs: switch to nixos-23.05 2023-06-13 14:24:52 +02:00
teutat3s 7dbe853f3a
ble.sh: use fzf ctrl-r history, ble.sh built-in completion 
Fix selected ble-face region_input

Fix jump words limited by space (uword)
 2023-05-31 21:02:00 +02:00