pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity
1664 commits 29 branches 43 tags 39 MiB
Commit graph

95 commits

Author SHA1 Message Date
Benjamin Bädorf 9b53a8c982
Merge branch 'main' into b12f 2023-01-28 22:27:52 +01:00
Benjamin Bädorf d4303ccab3
Merge branch 'main' into b12f 2022-11-27 22:35:23 +01:00
teutat3s 73bf158392
Run treefmt command 2022-11-20 23:28:23 +01:00
teutat3s 24b8b9f060
Switch to alejandra for formatting 
Use treefmt

For context, see upstream PR: https://github.com/divnix/digga/pull/491
 2022-11-20 23:23:28 +01:00
Benjamin Bädorf 57016868be
Use FF from latest channel 2022-10-24 21:50:27 +02:00
teutat3s 4520dece5f
neovim: use nvfetcher for custom plugins 2022-10-18 16:55:51 +02:00
Benjamin Bädorf 87c3630dfb
Add factorio 2022-10-17 15:56:48 +02:00
Benjamin Bädorf 636eed806b
Merge remote-tracking branch 'origin/main' into b12f 2022-08-14 17:50:21 +02:00
teutat3s d9057d8281
Merge branch 'main' into feature/upstream-fixes 2022-08-14 16:25:25 +02:00
teutat3s 9d25b3ee9b
Fix build of rnix-lsp for nix verion 2.10+ 
This fix didn't land in a released tag of rnix-lsp
yet.
Build it from the master branch until next release
Upstream PR:
https://github.com/nix-community/rnix-lsp/pull/94

Also bump flake.lock
 2022-08-14 15:16:57 +02:00
teutat3s bf581d1e9c
nix-dram: remove nix-dram as default nix binary 
nix-dram as default nix binary isn't worth the
maintenance work anymore, CI builds started
failing because of it:
https://ci.b12f.io/pub-solar/os/533/1/2

Automatic builds still happen each night and can be
checked in our fork of nix-dram:
https://github.com/pub-solar/nix-dram/actions

Users of nix-dram can continue to use it via devshells
or nix run github:dramforever/nix-dram -- --version
 2022-08-14 15:12:23 +02:00
teutat3s 616b7af858
devos: include upstream commits 
780620d865

e6b14d39d6

dd51f64bc5
 2022-08-13 21:50:23 +02:00
Hendrik Sokolowski 030e5c0058 Add droppie 2022-08-13 18:08:27 +02:00
Benjamin Bädorf 45202d98ec
Add Arduino module 
This adds a small arduino development module that installs development
tooling and adds the user to the `dialout` group.
 2022-08-10 22:53:37 +02:00
Benjamin Bädorf c2227ed013
Add Arduino module 
This adds a small arduino development module that installs development
tooling and adds the user to the `dialout` group.
 2022-08-10 22:43:54 +02:00
Benjamin Bädorf ca6843ab44
Use override for yubikey-agent 2022-06-04 22:11:46 +02:00
Benjamin Bädorf efc52114f3
Merge branch 'main' into b12f 2022-06-04 02:59:32 +02:00
teutat3s 8e43046dee
nixos: follow release-22.05 
home: follow release-22.05 branch

Fixes for upstream changes:

ag renamed to silver-searcher, extfat-utils is now exfat, lot's of
overrides no longer needed, as they're now in the release branch,
services.caddy.config split up into globalConfig and extraConfig
 2022-06-02 10:13:17 +02:00
Benjamin Bädorf d85a796259
Merge branch 'main' into b12f 2022-04-30 19:58:06 +02:00
teutat3s 970e6de8a7
Merge branch 'main' into feature/basic-iso 2022-04-30 16:04:59 +02:00
Benjamin Bädorf 2f54c4e25c
Merge branch 'main' into b12f 2022-04-27 15:24:22 +02:00
Benjamin Bädorf 7ff9efa51c
Add wayvnc 2022-04-27 15:21:40 +02:00
teutat3s d85b48d191
nix-direnv: use flake-aware version 2.0.0 2022-04-26 11:36:40 +02:00
Benjamin Bädorf c2b6ec5acc
Merge branch 'main' into b12f 2022-04-10 14:02:28 +02:00
teutat3s 93b895136d
neovim: fix config for version 0.6.1 2022-04-03 18:40:07 +02:00
Benjamin Bädorf 33f03b3f0d
Add paperless, up guest VM RAM to 48GB 2022-03-10 21:32:21 +01:00
Benjamin Bädorf e3ff8c5441
Merge branch 'main' into b12f 2022-02-14 10:54:00 +01:00
teutat3s 58efdd3528
Use nixUnstable from latest channel, aka nixos-unstable 
this is required because 2.5.1 with a required fix

for nix docker didn't get backported to release-21.11 yet
 2022-02-03 01:14:21 +01:00
teutat3s 2748fbcdee
wayland: use NIXOS_OZONE_WL instead of *-wayland packages 2022-01-31 17:12:03 +01:00
teutat3s 1030ed575d
Merge branch 'main' of git.b12f.io:pub-solar/os 2022-01-31 12:18:13 +01:00
teutat3s 34777780b6
Merge branch 'devos' 2022-01-31 12:16:36 +01:00
Parthiv Seetharaman 6de02a64be overrides: remove nix-direnv line 2022-01-29 19:58:36 -08:00
Benjamin Bädorf 115f41466b
Merge branch 'main' into b12f 2022-01-06 14:14:57 +01:00
Benjamin Bädorf ad99c6152a
Use correct overrides for nix 2.4 2022-01-06 14:14:53 +01:00
Benjamin Bädorf 87e48217d0
Merge branch 'main' into b12f 2022-01-06 14:14:13 +01:00
teutat3s b8b3404d4c
Merge branch 'devos' 2021-12-30 21:54:42 +01:00
David Arnold 838bcd1f51 nix-direnv: rm enableFlakes and pass nixUnstable 
>        Failed assertions:
       - The option definition `programs.direnv.nix-direnv.enableFlakes' in `/nix/store/pv3vi4n7x83r4sc3ljqdgg9qifr4n5gp-source/users/profiles/direnv' no longer has any effect; please remove it.
       Flake support is now always enabled.
 2021-12-29 14:00:25 -08:00
teutat3s 8abf715ca9
Prevent merge conflicts with upstream in overlays 2021-12-14 15:15:56 +01:00
Benjamin Bädorf c825128eb4
Add looking glass for VMs, switch from scream-ivshmem to qemu-pulse 2021-12-11 21:10:07 +01:00
Benjamin Bädorf 15c0412080
Add looking glass for VMs, switch from scream-ivshmem to qemu-pulse 2021-12-11 21:08:20 +01:00
Benjamin Bädorf f9156a4976
Fix build 2021-11-29 19:09:49 +01:00
Benjamin Bädorf 6e2c227969
Merge branch 'main' into b12f 2021-11-29 17:25:30 +01:00
Benjamin Bädorf 5c46477e44
Add obs 2021-11-18 20:12:24 +01:00
Benjamin Bädorf 0768353f08
Use fixed telegram-desktop from unstable 2021-11-15 11:40:52 +01:00
Benjamin Bädorf 6c9ab61065
Use fixed telegram-desktop from unstable 2021-11-15 11:39:24 +01:00
teutat3s 8a848a789b
overrides: try out docker-compose v2, xdg-desktop-portal from latest 2021-10-24 23:36:57 +02:00
Benjamin Bädorf 231abe6af4
Merge branch 'main' into b12f 2021-10-13 19:27:04 +02:00
teutat3s 1a4ab1a93f fix/upstreaming-merge-conflicts (#41) 
Co-authored-by: Anton <fetsorn@gmail.com>
Co-authored-by: Chris Montgomery <chris@cdom.io>
Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/41
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-10-11 22:11:36 +00:00
GTrunSec 950199ef2c
update deploy-rs overlay 2021-09-29 11:45:46 -07:00
teutat3s 761b671549 b12f-to-master (#16) 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/16
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-09-08 22:00:03 +00:00