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
teutat3s
8ff750994e
Use wayland version of element-desktop ( #15 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/15
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-09-08 09:13:59 +00:00
teutat3s
12fafd7f97
docker-compose fix?
2021-09-02 21:17:19 +02:00
teutat3s
81a70f7063
Merge remote-tracking branch 'devos/develop' into core
2021-07-17 15:43:05 +02:00
David Arnold
a088edd77a
fmt
2021-07-16 16:57:57 -05:00
teutat3s
a3961f7c52
move back from neovim-nightly to neovim from unstable ( #10 )
...
https://github.com/neovim/neovim/releases/tag/v0.5.0
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/10
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-07-13 16:33:15 +00:00
GTrunSec
f1117f27ec
fix hasekllPackages overlay
2021-06-24 22:58:26 -07:00
GTrunSec
ee89bf3f2a
feature: Add pkgs fetch manager nvfetcher
...
Co-authored-by: David Arnold <dar@xoe.solutions>
2021-06-24 21:37:50 -05:00
David Arnold
e1d7178979
init: common flake compat fixes for other nixpkgs
...
fixes #315
2021-06-13 22:59:24 -05:00
Benjamin Bädorf
54adc61a48
Move overlay to pkgs
2021-06-09 18:42:56 +02:00
Benjamin Bädorf
be1b5cc2ff
Remove fonts, cleanup pub solar overlay
2021-06-09 18:38:09 +02:00
Benjamin Bädorf
52b6a54d28
Merge upstream
2021-06-09 18:37:21 +02:00
Benjamin Bädorf
ddcf369f41
Initial PubSolarOS commit
2021-05-30 21:10:28 +02:00
Pacman99
64b7892f6e
Add agenix integration to secrets and flake
2021-05-14 18:38:55 -07:00
Pacman99
23ee58d2d0
use __dontExport property for lib and overrides
2021-04-29 11:55:42 -07:00
Pacman99
d5276195f7
move overrides.nix to overlays
...
also update overrides docs
it is a pure devos overlay now, it makes sense to go in overlays
2021-04-27 09:47:04 -07:00
Timothy DeHerrera
2d91946745
doc: move all docs under doc
2021-04-18 20:42:49 -06:00
Timothy DeHerrera
9ba1e7f9bc
nix: remove patch for default unstable features
2021-03-22 23:29:30 -06:00
Timothy DeHerrera
d51cd34fb7
subflakes: make first class citizens
...
Subflakes should provide their wares as outputs, so wire up the pkgs
flake to reflect that.
Due to the unstable nature of flakes, updating the root flake doesn't
currently update the subflake lock file. Therefore, add additional
logic to flk update script in order to do this behind the scenes.
Nix is now pulled in from the "nix" registry flake in order for users
to take advantage of improvements to the UI since its last update in
nixpkgs.
2021-03-14 21:27:58 -06:00