Commit graph

2241 commits

Author SHA1 Message Date
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
Benjamin Bädorf e36709613c
fix: load schemastore for nvim 2023-07-13 18:07:58 +02:00
teutat3s 92a7c57f96
Merge branch 'main' into teutat3s 2023-07-13 17:18:05 +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
teutat3s 1c555136a4
dumpyourvms: use IPs instead of domains in wireguard endpoints 2023-07-12 14:58:40 +02:00
teutat3s ec22a0e71b
waybar: fix checkboxes in networkmanager applet 2023-07-12 14:58:01 +02:00
teutat3s 25b3112399
Bump flake.lock 2023-07-12 14:57:21 +02:00
teutat3s f710117df4
mnx: update bonanza openvpn config 2023-07-12 14:45:22 +02:00
teutat3s d15d68d942
Bump flake.lock 2023-07-07 00:23:56 +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
teutat3s e26af156c6
devshell: stash only unstaged changes in pre-commit hook 2023-07-04 01:41:40 +02:00
teutat3s 1d4b86830e
Bump flake.lock 2023-07-04 01:33:36 +02:00
teutat3s dfff984080
dumpyourvms: enable smartcard udev rules for gpg 2023-07-04 01:28:21 +02:00
teutat3s 29647b277e
neovim: remove duplicate config 2023-07-02 16:10:16 +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 eeb7c7ef3a
neovim: trim final newline when copying to clipboard 2023-07-02 15:16:31 +02:00
teutat3s 9b5abf76ea
devshell: stash only unstaged changes in pre-commit hook 2023-07-02 15:10:11 +02:00
teutat3s b594c1bc9e
dumpyourvms: update wireguard wg1 config 2023-07-02 13:18:50 +02:00
teutat3s f7acbf1bf7
bash: replace $USER with ~ in PROMPT_COMMAND 2023-07-02 13:14:08 +02:00
teutat3s 6296b6a66e
signal-desktop: use version from nixos-23.05 2023-07-02 13:13:40 +02:00
teutat3s e032e96315
1password-gui: use version from nixos-23.05 again 2023-07-02 03:16:56 +02:00
teutat3s 52e2fcff26
Merge branch 'main' into teutat3s 2023-07-02 03:05:30 +02:00
teutat3s 1586111aeb
dumpyourvms: add condition for switching off 2nd GPU 2023-07-02 02:50:51 +02:00
teutat3s 9909a2152b
neovim: use nixd as nix language server 2023-07-02 02:50:01 +02:00
teutat3s bd91b609b5
core: use linux 6.4 2023-07-02 02:48:10 +02:00
teutat3s b9fef27e73
Bump flake.lock 2023-07-02 02:47:36 +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 6931ca6aed
starship needs to start later than ble.sh somehow
use fzf completion with ble.sh again
2023-06-20 23:36:07 +02:00
teutat3s b8f340310c
bash: show current directory on top in alacritty 2023-06-20 23:35:15 +02:00