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

56 commits

Author SHA1 Message Date
teutat3s 5ad5c9bae6
Switch to alejandra for formatting 
Use treefmt

For context, see upstream PR: https://github.com/divnix/digga/pull/491
 2022-11-20 23:10:39 +01:00
teutat3s c88016af85
overlays: add gurk-rs, thunderbird, yubikey-agent 2022-10-17 22:12:44 +02:00
teutat3s b263ca4c45
Merge branch 'main' into teutat3s 2022-08-14 17:21:34 +02:00
teutat3s 820cc40356
Merge branch 'main' into teutat3s 2022-08-14 16:46:33 +02:00
teutat3s d9057d8281
Merge branch 'main' into feature/upstream-fixes 2022-08-14 16:25:25 +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
teutat3s 6d5025b17b
Merge branch 'main' into teutat3s 2022-08-13 17:43:58 +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
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
teutat3s aabfc4a0dd
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:09:42 +02:00
teutat3s 05c72f28af
sway: switch from mako to swaynotificationcenter 
https://github.com/ErikReider/SwayNotificationCenter brings a fresh look
don't disturbe mode and a control panel to our notifications
 2022-05-06 13:39:48 +02:00
teutat3s 26d5fcf589
Merge branch 'main' into teutat3s 2022-04-30 20:13:39 +02:00
teutat3s 970e6de8a7
Merge branch 'main' into feature/basic-iso 2022-04-30 16:04:59 +02:00
teutat3s d85b48d191
nix-direnv: use flake-aware version 2.0.0 2022-04-26 11:36:40 +02:00
teutat3s 8e2037ef4a
nix-direnv: use flake-aware version 2.0.0 2022-04-26 11:19:50 +02:00
teutat3s 8fd578dceb
overrides: add flameshot, metal-cli, vagrant, electron_17, neovim-unwrapped 2022-04-03 18:49:51 +02:00
teutat3s f44e3f06ed
Merge branch 'main' into teutat3s 2022-04-03 18:46:34 +02:00
teutat3s 93b895136d
neovim: fix config for version 0.6.1 2022-04-03 18:40:07 +02:00
teutat3s ab8850998e
virtualisation: add vagrant, comment out virbr1 2022-03-23 11:11:10 +01:00
teutat3s c97231947c
qMasterPassword: get 1.2.3 from nixos-unstable 2022-03-15 19:06:14 +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 dca27eda2e
Fix up rebase 2022-02-02 04:21:40 +01:00
teutat3s f99159df93
chore: bump flake lock 2022-02-02 04:00:14 +01:00
teutat3s 6da0f503e1
wayland: use NIXOS_OZONE_WL instead of *-wayland packages 2022-02-02 04:00:10 +01:00
Parthiv Seetharaman 0534c731e2
overrides: remove nix-direnv line 
Use correct overrides for nix 2.4
 2022-02-02 04:00:02 +01:00
teutat3s 7e3afff152
overrides: use qMasterPassword from master nixpkgs 2022-01-31 17:53:28 +01:00
teutat3s a2c3102fae
Merge branch 'main' into teutat3s-init-fae 2022-01-31 17:13:35 +01:00
teutat3s 2748fbcdee
wayland: use NIXOS_OZONE_WL instead of *-wayland packages 2022-01-31 17:12:03 +01:00
teutat3s f33597926e
Merge branch 'main' into teutat3s-init-fae 2022-01-31 14:09:28 +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
teutat3s 082e33c1ed
wip 2022-01-19 01:13:15 +01:00
Benjamin Bädorf ad99c6152a
Use correct overrides for nix 2.4 2022-01-06 14:14:53 +01:00
teutat3s 3c6d815d5c
Merge branch 'main' into teutat3s 2021-12-30 21:55:42 +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 f63902f55a
Merge branch 'main' into teutat3s 2021-12-14 15:17:08 +01:00
teutat3s 8abf715ca9
Prevent merge conflicts with upstream in overlays 2021-12-14 15:15:56 +01:00
teutat3s 19bd4126df
Merge branch 'main' into teutat3s 2021-12-14 15:13:09 +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
teutat3s 54044ed31a
Merge branch 'main' into teutat3s 2021-11-19 00:52:10 +01:00
Benjamin Bädorf 0768353f08
Use fixed telegram-desktop from unstable 2021-11-15 11:40:52 +01:00
teutat3s d35fc6d8ae
overrides: try out docker-compose v2, xdg-desktop-portal from latest 2021-10-24 01:17:50 +02:00
teutat3s f026b8bd44
overrides: sort, clean and add nomad 2021-10-12 00:38:38 +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 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 81a70f7063
Merge remote-tracking branch 'devos/develop' into core 2021-07-17 15:43:05 +02:00