Benjamin Bädorf
354a373795
Merge branch 'b12f-bash' into b12f
2023-02-07 15:56:37 +01:00
Benjamin Bädorf
b6b7720382
Update b12f for paperless
2023-02-07 15:56:30 +01:00
Benjamin Bädorf
59adbfe8c0
Merge branch 'feature/bash-blesh-starship' into b12f-bash
2023-02-03 01:14:07 +01:00
teutat3s
a50ae3df10
bash: ble.sh tweaks and starship ricing
2023-02-02 17:38:04 +01:00
teutat3s
9153af8809
terminal-life: switch from zsh to bash & starship
2023-02-02 17:37:42 +01:00
Benjamin Bädorf
a97bf09324
Merge branch 'main' into b12f
2023-02-01 13:52:00 +01:00
teutat3s
edc7335d48
Use nix version from 22.11, prevent nvfetcher from
...
rebuilding so much: it has nix as a dependency and won't find its hash
in the binary cache if we override our nix version with the one from
nixos-unstable. 22.11 has 2.11.1 which should be recent enough for us.
2023-02-01 11:21:46 +01:00
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
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
Timothy DeHerrera
95c6ee0368
nix: fix #126
...
* Update the readme to pull from cachix first, so users don't have to
build nix.
* Pull `nixFlakes` from override for slightly newer ui, and consistency
for users who change the nixos flake ref to something newer.
2021-02-17 14:15:43 -07:00
Timothy DeHerrera
4f44e0dd13
nix: patch nix directly for experimental features
...
The bash wrapper was causing issues with deploy-rs and the
experimental-features option in the config was causing hercules-ci to
spit out a bunch of junk in the logs. Patching nix with the default
values required for flakes fixes both of these issues.
2021-02-17 12:54:41 -07:00
Timothy DeHerrera
bf34d2071f
doc: new mdbook documentation
2021-02-14 02:46:05 -07:00
Timothy DeHerrera
39acbefbe9
ci: fix ci after core creation
2021-02-03 19:35:10 -07:00
Timothy DeHerrera
40b49c52c1
create core branch without any profiles
...
This core will be used as the new base for the reuse branch, which is
essentiall the same as the existing template branch, except that it is
rebased from this core, simplifying future rebasing.
2021-02-03 18:58:58 -07:00
Timothy DeHerrera
f8e3b70aee
qutebrowser: patch merged upstream
2021-02-02 01:34:19 -07:00
Timothy DeHerrera
b3ec025f24
ci: remove broken qutebrowser platforms
2021-01-24 11:06:14 -07:00
Timothy DeHerrera
51deae41cc
overlays: fix darkwin builds
2021-01-03 00:02:28 -07:00
David Arnold
94f334ee8d
ref: remove overlay xref to pkgs
...
since packages are exposed through output.packages by their own,
a second export through overlays.pkgs would be smudging the public api
of this repository.
2020-12-30 11:53:53 -05:00
Timothy DeHerrera
a4409f79e4
any-nix-shell: update overlay
2020-12-29 20:16:26 -07:00
Timothy DeHerrera
2e6f10dc85
Fix any-nix-shell breaking nix-run
...
Simply apply the PR from haslersn/any-nix-shell#6 until it is merged
upstream.
2020-12-28 18:48:41 -07:00
Timothy DeHerrera
bd9367be48
kakoune: fix vertical selection shortcut
2020-12-27 20:04:32 -07:00
Timothy DeHerrera
5620569852
develop: switch to using gopass
2020-12-21 03:12:50 -07:00
Timothy DeHerrera
1e0ad4d259
nix-zsh-completions: update overlay
2020-12-19 18:14:13 -07:00
Timothy DeHerrera
8a5a49653b
retroarch: 1.8.9 -> 1.9.0
2020-12-05 18:11:29 -07:00
Timothy DeHerrera
01f63a83ff
redshift: point to latest wayland pr
2020-12-05 18:11:10 -07:00
Timothy DeHerrera
069eaaa0f2
pcsx2: no need for overlay anymore
2020-12-05 18:10:50 -07:00
Timothy DeHerrera
1cec067385
nix-zsh-completions: enable nix-command
support
2020-08-02 22:54:52 -06:00
Timothy DeHerrera
219975f9cc
packages: export overlays as packages
2020-08-02 21:26:00 -06:00
Timothy DeHerrera
2369f43398
format: apply nixpkgs-fmt
2020-07-30 22:17:28 -06:00
Timothy DeHerrera
14edf3fd19
fix various linting errors throughout the repo
...
* replace `rec` attrs with let bindings
* remove unused args
2020-07-30 22:13:41 -06:00
Timothy DeHerrera
51ef800af6
retroarch: 1.8.8 -> 1.8.9
2020-06-25 21:52:40 -06:00
Timothy DeHerrera
adce24be8b
games: update retroarch to latest version
2020-06-14 13:48:08 -06:00
Timothy DeHerrera
ea1d06c017
games: add pcsx2 and steam-hardware
2020-06-14 12:30:01 -06:00
Timothy DeHerrera
1efc3eab51
xmonad: patch slock to include window title
...
needed for reliable focus exclusion from picom, so that screen contents
aren't leaked while locked.
2020-06-13 09:35:26 -06:00