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

1604 commits

This branch
This branch
All branches
Author SHA1 Message Date
teutat3s 998d08863c
Merge pull request 'erpnext: fix premailer dependency' (#245) from momo/erpnext-fix-premailer into momo/main 
Reviewed-on: pub-solar/os#245
 2023-07-18 13:31:12 +02:00
teutat3s 9a05853839
erpnext: fix premailer dependency 
See: e74f2d0f04
 2023-07-18 13:26:59 +02:00
teutat3s e9e3eba67f
Merge pull request 'erpnext: fix temporary failure in name resolution' (#244) from momo/erpnext-fix-dns into momo/main 
Reviewed-on: pub-solar/os#244
 2023-07-18 12:29:29 +02:00
teutat3s fb38ecb073
erpnext: fix temporary failure in name resolution 2023-07-18 12:26:11 +02:00
teutat3s 04a21183bc
Merge pull request 'flake: Use nixos-23.05 for erpnext input' (#243) from momo/erpnext-nixpkgs-23.05 into momo/main 
Reviewed-on: pub-solar/os#243
 2023-07-18 02:47:46 +02:00
teutat3s 2f0b24b3a9
flake: Use nixos-23.05 for erpnext input 
The override did not work and the resulting python penv was
broken (e.g. missing the bench, erpnext, frappe packages).
 2023-07-18 02:38:34 +02:00
teutat3s 874c687fe2
Merge pull request 'flake: bump input erpnext' (#242) from momo/erpnext-fix-web into momo/main 
Reviewed-on: pub-solar/os#242
 2023-07-18 02:00:05 +02:00
teutat3s 99b039b50c
flake: bump input erpnext 
• Updated input 'erpnext':
    'git+https://git.pub.solar/axeman/erpnext-nix?ref=main&rev=44a0598bd1e7533033cd9d1170de7d83dff80a2f' (2023-07-17)
  → 'git+https://git.pub.solar/axeman/erpnext-nix?ref=main&rev=9c8a36de8b9c1a379528ed35365f69fdca14677c' (2023-07-17)
 2023-07-18 01:56:44 +02:00
teutat3s e35e988371
Merge pull request 'flake: Bump erpnext input flake to fix systemd' (#241) from momo/erpnext-fix-module into momo/main 
Reviewed-on: pub-solar/os#241
 2023-07-18 01:44:06 +02:00
teutat3s 7b863263f5
flake: Bump erpnext input flake to fix systemd 
dependencies

• Updated input 'erpnext':
    'git+https://git.pub.solar/axeman/erpnext-nix?ref=main&rev=28a47059b7b723f2709a4f81384015ae4e8f8562' (2023-07-17)
  → 'git+https://git.pub.solar/axeman/erpnext-nix?ref=main&rev=44a0598bd1e7533033cd9d1170de7d83dff80a2f' (2023-07-17)
• Updated input 'erpnext/devshell':
    'github:numtide/devshell/6b2554d28d46bfa6e24b941e999a145760dad0e1' (2023-06-05)
  → 'github:numtide/devshell/f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205' (2023-07-03)
• Updated input 'erpnext/nixpkgs':
    'github:NixOS/nixpkgs/6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222' (2023-07-16)
  → 'github:NixOS/nixpkgs/6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222' (2023-07-16)
 2023-07-18 01:40:12 +02:00
teutat3s 255fc27737
Merge pull request 'pioneer: Fix path to erpnext database secrets' (#240) from momo/erpnext-fix-secrets2 into momo/main 
Reviewed-on: pub-solar/os#240
 2023-07-17 23:08:34 +02:00
teutat3s cd41d38b29
pioneer: Fix path to erpnext database secrets 2023-07-17 23:06:14 +02:00
teutat3s 6781fa356b
Merge pull request 'pioneer: Fix path to erpnext secrets' (#239) from momo/erpnext-fix-secrets into momo/main 
Reviewed-on: pub-solar/os#239
Reviewed-by: Akshay Mankar <axeman@noreply.git.pub.solar>
 2023-07-17 23:00:45 +02:00
teutat3s 4e91376386
pioneer: Fix path to erpnext secrets 2023-07-17 22:58:15 +02:00
teutat3s ca9f2f60ea
Merge pull request 'momo/main [pioneer]: Add erpnext' (#238) from momo/erpnext into momo/main 
Reviewed-on: pub-solar/os#238
Reviewed-by: Akshay Mankar <axeman@noreply.git.pub.solar>
 2023-07-17 22:52:54 +02:00
teutat3s 437b841312
pioneer: Add erpnext 2023-07-17 22:40:52 +02:00
teutat3s b00f13f490
Merge pull request 'chore/update-momo-main-07-23' (#237) from chore/update-momo-main-07-23 into momo/main 
Reviewed-on: pub-solar/os#237
Reviewed-by: teutat3s <teutates@mailbox.org>
 2023-07-15 03:08:43 +02:00
teutat3s 16b35e607f
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:20:18 +02:00
teutat3s 1d3eadb471
Apply treefmt 2023-07-13 21:20:11 +02:00
Benjamin Bädorf c977bfba38
Merge branch 'main' into momo/main 2023-07-13 18:18:59 +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 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 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 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