b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Run treefmt command

Browse source
This commit is contained in:
teutat3s 2022-11-20 23:28:23 +01:00
parent 162a1cc06c
commit 73bf158392
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
131 changed files with 1782 additions and 1462 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -77,7 +77,7 @@
**Fixed bugs:** **Fixed bugs:**
- My emacsGcc overlay is not working [\#146](https://github.com/divnix/devos/issues/146) - My emacsGcc overlay is not working [\#146](https://github.com/divnix/devos/issues/146)
- local flake registry freezes branches [\#142](https://github.com/divnix/devos/issues/142) - local flake registry freezes branches [\#142](https://github.com/divnix/devos/issues/142)
- nixos-option no longer works after collect garbage [\#138](https://github.com/divnix/devos/issues/138) - nixos-option no longer works after collect garbage [\#138](https://github.com/divnix/devos/issues/138)
- Profiles imports are brittle, causing failure if imported twice [\#136](https://github.com/divnix/devos/issues/136) - Profiles imports are brittle, causing failure if imported twice [\#136](https://github.com/divnix/devos/issues/136)
@ -109,6 +109,4 @@
## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09) ## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09)
\* _This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)_
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

140
LICENSE.md
View file

@ -204,23 +204,23 @@ produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these terms of section 4, provided that you also meet all of these
conditions: conditions:
- a) The work must carry prominent notices stating that you modified - a) The work must carry prominent notices stating that you modified
it, and giving a relevant date. it, and giving a relevant date.
- b) The work must carry prominent notices stating that it is - b) The work must carry prominent notices stating that it is
released under this License and any conditions added under released under this License and any conditions added under
section 7. This requirement modifies the requirement in section 4 section 7. This requirement modifies the requirement in section 4
to "keep intact all notices". to "keep intact all notices".
- c) You must license the entire work, as a whole, under this - c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7 License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts, additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it. invalidate such permission if you have separately received it.
- d) If the work has interactive user interfaces, each must display - d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your interfaces that do not display Appropriate Legal Notices, your
work need not make them do so. work need not make them do so.
A compilation of a covered work with other separate and independent A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work, works, which are not by their nature extensions of the covered work,
@ -239,42 +239,42 @@ sections 4 and 5, provided that you also convey the machine-readable
Corresponding Source under the terms of this License, in one of these Corresponding Source under the terms of this License, in one of these
ways: ways:
- a) Convey the object code in, or embodied in, a physical product - a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the (including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium Corresponding Source fixed on a durable physical medium
customarily used for software interchange. customarily used for software interchange.
- b) Convey the object code in, or embodied in, a physical product - b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a (including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the Corresponding conveying of source, or (2) access to copy the Corresponding
Source from a network server at no charge. Source from a network server at no charge.
- c) Convey individual copies of the object code with a copy of the - c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord only if you received the object code with such an offer, in accord
with subsection 6b. with subsection 6b.
- d) Convey the object code by offering access from a designated - d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party) may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements. available for as long as needed to satisfy these requirements.
- e) Convey the object code using peer-to-peer transmission, - e) Convey the object code using peer-to-peer transmission,
provided you inform other peers where the object code and provided you inform other peers where the object code and
Corresponding Source of the work are being offered to the general Corresponding Source of the work are being offered to the general
public at no charge under subsection 6d. public at no charge under subsection 6d.
A separable portion of the object code, whose source code is excluded A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be from the Corresponding Source as a System Library, need not be
@ -350,23 +350,23 @@ Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders add to a covered work, you may (if authorized by the copyright holders
of that material) supplement the terms of this License with terms: of that material) supplement the terms of this License with terms:
- a) Disclaiming warranty or limiting liability differently from the - a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or terms of sections 15 and 16 of this License; or
- b) Requiring preservation of specified reasonable legal notices or - b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or Notices displayed by works containing it; or
- c) Prohibiting misrepresentation of the origin of that material, - c) Prohibiting misrepresentation of the origin of that material,
or requiring that modified versions of such material be marked in or requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or reasonable ways as different from the original version; or
- d) Limiting the use for publicity purposes of names of licensors - d) Limiting the use for publicity purposes of names of licensors
or authors of the material; or or authors of the material; or
- e) Declining to grant rights under trademark law for use of some - e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or trade names, trademarks, or service marks; or
- f) Requiring indemnification of licensors and authors of that - f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions material by anyone who conveys the material (or modified versions
of it) with contractual assumptions of liability to the recipient, of it) with contractual assumptions of liability to the recipient,
for any liability that these contractual assumptions directly for any liability that these contractual assumptions directly
impose on those licensors and authors. impose on those licensors and authors.
All other non-permissive additional terms are considered "further All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you restrictions" within the meaning of section 10. If the Program as you

64
README.md
View file

@ -10,37 +10,37 @@ At its core, it's a NixOS installation running our configuration. The UX
decisions and the way the project is structured are what make it decisions and the way the project is structured are what make it
_PubSolarOS_: _PubSolarOS_:
* Reproducibility is king, and the future is with declarative and functional - Reproducibility is king, and the future is with declarative and functional
programming. Even if Nix does not turn out to be the end-all-be-all of programming. Even if Nix does not turn out to be the end-all-be-all of
reproducible package management (Guix looks good), it has a plethora reproducible package management (Guix looks good), it has a plethora
of packages, a very active and helpful community, and very solid of packages, a very active and helpful community, and very solid
software engineering practices. software engineering practices.
* Because reproducibility is king, we're using nix flakes for locking flake - Because reproducibility is king, we're using nix flakes for locking flake
dependencies. [Digga](https://github.com/divnix/digga) is our flake dependencies. [Digga](https://github.com/divnix/digga) is our flake
utility library, made by the wonderful people of the Divnix community. utility library, made by the wonderful people of the Divnix community.
* Physical devices are not shared anymore nowadays. Only seldomly will you - Physical devices are not shared anymore nowadays. Only seldomly will you
find shared devices that need more than one user account. For this find shared devices that need more than one user account. For this
reason, only one user (excluding `root`) is assumed. reason, only one user (excluding `root`) is assumed.
* Keyboard navigation wins where it matters; ergonomics, programmability, - Keyboard navigation wins where it matters; ergonomics, programmability,
efficiency, and speed. We use a tiling window manager (`sway`) and efficiency, and speed. We use a tiling window manager (`sway`) and
prioritize cli-based solutions where sensible. The editor is `neovim` prioritize cli-based solutions where sensible. The editor is `neovim`
configured to be just as opiniated as the operating system it is a part configured to be just as opiniated as the operating system it is a part
of. For mailing, `neomutt` is the default, but we're more divided on of. For mailing, `neomutt` is the default, but we're more divided on
that part. that part.
* We like new and shiny things, so we've moved to Wayland and pipewire. - We like new and shiny things, so we've moved to Wayland and pipewire.
* SICHERHEIT is written in capital letters at pub.solar, so we have first- - SICHERHEIT is written in capital letters at pub.solar, so we have first-
class disk-encryption support. Currently in the works is a paranoid class disk-encryption support. Currently in the works is a paranoid
mode where the device can only hibernate (no more sleep or lockscreen) mode where the device can only hibernate (no more sleep or lockscreen)
so your data is locked any time you leave the device. so your data is locked any time you leave the device.
* Free software is better. If we can avoid it, nonfree software is avoided. - Free software is better. If we can avoid it, nonfree software is avoided.
By default, `allowUnfree` is `false` so we don't ship non-free software By default, `allowUnfree` is `false` so we don't ship non-free software
in a basic PubSolarOS ISO. However, nothing prevents you from using in a basic PubSolarOS ISO. However, nothing prevents you from using
as much non-free software as you like. as much non-free software as you like.
* Automation is better. The reproducibility of nix feels so much more - Automation is better. The reproducibility of nix feels so much more
powerful once you're deploying your new configuration from your laptop powerful once you're deploying your new configuration from your laptop
to all your other devices with one command. [We have an automated CI using drone](https://ci.b12f.io/pub-solar/os). to all your other devices with one command. [We have an automated CI using drone](https://ci.b12f.io/pub-solar/os).
* Community is important. We just like working on this together, and it - Community is important. We just like working on this together, and it
feels really good to see our progress at the end of a feels really good to see our progress at the end of a
[hakken.irl](https://pub.solar/hakken) session. [hakken.irl](https://pub.solar/hakken) session.
To get started, take a look at the quick start guide in our docs. To get started, take a look at the quick start guide in our docs.

27
default.nix
View file

@ -9,23 +9,28 @@ let
"x86_64-linux" "x86_64-linux"
]; ];
filterSystems = lib.filterAttrs filterSystems =
lib.filterAttrs
(system: _: lib.elem system ciSystems); (system: _: lib.elem system ciSystems);
recurseIntoAttrsRecursive = lib.mapAttrs (_: v: recurseIntoAttrsRecursive = lib.mapAttrs (
if lib.isAttrs v _: v:
then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v) if lib.isAttrs v
else v then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
else v
); );
systemOutputs = lib.filterAttrs systemOutputs =
(name: set: lib.isAttrs set lib.filterAttrs
&& lib.any (
(system: set ? ${system} && name != "legacyPackages") name: set:
ciSystems lib.isAttrs set
&& lib.any
(system: set ? ${system} && name != "legacyPackages")
ciSystems
) )
default.outputs; default.outputs;
ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs; ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
in in
(recurseIntoAttrsRecursive ciDrvs) // { shell = import ./shell.nix; } (recurseIntoAttrsRecursive ciDrvs) // {shell = import ./shell.nix;}

6
doc/CONTRIBUTING.md
View file

@ -1,13 +1,15 @@
# TL;DR; # TL;DR;
- **Target Branch**: `main` - **Target Branch**: `main`
- **Merge Policy**: green check: merge away. yellow circle: have patience. red x: try again. - **Merge Policy**: green check: merge away. yellow circle: have patience. red x: try again.
- **Docs**: every change set is expected to contain doc updates - **Docs**: every change set is expected to contain doc updates
- **Commit Msg**: be a poet! Comprehensive and explanatory commit messages - **Commit Msg**: be a poet! Comprehensive and explanatory commit messages
should cover the motivation and use case in an easily understandable manner should cover the motivation and use case in an easily understandable manner
even when read after a few months. even when read after a few months.
- **Test Driven Development**: please default to test driven development you can - **Test Driven Development**: please default to test driven development you can
make use of the `./examples` & `./e2e` and wire test up in the devshell. make use of the `./examples` & `./e2e` and wire test up in the devshell.
### Within the Devshell (`nix develop`) ### Within the Devshell (`nix develop`)
- **Hooks**: please `git commit` within the devshell - **Hooks**: please `git commit` within the devshell
- **Fail Early**: please run `check-all` from within the devshell on your local machine - **Fail Early**: please run `check-all` from within the devshell on your local machine

1
doc/SUMMARY.md
View file

@ -28,4 +28,3 @@
- [NixOS](./api-reference-nixos.md) - [NixOS](./api-reference-nixos.md)
- [Library Reference]() - [Library Reference]()
- [Contributing](./CONTRIBUTING.md) - [Contributing](./CONTRIBUTING.md)

49
doc/api-reference-channels.md
View file

@ -1,91 +1,76 @@
# Channels API Container # Channels API Container
Configure your channels that you can use throughout your configurations. Configure your channels that you can use throughout your configurations.
> #### ⚠ Gotcha ⚠ > #### ⚠ Gotcha ⚠
>
> Devshell & (non-host-specific) Home-Manager `pkgs` instances are rendered off the > Devshell & (non-host-specific) Home-Manager `pkgs` instances are rendered off the
> `nixos.hostDefaults.channelName` (default) channel. > `nixos.hostDefaults.channelName` (default) channel.
## channels ## channels
nixpkgs channels to create nixpkgs channels to create
_*Type*_:
*_Type_*:
attribute set of submodules or path convertible to it attribute set of submodules or path convertible to it
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## channels.\<name\>.config ## channels.\<name\>.config
nixpkgs config for this channel nixpkgs config for this channel
_*Type*_:
*_Type_*:
attribute set or path convertible to it attribute set or path convertible to it
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## channels.\<name\>.input ## channels.\<name\>.input
nixpkgs flake input to use for this channel nixpkgs flake input to use for this channel
_*Type*_:
*_Type_*:
nix flake nix flake
_*Default*_
*_Default_*
``` ```
"self.inputs.<name>" "self.inputs.<name>"
``` ```
## channels.\<name\>.overlays ## channels.\<name\>.overlays
overlays to apply to this channel overlays to apply to this channel
these will get exported under the 'overlays' flake output these will get exported under the 'overlays' flake output
as \<channel\>/\<name\> and any overlay pulled from \<inputs\> as \<channel\>/\<name\> and any overlay pulled from \<inputs\>
will be filtered out will be filtered out
_*Type*_:
*_Type_*:
list of valid Nixpkgs overlay or path convertible to its or anything convertible to it or path convertible to it list of valid Nixpkgs overlay or path convertible to its or anything convertible to it or path convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## channels.\<name\>.patches ## channels.\<name\>.patches
patches to apply to this channel patches to apply to this channel
_*Type*_:
*_Type_*:
list of paths list of paths
_*Default*_
*_Default_*
``` ```
[] []
``` ```

39
doc/api-reference-devshell.md
View file

@ -1,72 +1,59 @@
# Devshell API Container # Devshell API Container
Configure your devshell module collections of your environment. Configure your devshell module collections of your environment.
## devshell ## devshell
Modules to include in your DevOS shell. the `modules` argument Modules to include in your DevOS shell. the `modules` argument
will be exported under the `devshellModules` output will be exported under the `devshellModules` output
_*Type*_:
*_Type_*:
submodule or path convertible to it submodule or path convertible to it
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## devshell.exportedModules ## devshell.exportedModules
modules to include in all hosts and export to devshellModules output modules to include in all hosts and export to devshellModules output
_*Type*_:
*_Type_*:
list of valid module or path convertible to its or anything convertible to it list of valid module or path convertible to its or anything convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## devshell.externalModules ## devshell.externalModules
The `externalModules` option has been removed. The `externalModules` option has been removed.
Any modules that should be exported should be defined with the `exportedModules` Any modules that should be exported should be defined with the `exportedModules`
option and all other modules should just go into the `modules` option. option and all other modules should just go into the `modules` option.
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it list of valid modules or anything convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## devshell.modules ## devshell.modules
modules to include that won't be exported modules to include that won't be exported
meant importing modules from external flakes meant importing modules from external flakes
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it or path convertible to it list of valid modules or anything convertible to it or path convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```

66
doc/api-reference-home.md
View file

@ -1,119 +1,97 @@
# Home-Manager API Container # Home-Manager API Container
Configure your home manager modules, profiles & suites. Configure your home manager modules, profiles & suites.
## home ## home
hosts, modules, suites, and profiles for home-manager hosts, modules, suites, and profiles for home-manager
_*Type*_:
*_Type_*:
submodule or path convertible to it submodule or path convertible to it
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## home.exportedModules ## home.exportedModules
modules to include in all hosts and export to homeModules output modules to include in all hosts and export to homeModules output
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it or path convertible to it list of valid modules or anything convertible to it or path convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## home.externalModules ## home.externalModules
The `externalModules` option has been removed. The `externalModules` option has been removed.
Any modules that should be exported should be defined with the `exportedModules` Any modules that should be exported should be defined with the `exportedModules`
option and all other modules should just go into the `modules` option. option and all other modules should just go into the `modules` option.
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it list of valid modules or anything convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## home.importables ## home.importables
Packages of paths to be passed to modules as `specialArgs`. Packages of paths to be passed to modules as `specialArgs`.
_*Type*_:
*_Type_*:
attribute set attribute set
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## home.importables.suites ## home.importables.suites
collections of profiles collections of profiles
_*Type*_:
*_Type_*:
null or attribute set of list of paths or anything convertible to its or path convertible to it null or attribute set of list of paths or anything convertible to its or path convertible to it
_*Default*_
*_Default_*
``` ```
null null
``` ```
## home.modules ## home.modules
modules to include that won't be exported modules to include that won't be exported
meant importing modules from external flakes meant importing modules from external flakes
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it or path convertible to it list of valid modules or anything convertible to it or path convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## home.users ## home.users
HM users that can be deployed portably without a host. HM users that can be deployed portably without a host.
_*Type*_:
*_Type_*:
attribute set of HM user configs attribute set of HM user configs
_*Default*_
*_Default_*
``` ```
{} {}
``` ```

129
doc/api-reference-nixos.md
View file

@ -1,234 +1,191 @@
# NixOS API Container # NixOS API Container
Configure your nixos modules, profiles & suites. Configure your nixos modules, profiles & suites.
## nixos ## nixos
hosts, modules, suites, and profiles for NixOS hosts, modules, suites, and profiles for NixOS
_*Type*_:
*_Type_*:
submodule or path convertible to it submodule or path convertible to it
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## nixos.hostDefaults ## nixos.hostDefaults
Defaults for all hosts. Defaults for all hosts.
the modules passed under hostDefaults will be exported the modules passed under hostDefaults will be exported
to the 'nixosModules' flake output. to the 'nixosModules' flake output.
They will also be added to all hosts. They will also be added to all hosts.
_*Type*_:
*_Type_*:
submodule submodule
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## nixos.hostDefaults.channelName ## nixos.hostDefaults.channelName
Channel this host should follow Channel this host should follow
_*Type*_:
*_Type_*:
channel defined in `channels` channel defined in `channels`
## nixos.hostDefaults.exportedModules ## nixos.hostDefaults.exportedModules
modules to include in all hosts and export to nixosModules output modules to include in all hosts and export to nixosModules output
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it or path convertible to it list of valid modules or anything convertible to it or path convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## nixos.hostDefaults.externalModules ## nixos.hostDefaults.externalModules
The `externalModules` option has been removed. The `externalModules` option has been removed.
Any modules that should be exported should be defined with the `exportedModules` Any modules that should be exported should be defined with the `exportedModules`
option and all other modules should just go into the `modules` option. option and all other modules should just go into the `modules` option.
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it list of valid modules or anything convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## nixos.hostDefaults.modules ## nixos.hostDefaults.modules
modules to include that won't be exported modules to include that won't be exported
meant importing modules from external flakes meant importing modules from external flakes
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it or path convertible to it list of valid modules or anything convertible to it or path convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## nixos.hostDefaults.system ## nixos.hostDefaults.system
system for this host system for this host
_*Type*_:
*_Type_*:
null or system defined in `supportedSystems` null or system defined in `supportedSystems`
_*Default*_
*_Default_*
``` ```
null null
``` ```
## nixos.hosts ## nixos.hosts
configurations to include in the nixosConfigurations output configurations to include in the nixosConfigurations output
_*Type*_:
*_Type_*:
attribute set of submodules attribute set of submodules
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## nixos.hosts.\<name\>.channelName ## nixos.hosts.\<name\>.channelName
Channel this host should follow Channel this host should follow
_*Type*_:
*_Type_*:
null or channel defined in `channels` null or channel defined in `channels`
_*Default*_
*_Default_*
``` ```
null null
``` ```
## nixos.hosts.\<name\>.modules ## nixos.hosts.\<name\>.modules
modules to include modules to include
_*Type*_:
*_Type_*:
list of valid modules or anything convertible to it or path convertible to it list of valid modules or anything convertible to it or path convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
## nixos.hosts.\<name\>.system ## nixos.hosts.\<name\>.system
system for this host system for this host
_*Type*_:
*_Type_*:
null or system defined in `supportedSystems` null or system defined in `supportedSystems`
_*Default*_
*_Default_*
``` ```
null null
``` ```
## nixos.hosts.\<name\>.tests ## nixos.hosts.\<name\>.tests
tests to run tests to run
_*Type*_:
*_Type_*:
list of valid NixOS test or path convertible to its or anything convertible to it list of valid NixOS test or path convertible to its or anything convertible to it
_*Default*_
*_Default_*
``` ```
[] []
``` ```
_*Example*_
*_Example_*
``` ```
{"_type":"literalExpression","text":"[\n {\n name = \"testname1\";\n machine = { ... };\n testScript = ''\n # ...\n '';\n }\n ({ corutils, writers, ... }: {\n name = \"testname2\";\n machine = { ... };\n testScript = ''\n # ...\n '';\n })\n ./path/to/test.nix\n];\n"} {"_type":"literalExpression","text":"[\n {\n name = \"testname1\";\n machine = { ... };\n testScript = ''\n # ...\n '';\n }\n ({ corutils, writers, ... }: {\n name = \"testname2\";\n machine = { ... };\n testScript = ''\n # ...\n '';\n })\n ./path/to/test.nix\n];\n"}
``` ```
## nixos.importables ## nixos.importables
Packages of paths to be passed to modules as `specialArgs`. Packages of paths to be passed to modules as `specialArgs`.
_*Type*_:
*_Type_*:
attribute set attribute set
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## nixos.importables.suites ## nixos.importables.suites
collections of profiles collections of profiles
_*Type*_:
*_Type_*:
null or attribute set of list of paths or anything convertible to its or path convertible to it null or attribute set of list of paths or anything convertible to its or path convertible to it
_*Default*_
*_Default_*
``` ```
null null
``` ```

45
doc/api-reference.md
View file

@ -1,4 +1,5 @@
# Top Level API # Top Level API
`digga`'s top level API. API Containers are documented in their respective sub-chapter: `digga`'s top level API. API Containers are documented in their respective sub-chapter:
- [Channels](./api-reference-channels.md) - [Channels](./api-reference-channels.md)
@ -8,73 +9,55 @@
- [Darwin](./api-reference-darwin.md) - [Darwin](./api-reference-darwin.md)
## channelsConfig ## channelsConfig
nixpkgs config for all channels nixpkgs config for all channels
_*Type*_:
*_Type_*:
attribute set or path convertible to it attribute set or path convertible to it
_*Default*_
*_Default_*
``` ```
{} {}
``` ```
## inputs ## inputs
The flake's inputs The flake's inputs
*_Type_*: _*Type*_:
attribute set of nix flakes attribute set of nix flakes
## outputsBuilder ## outputsBuilder
builder for flake system-spaced outputs builder for flake system-spaced outputs
The builder gets passed an attrset of all channels The builder gets passed an attrset of all channels
_*Type*_:
*_Type_*:
function that evaluates to a(n) attribute set or path convertible to it function that evaluates to a(n) attribute set or path convertible to it
_*Default*_
*_Default_*
``` ```
"channels: { }" "channels: { }"
``` ```
## self ## self
The flake to create the DevOS outputs for The flake to create the DevOS outputs for
*_Type_*: _*Type*_:
nix flake nix flake
## supportedSystems ## supportedSystems
The systems supported by this flake The systems supported by this flake
_*Type*_:
*_Type_*:
list of strings list of strings
_*Default*_
*_Default_*
``` ```
["aarch64-linux","aarch64-darwin","i686-linux","x86_64-darwin","x86_64-linux"] ["aarch64-linux","aarch64-darwin","i686-linux","x86_64-darwin","x86_64-linux"]
``` ```

3
doc/concepts/hosts.md
View file

@ -28,10 +28,10 @@ is best saved for [profile modules](./profiles.md).
This is a good place to import sets of profiles, called [suites](./suites.md), This is a good place to import sets of profiles, called [suites](./suites.md),
that you intend to use on your machine. that you intend to use on your machine.
## Example ## Example
flake.nix: flake.nix:
```nix ```nix
{ {
nixos = { nixos = {
@ -47,6 +47,7 @@ flake.nix:
``` ```
hosts/librem.nix: hosts/librem.nix:
```nix ```nix
{ suites, ... }: { suites, ... }:
{ {

7
doc/concepts/overrides.md
View file

@ -1,8 +1,10 @@
# Overrides # Overrides
Each NixOS host follows one channel. But many times it is useful to get packages Each NixOS host follows one channel. But many times it is useful to get packages
or modules from different channels. or modules from different channels.
## Packages ## Packages
You can make use of `overlays/overrides.nix` to override specific packages in the You can make use of `overlays/overrides.nix` to override specific packages in the
default channel to be pulled from other channels. That file is simply an example default channel to be pulled from other channels. That file is simply an example
of how any overlay can get `channels` as their first argument. of how any overlay can get `channels` as their first argument.
@ -10,6 +12,7 @@ of how any overlay can get `channels` as their first argument.
You can add overlays to any channel to override packages from other channels. You can add overlays to any channel to override packages from other channels.
Pulling the manix package from the `latest` channel: Pulling the manix package from the `latest` channel:
```nix ```nix
channels: final: prev: { channels: final: prev: {
__dontExport = true; __dontExport = true;
@ -23,11 +26,12 @@ overrides and the property is already set for you.
## Modules ## Modules
You can also pull modules from other channels. All modules have access to the You can also pull modules from other channels. All modules have access to the
`modulesPath` for each channel as `<channelName>ModulesPath`. And you can use `modulesPath` for each channel as `<channelName>ModulesPath`. And you can use
`disabledModules` to remove modules from the current channel. `disabledModules` to remove modules from the current channel.
To pull zsh module from the `latest` channel this code can be placed in any module, whether its your host file, a profile, or a module in ./modules etc: To pull zsh module from the `latest` channel this code can be placed in any module, whether its your host file, a profile, or a module in ./modules etc:
```nix ```nix
{ latestModulesPath }: { latestModulesPath }:
{ {
@ -37,6 +41,7 @@ To pull zsh module from the `latest` channel this code can be placed in any modu
``` ```
> ##### _Note:_ > ##### _Note:_
>
> Sometimes a modules name will change from one branch to another. > Sometimes a modules name will change from one branch to another.
[nixpkgs-modules]: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules [nixpkgs-modules]: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules

13
doc/concepts/profiles.md
View file

@ -6,20 +6,23 @@ built into the NixOS module system for a reason: to elegantly provide a clear
separation of concerns. separation of concerns.
## Creation ## Creation
Profiles are created with the `rakeLeaves` function which recursively collects Profiles are created with the `rakeLeaves` function which recursively collects
`.nix` files from within a folder. The recursion stops at folders with a `default.nix` `.nix` files from within a folder. The recursion stops at folders with a `default.nix`
in them. You end up with an attribute set with leaves(paths to profiles) or in them. You end up with an attribute set with leaves(paths to profiles) or
nodes(attrsets leading to more nodes or leaves). nodes(attrsets leading to more nodes or leaves).
A profile is used for quick modularization of [interelated bits](./profiles.md#subprofiles). A profile is used for quick modularization of [interelated bits](./profiles.md#subprofiles).
> ##### _Notes:_ > ##### _Notes:_
> * For _declaring_ module options, there's the [modules](../outputs/modules.md) directory. >
> * This directory takes inspiration from > - For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
> - This directory takes inspiration from
> [upstream](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/profiles) > [upstream](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/profiles)
> . > .
### Nested profiles ### Nested profiles
Profiles can be nested in attribute sets due to the recursive nature of `rakeLeaves`. Profiles can be nested in attribute sets due to the recursive nature of `rakeLeaves`.
This can be useful to have a set of profiles created for a specific purpose. It is This can be useful to have a set of profiles created for a specific purpose. It is
sometimes useful to have a `common` profile that has high level concerns related sometimes useful to have a `common` profile that has high level concerns related
@ -28,6 +31,7 @@ to all its sister profiles.
### Example ### Example
profiles/develop/common.nix: profiles/develop/common.nix:
```nix ```nix
{ {
imports = [ ./zsh ]; imports = [ ./zsh ];
@ -36,6 +40,7 @@ profiles/develop/common.nix:
``` ```
profiles/develop/zsh.nix: profiles/develop/zsh.nix:
```nix ```nix
{ ... }: { ... }:
{ {
@ -45,6 +50,7 @@ profiles/develop/zsh.nix:
``` ```
The examples above will end up with a profiles set like this: The examples above will end up with a profiles set like this:
```nix ```nix
{ {
develop = { develop = {
@ -55,6 +61,7 @@ The examples above will end up with a profiles set like this:
``` ```
## Conclusion ## Conclusion
Profiles are the most important concept in DevOS. They allow us to keep our Profiles are the most important concept in DevOS. They allow us to keep our
Nix expressions self contained and modular. This way we can maximize reuse Nix expressions self contained and modular. This way we can maximize reuse
across hosts while minimizing boilerplate. Remember, anything machine across hosts while minimizing boilerplate. Remember, anything machine

4
doc/concepts/suites.md
View file

@ -1,4 +1,5 @@
# Suites # Suites
Suites provide a mechanism for users to easily combine and name collections of Suites provide a mechanism for users to easily combine and name collections of
profiles. profiles.
@ -8,6 +9,7 @@ argument (one that can be use in an `imports` line) to your hosts. All lists def
in `suites` are flattened and type-checked as paths. in `suites` are flattened and type-checked as paths.
## Definition ## Definition
```nix ```nix
rec { rec {
workstation = [ profiles.develop profiles.graphical users.nixos ]; workstation = [ profiles.develop profiles.graphical users.nixos ];
@ -16,7 +18,9 @@ rec {
``` ```
## Usage ## Usage
`hosts/my-laptop.nix`: `hosts/my-laptop.nix`:
```nix ```nix
{ suites, ... }: { suites, ... }:
{ {

12
doc/concepts/users.md
View file

@ -1,5 +1,6 @@
> ##### _Note:_ > ##### _Note:_
> This section and its semantics need a conceptiual rework. >
> This section and its semantics need a conceptiual rework.
> Since recently [portable home configurations][portableuser] > Since recently [portable home configurations][portableuser]
> that are not bound to any specific host are a thing. > that are not bound to any specific host are a thing.
@ -12,7 +13,9 @@ your users. For a fully fleshed out example, check out the developers personal
[branch](https://github.com/divnix/devos/tree/nrd/users/nrd/default.nix). [branch](https://github.com/divnix/devos/tree/nrd/users/nrd/default.nix).
## Basic Usage ## Basic Usage
`users/myuser/default.nix`: `users/myuser/default.nix`:
```nix ```nix
{ ... }: { ... }:
{ {
@ -28,6 +31,7 @@ your users. For a fully fleshed out example, check out the developers personal
``` ```
## Home Manager ## Home Manager
Home Manager support follows the same principles as regular nixos configurations, Home Manager support follows the same principles as regular nixos configurations,
it even gets its own namespace in your `flake.nix` as `home`. it even gets its own namespace in your `flake.nix` as `home`.
@ -37,7 +41,9 @@ User profiles can be collected in a similar fashion as system ones into a `suite
argument that gets passed to your home-manager users. argument that gets passed to your home-manager users.
### Example ### Example
`flake.nix` `flake.nix`
```nix ```nix
{ {
home.users.nixos = { suites, ... }: { home.users.nixos = { suites, ... }: {
@ -46,8 +52,8 @@ argument that gets passed to your home-manager users.
} }
``` ```
## External Usage ## External Usage
You can easily use the defined home-manager configurations outside of NixOS You can easily use the defined home-manager configurations outside of NixOS
using the `homeConfigurations` flake output. using the `homeConfigurations` flake output.
@ -55,6 +61,7 @@ This is great for keeping your environment consistent across Unix-like systems,
including macOS. including macOS.
### From within the projects devshell: ### From within the projects devshell:
```sh ```sh
# builds the pub-solar user defined in the PubSolarOS host # builds the pub-solar user defined in the PubSolarOS host
nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage' nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage'
@ -64,6 +71,7 @@ nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage' && ./r
``` ```
### Manually from outside the project: ### Manually from outside the project:
```sh ```sh
# build # build
nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPackage" nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPackage"

1
doc/integrations/cachix.md
View file

@ -1,4 +1,5 @@
# Cachix # Cachix
The system will automatically pull a cachix.nix at the root if one exists. The system will automatically pull a cachix.nix at the root if one exists.
This is usually created automatically by a `sudo cachix use`. If you're more This is usually created automatically by a `sudo cachix use`. If you're more
inclined to keep the root clean, you can drop any generated files in the inclined to keep the root clean, you can drop any generated files in the

10
doc/integrations/deploy.md
View file

@ -1,4 +1,5 @@
# deploy-rs # deploy-rs
[Deploy-rs][d-rs] is a tool for managing NixOS remote machines. It was [Deploy-rs][d-rs] is a tool for managing NixOS remote machines. It was
chosen for devos after the author experienced some frustrations with the chosen for devos after the author experienced some frustrations with the
stateful nature of nixops' db. It was also designed from scratch to support stateful nature of nixops' db. It was also designed from scratch to support
@ -11,6 +12,7 @@ the command line.
## Usage ## Usage
Just add your ssh key to the host: Just add your ssh key to the host:
```nix ```nix
{ ... }: { ... }:
{ {
@ -21,6 +23,7 @@ Just add your ssh key to the host:
``` ```
And the private key to your user: And the private key to your user:
```nix ```nix
{ ... }: { ... }:
{ {
@ -39,16 +42,20 @@ And the private key to your user:
``` ```
And run the deployment: And run the deployment:
```sh ```sh
deploy '.#hostName' --hostname host.example.com deploy '.#hostName' --hostname host.example.com
``` ```
> ##### _Note:_ > ##### _Note:_
>
> Your user will need **passwordless** sudo access > Your user will need **passwordless** sudo access
### Home Manager ### Home Manager
Digga's `lib.mkDeployNodes` provides only `system` profile. Digga's `lib.mkDeployNodes` provides only `system` profile.
In order to deploy your `home-manager` configuration you should provide additional profile(s) to deploy-rs config: In order to deploy your `home-manager` configuration you should provide additional profile(s) to deploy-rs config:
```nix ```nix
# Initially, this line looks like this: deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; # Initially, this line looks like this: deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations
@ -67,10 +74,9 @@ deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations
}; };
``` ```
Substitute `<HOSTNAME>`, `<HM_PROFILE>` and `<YOUR_USERNAME>` placeholders (omitting the `<>`). Substitute `<HOSTNAME>`, `<HM_PROFILE>` and `<YOUR_USERNAME>` placeholders (omitting the `<>`).
`<ANOTHER_HM_PROFILE>` is there to illustrate deploying multiple `home-manager` configurations. Either substitute those as well, `<ANOTHER_HM_PROFILE>` is there to illustrate deploying multiple `home-manager` configurations. Either substitute those as well,
or remove them altogether. Don't forget the `profileOrder` variable. or remove them altogether. Don't forget the `profileOrder` variable.
[d-rs]: https://github.com/serokell/deploy-rs [d-rs]: https://github.com/serokell/deploy-rs

4
doc/integrations/hercules.md
View file

@ -1,4 +1,5 @@
# Hercules CI # Hercules CI
If you start adding your own packages and configurations, you'll probably have If you start adding your own packages and configurations, you'll probably have
at least a few binary artifacts. With hercules we can build every package in at least a few binary artifacts. With hercules we can build every package in
our configuration automatically, on every commit. Additionally, we can have it our configuration automatically, on every commit. Additionally, we can have it
@ -8,6 +9,7 @@ This will work whether your copy is a fork, or a bare template, as long as your
repo is hosted on GitHub. repo is hosted on GitHub.
## Setup ## Setup
Just head over to [hercules-ci.com](https://hercules-ci.com) to make an account. Just head over to [hercules-ci.com](https://hercules-ci.com) to make an account.
Then follow the docs to set up an [agent][agent], if you want to deploy to a Then follow the docs to set up an [agent][agent], if you want to deploy to a
@ -15,6 +17,7 @@ binary cache (and of course you do), be sure _not_ to skip the
[binary-caches.json][cache]. [binary-caches.json][cache].
## Ready to Use ## Ready to Use
The repo is already set up with the proper _default.nix_ file, building all The repo is already set up with the proper _default.nix_ file, building all
declared packages, checks, profiles and shells. So you can see if something declared packages, checks, profiles and shells. So you can see if something
breaks, and never build the same package twice! breaks, and never build the same package twice!
@ -23,6 +26,7 @@ If you want to get fancy, you could even have hercules
[deploy your configuration](https://docs.hercules-ci.com/hercules-ci-effects/guide/deploy-a-nixos-machine/)! [deploy your configuration](https://docs.hercules-ci.com/hercules-ci-effects/guide/deploy-a-nixos-machine/)!
> ##### _Note:_ > ##### _Note:_
>
> Hercules doesn't have access to anything encrypted in the > Hercules doesn't have access to anything encrypted in the
> [secrets folder](../../secrets), so none of your secrets will accidentally get > [secrets folder](../../secrets), so none of your secrets will accidentally get
> pushed to a cache by mistake. > pushed to a cache by mistake.

1
doc/integrations/index.md
View file

@ -1,4 +1,5 @@
# Integrations # Integrations
This section explores some of the optional tools included with devos to provide This section explores some of the optional tools included with devos to provide
a solution to common concerns such as ci and remote deployment. An effort is a solution to common concerns such as ci and remote deployment. An effort is
made to choose tools that treat nix, and where possible flakes, as first class made to choose tools that treat nix, and where possible flakes, as first class

5
doc/integrations/nvfetcher.md
View file

@ -1,4 +1,5 @@
# nvfetcher # nvfetcher
[NvFetcher][nvf] is a workflow companion for updating nix sources. [NvFetcher][nvf] is a workflow companion for updating nix sources.
You can specify an origin source and an update configuration, and You can specify an origin source and an update configuration, and
@ -15,6 +16,7 @@ and commit the results.
## Usage ## Usage
Statically fetching (not tracking) a particular tag from a github repo: Statically fetching (not tracking) a particular tag from a github repo:
```toml ```toml
[manix] [manix]
src.manual = "v0.6.3" src.manual = "v0.6.3"
@ -22,6 +24,7 @@ fetch.github = "mlvzk/manix"
``` ```
Tracking the latest github _release_ from a github repo: Tracking the latest github _release_ from a github repo:
```toml ```toml
[manix] [manix]
src.github = "mlvzk/manix" # responsible for tracking src.github = "mlvzk/manix" # responsible for tracking
@ -29,6 +32,7 @@ fetch.github = "mlvzk/manix" # responsible for fetching
``` ```
Tracking the latest commit of a git repository and fetch from a git repo: Tracking the latest commit of a git repository and fetch from a git repo:
```toml ```toml
[manix] [manix]
src.git = "https://github.com/mlvzk/manix.git" # responsible for tracking src.git = "https://github.com/mlvzk/manix.git" # responsible for tracking
@ -36,6 +40,7 @@ fetch.git = "https://github.com/mlvzk/manix.git" # responsible for fetching
``` ```
> ##### _Note:_ > ##### _Note:_
>
> Please refer to the [NvFetcher Readme][nvf-readme] for more options. > Please refer to the [NvFetcher Readme][nvf-readme] for more options.
[nvf]: https://github.com/berberman/nvfetcher [nvf]: https://github.com/berberman/nvfetcher

1
doc/outputs/index.md
View file

@ -1,3 +1,4 @@
# Layout # Layout
Each of the following sections is a directory whose contents are output to the Each of the following sections is a directory whose contents are output to the
outside world via the flake's outputs. Check each chapter for details. outside world via the flake's outputs. Check each chapter for details.

12
doc/outputs/modules.md
View file

@ -1,4 +1,5 @@
# Modules # Modules
The modules directory is a replica of nixpkg's NixOS [modules][nixpkgs-modules] The modules directory is a replica of nixpkg's NixOS [modules][nixpkgs-modules]
, and follows the same semantics. This allows for trivial upstreaming into , and follows the same semantics. This allows for trivial upstreaming into
nixpkgs proper once your module is sufficiently stable. nixpkgs proper once your module is sufficiently stable.
@ -6,18 +7,21 @@ nixpkgs proper once your module is sufficiently stable.
All modules linked in _module-list.nix_ are automatically exported via All modules linked in _module-list.nix_ are automatically exported via
`nixosModules.<file-basename>`, and imported into all [hosts](../concepts/hosts.md). `nixosModules.<file-basename>`, and imported into all [hosts](../concepts/hosts.md).
> ##### _Note:_ > ##### _Note:_
>
> This is reserved for declaring brand new module options. If you just want to > This is reserved for declaring brand new module options. If you just want to
> declare a coherent configuration of already existing and related NixOS options > declare a coherent configuration of already existing and related NixOS options
> , use [profiles](../concepts/profiles.md) instead. > , use [profiles](../concepts/profiles.md) instead.
## Semantics ## Semantics
In case you've never written a module for nixpkgs before, here is a brief In case you've never written a module for nixpkgs before, here is a brief
outline of the process. outline of the process.
### Declaration ### Declaration
modules/services/service-category/my-service.nix: modules/services/service-category/my-service.nix:
```nix ```nix
{ config, lib, ... }: { config, lib, ... }:
let let
@ -37,7 +41,9 @@ in
``` ```
### Import ### Import
modules/module-list.nix: modules/module-list.nix:
```nix ```nix
[ [
./services/service-category/my-service.nix ./services/service-category/my-service.nix
@ -47,7 +53,9 @@ modules/module-list.nix:
## Usage ## Usage
### Internal ### Internal
profiles/profile-category/my-profile.nix: profiles/profile-category/my-profile.nix:
```nix ```nix
{ ... }: { ... }:
{ {
@ -56,7 +64,9 @@ profiles/profile-category/my-profile.nix:
``` ```
### External ### External
flake.nix: flake.nix:
```nix ```nix
{ {
# inputs omitted # inputs omitted

3
doc/outputs/overlays.md
View file

@ -1,4 +1,5 @@
# Overlays # Overlays
Writing overlays is a common occurence when using a NixOS system. Therefore, Writing overlays is a common occurence when using a NixOS system. Therefore,
we want to keep the process as simple and straightforward as possible. we want to keep the process as simple and straightforward as possible.
@ -9,7 +10,9 @@ exported via `overlays.<channel>/<pkgName>` _as well as_
write it. write it.
## Example ## Example
overlays/kakoune.nix: overlays/kakoune.nix:
```nix ```nix
final: prev: { final: prev: {
kakoune = prev.kakoune.override { kakoune = prev.kakoune.override {

21
doc/outputs/pkgs.md
View file

@ -1,4 +1,5 @@
# Packages # Packages
Similar to [modules](./modules.md), the pkgs directory mirrors the upstream Similar to [modules](./modules.md), the pkgs directory mirrors the upstream
[nixpkgs/pkgs][pkgs], and for the same reason; if you ever want to upstream [nixpkgs/pkgs][pkgs], and for the same reason; if you ever want to upstream
your package, it's as simple as dropping it into the nixpkgs/pkgs directory. your package, it's as simple as dropping it into the nixpkgs/pkgs directory.
@ -13,26 +14,30 @@ the supported systems listed in the package's `meta.platforms` attribute.
And, as usual, every package in the overlay is also available to any NixOS And, as usual, every package in the overlay is also available to any NixOS
[host](../concepts/hosts.md). [host](../concepts/hosts.md).
Another convenient difference is that it is possible to use Another convenient difference is that it is possible to use
[nvfetcher](https://github.com/berberman/nvfetcher) to keep packages up to [nvfetcher](https://github.com/berberman/nvfetcher) to keep packages up to
date. date.
This is best understood by the simple example below. This is best understood by the simple example below.
## Example ## Example
It is possible to specify sources separately to keep them up to date semi
It is possible to specify sources separately to keep them up to date semi
automatically. automatically.
The basic rules are specified in pkgs/sources.toml: The basic rules are specified in pkgs/sources.toml:
```toml ```toml
# nvfetcher.toml # nvfetcher.toml
[libinih] [libinih]
src.github = "benhoyt/inih" src.github = "benhoyt/inih"
fetch.github = "benhoyt/inih" fetch.github = "benhoyt/inih"
``` ```
After changes to this file as well as to update the packages specified in there run
After changes to this file as well as to update the packages specified in there run
nvfetcher (for more details see [nvfetcher](https://github.com/berberman/nvfetcher)). nvfetcher (for more details see [nvfetcher](https://github.com/berberman/nvfetcher)).
The pkgs overlay is managed in The pkgs overlay is managed in
pkgs/default.nix: pkgs/default.nix:
```nix ```nix
final: prev: { final: prev: {
# keep sources first, this makes sources available to the pkgs # keep sources first, this makes sources available to the pkgs
@ -45,6 +50,7 @@ final: prev: {
Lastly the example package is in Lastly the example package is in
pkgs/development/libraries/libinih/default.nix: pkgs/development/libraries/libinih/default.nix:
```nix ```nix
{ stdenv, meson, ninja, lib, sources, ... }: { stdenv, meson, ninja, lib, sources, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -59,16 +65,17 @@ stdenv.mkDerivation {
} }
``` ```
## Migration from flake based approach ## Migration from flake based approach
Previous to nvfetcher it was possible to manage sources via a pkgs/flake.nix, the main changes from there are that sources where in the attribute "srcs" (now "sources") and the contents of the sources where slightly different. Previous to nvfetcher it was possible to manage sources via a pkgs/flake.nix, the main changes from there are that sources where in the attribute "srcs" (now "sources") and the contents of the sources where slightly different.
In order to switch to the new system, rewrite pkgs/flake.nix to a pkgs/sources.toml file using the documentation of nvfetcher, In order to switch to the new system, rewrite pkgs/flake.nix to a pkgs/sources.toml file using the documentation of nvfetcher,
add the line that calls the sources at the beginning of pkgs/default.nix, and add the line that calls the sources at the beginning of pkgs/default.nix, and
accomodate the small changes in the packages as can be seen from the example. accomodate the small changes in the packages as can be seen from the example.
The example package looked like: The example package looked like:
pkgs/flake.nix: pkgs/flake.nix:
```nix ```nix
{ {
description = "Package sources"; description = "Package sources";
@ -81,6 +88,7 @@ pkgs/flake.nix:
``` ```
pkgs/default.nix: pkgs/default.nix:
```nix ```nix
final: prev: { final: prev: {
# then, call packages with `final.callPackage` # then, call packages with `final.callPackage`
@ -89,6 +97,7 @@ final: prev: {
``` ```
pkgs/development/libraries/libinih/default.nix: pkgs/development/libraries/libinih/default.nix:
```nix ```nix
{ stdenv, meson, ninja, lib, srcs, ... }: { stdenv, meson, ninja, lib, srcs, ... }:
let inherit (srcs) libinih; in let inherit (srcs) libinih; in

17
doc/secrets.md
View file

@ -1,9 +1,11 @@
# Secrets # Secrets
Secrets are managed using [agenix][agenix] Secrets are managed using [agenix][agenix]
so you can keep your flake in a public repository like GitHub without so you can keep your flake in a public repository like GitHub without
exposing your password or other sensitive data. exposing your password or other sensitive data.
## Agenix ## Agenix
Currently, there is [no mechanism][secrets-issue] in nix itself to deploy secrets Currently, there is [no mechanism][secrets-issue] in nix itself to deploy secrets
within the nix store because it is world-readable. within the nix store because it is world-readable.
@ -17,6 +19,7 @@ matching ssh private key can read the data. The [age module][age module] will ad
encrypted files to the nix store and decrypt them on activation to `/run/agenix`. encrypted files to the nix store and decrypt them on activation to `/run/agenix`.
### Setup ### Setup
All hosts must have openssh enabled, this is done by default in the core profile. All hosts must have openssh enabled, this is done by default in the core profile.
You need to populate your `secrets/secrets.nix` with the proper ssh public keys. You need to populate your `secrets/secrets.nix` with the proper ssh public keys.
@ -24,6 +27,7 @@ Be extra careful to make sure you only add public keys, you should never share a
private key!! private key!!
secrets/secrets.nix: secrets/secrets.nix:
```nix ```nix
let let
system = "<system ssh key>"; system = "<system ssh key>";
@ -37,22 +41,25 @@ this file doesn't exist you likely need to enable openssh and rebuild your syste
Your users ssh public key is probably stored in `~/.ssh/id_ed25519.pub` or Your users ssh public key is probably stored in `~/.ssh/id_ed25519.pub` or
`~/.ssh/id_rsa.pub`. If you haven't generated a ssh key yet, be sure do so: `~/.ssh/id_rsa.pub`. If you haven't generated a ssh key yet, be sure do so:
```sh ```sh
ssh-keygen -t ed25519 ssh-keygen -t ed25519
``` ```
> ##### _Note:_ > ##### _Note:_
>
> The underlying tool used by agenix, rage, doesn't work well with password protected > The underlying tool used by agenix, rage, doesn't work well with password protected
> ssh keys. So if you have lots of secrets you might have to type in your password many > ssh keys. So if you have lots of secrets you might have to type in your password many
> times. > times.
### Secrets ### Secrets
You will need the `agenix` command to create secrets. DevOS conveniently provides that You will need the `agenix` command to create secrets. DevOS conveniently provides that
in the devShell, so just run `nix develop` whenever you want to edit secrets. Make sure in the devShell, so just run `nix develop` whenever you want to edit secrets. Make sure
to always run `agenix` while in the `secrets/` folder, so it can pick up your `secrets.nix`. to always run `agenix` while in the `secrets/` folder, so it can pick up your `secrets.nix`.
To create secrets, simply add lines to your `secrets/secrets.nix`: To create secrets, simply add lines to your `secrets/secrets.nix`:
``` ```
let let
... ...
@ -62,21 +69,26 @@ in
"secret.age".publicKeys = allKeys; "secret.age".publicKeys = allKeys;
} }
``` ```
That would tell agenix to create a `secret.age` file that is encrypted with the `system` That would tell agenix to create a `secret.age` file that is encrypted with the `system`
and `user` ssh public key. and `user` ssh public key.
Then go into the `secrets` folder and run: Then go into the `secrets` folder and run:
```sh ```sh
agenix -e secret.age agenix -e secret.age
``` ```
This will create the `secret.age`, if it doesn't already exist, and allow you to edit it. This will create the `secret.age`, if it doesn't already exist, and allow you to edit it.
If you ever change the `publicKeys` entry of any secret make sure to rekey the secrets: If you ever change the `publicKeys` entry of any secret make sure to rekey the secrets:
```sh ```sh
agenix --rekey agenix --rekey
``` ```
### Usage ### Usage
Once you have your secret file encrypted and ready to use, you can utilize the [age module][age module] Once you have your secret file encrypted and ready to use, you can utilize the [age module][age module]
to ensure that your secrets end up in `/run/secrets`. to ensure that your secrets end up in `/run/secrets`.
@ -89,15 +101,14 @@ In any profile that uses a NixOS module that requires a secret you can enable a
} }
``` ```
Then you can just pass the path `/run/agenix/mysecret` to the module. Then you can just pass the path `/run/agenix/mysecret` to the module.
You can make use of the many options provided by the age module to customize where and how You can make use of the many options provided by the age module to customize where and how
secrets get decrypted. You can learn about them by looking at the secrets get decrypted. You can learn about them by looking at the
[age module][age module]. [age module][age module].
> ##### _Note:_ > ##### _Note:_
>
> You can take a look at the [agenix repository][agenix] for more information > You can take a look at the [agenix repository][agenix] for more information
> about the tool. > about the tool.

11
doc/start/index.md
View file

@ -1,18 +1,24 @@
# Quick Start # Quick Start
The only dependency is nix, so make sure you have it [installed][install-nix]. The only dependency is nix, so make sure you have it [installed][install-nix].
## Get the Template ## Get the Template
If you currently don't have flakes setup, you can utilize the digga shell to pull the template: If you currently don't have flakes setup, you can utilize the digga shell to pull the template:
```sh ```sh
nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \ nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
--run "nix flake init -t github:divnix/digga" --run "nix flake init -t github:divnix/digga"
``` ```
If you already have flakes support, you can directly pull the template: If you already have flakes support, you can directly pull the template:
```sh ```sh
nix flake init -t github:divnix/digga nix flake init -t github:divnix/digga
``` ```
Then make sure to create the git repository: Then make sure to create the git repository:
```sh ```sh
git init git init
git add . git add .
@ -20,11 +26,14 @@ git commit -m init
``` ```
To drop into a nix-shell, if you don't have flakes setup, use the digga shell to create a `flake.lock`: To drop into a nix-shell, if you don't have flakes setup, use the digga shell to create a `flake.lock`:
```sh ```sh
nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \ nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
--run "nix flake lock" --run "nix flake lock"
``` ```
Or if you do have flakes support, just run: Or if you do have flakes support, just run:
```sh ```sh
nix flake lock nix flake lock
``` ```
@ -35,6 +44,7 @@ version required. You can run `menu` to confirm that you are using digga (expect
In addition, the [binary cache](../integrations/cachix.md) is added for faster deployment. In addition, the [binary cache](../integrations/cachix.md) is added for faster deployment.
> ##### _Notes:_ > ##### _Notes:_
>
> - Flakes ignore files that have not been added to git, so be sure to stage new > - Flakes ignore files that have not been added to git, so be sure to stage new
> files before building the system. > files before building the system.
> - You can choose to simply clone the repo with git if you want to follow > - You can choose to simply clone the repo with git if you want to follow
@ -46,5 +56,4 @@ In addition, the [binary cache](../integrations/cachix.md) is added for faster d
- [Make installable ISO](./iso.md) - [Make installable ISO](./iso.md)
[install-nix]: https://nixos.org/manual/nix/stable/#sect-multi-user-installation [install-nix]: https://nixos.org/manual/nix/stable/#sect-multi-user-installation

2
doc/start/iso.md
View file

@ -31,6 +31,6 @@ custom-made for your target host will maximise those local cache hits. For hosts
that don't differ too much, a single USB stick might be ok, whereas when there that don't differ too much, a single USB stick might be ok, whereas when there
are bigger differences, a custom-made USB stick will be considerably faster. are bigger differences, a custom-made USB stick will be considerably faster.
[nixos-generators]: https://github.com/nix-community/nixos-generators [nixos-generators]: https://github.com/nix-community/nixos-generators
[burn]: https://nixos.org/manual/nixos/stable/index.html#sec-booting-from-usb [burn]: https://nixos.org/manual/nixos/stable/index.html#sec-booting-from-usb
[formats]: https://github.com/nix-community/nixos-generators/tree/master/formats [formats]: https://github.com/nix-community/nixos-generators/tree/master/formats

2
doc/tests.md
View file

@ -6,12 +6,14 @@ configuration, and, optionally, run them in
[CI](./integrations/hercules.md). [CI](./integrations/hercules.md).
## Unit Tests ## Unit Tests
Unit tests can be created from regular derivations, and they can do Unit tests can be created from regular derivations, and they can do
almost anything you can imagine. By convention, it is best to test your almost anything you can imagine. By convention, it is best to test your
packages during their [check phase][check]. All packages and their tests will packages during their [check phase][check]. All packages and their tests will
be built during CI. be built during CI.
## Integration Tests ## Integration Tests
All your profiles defined in suites will be tested in a NixOS VM. All your profiles defined in suites will be tested in a NixOS VM.
You can write integration tests for one or more NixOS VMs that can, You can write integration tests for one or more NixOS VMs that can,

250
flake.nix
View file

@ -5,151 +5,157 @@
nixConfig.extra-substituters = "https://nix-dram.cachix.org https://dram.cachix.org https://nrdxp.cachix.org https://nix-community.cachix.org"; nixConfig.extra-substituters = "https://nix-dram.cachix.org https://dram.cachix.org https://nrdxp.cachix.org https://nix-community.cachix.org";
nixConfig.extra-trusted-public-keys = "nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; nixConfig.extra-trusted-public-keys = "nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
inputs = inputs = {
{ # Track channels with commits tested and built by hydra
# Track channels with commits tested and built by hydra nixos.url = "github:nixos/nixpkgs/nixos-22.05";
nixos.url = "github:nixos/nixpkgs/nixos-22.05"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
latest.url = "github:nixos/nixpkgs/nixos-unstable";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-compat.flake = false; flake-compat.flake = false;
digga.url = "github:pub-solar/digga/fix/bootstrap-iso"; digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixlib.follows = "nixos"; digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
digga.inputs.deploy.follows = "deploy"; digga.inputs.deploy.follows = "deploy";
home.url = "github:nix-community/home-manager/release-22.05"; home.url = "github:nix-community/home-manager/release-22.05";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixos"; darwin.inputs.nixpkgs.follows = "nixos";
deploy.url = "github:serokell/deploy-rs"; deploy.url = "github:serokell/deploy-rs";
deploy.inputs.nixpkgs.follows = "nixos"; deploy.inputs.nixpkgs.follows = "nixos";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixos"; agenix.inputs.nixpkgs.follows = "nixos";
nvfetcher.url = "github:berberman/nvfetcher"; nvfetcher.url = "github:berberman/nvfetcher";
nvfetcher.inputs.nixpkgs.follows = "nixos"; nvfetcher.inputs.nixpkgs.follows = "nixos";
naersk.url = "github:nmattia/naersk"; naersk.url = "github:nmattia/naersk";
naersk.inputs.nixpkgs.follows = "nixos"; naersk.inputs.nixpkgs.follows = "nixos";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nixos-generators.url = "github:nix-community/nixos-generators"; nixos-generators.url = "github:nix-community/nixos-generators";
}; };
outputs = outputs = {
{ self self,
, digga digga,
, nixos nixos,
, home home,
, nixos-hardware nixos-hardware,
, nur nur,
, agenix agenix,
, nvfetcher nvfetcher,
, deploy deploy,
, ... ...
} @ inputs: } @ inputs:
digga.lib.mkFlake digga.lib.mkFlake
{ {
inherit self inputs; inherit self inputs;
channelsConfig = { channelsConfig = {
# allowUnfree = true; # allowUnfree = true;
}; };
supportedSystems = [ "x86_64-linux" "aarch64-linux" ]; supportedSystems = ["x86_64-linux" "aarch64-linux"];
channels = {
nixos = {
imports = [ (digga.lib.importOverlays ./overlays) ];
overlays = [ ];
};
latest = { };
};
lib = import ./lib { lib = digga.lib // nixos.lib; };
sharedOverlays = [
(final: prev: {
__dontExport = true;
lib = prev.lib.extend (lfinal: lprev: {
our = self.lib;
});
})
nur.overlay
agenix.overlay
(import ./pkgs)
];
channels = {
nixos = { nixos = {
hostDefaults = { imports = [(digga.lib.importOverlays ./overlays)];
system = "x86_64-linux"; overlays = [];
channelName = "nixos"; };
imports = [ (digga.lib.importExportableModules ./modules) ]; latest = {};
};
lib = import ./lib {lib = digga.lib // nixos.lib;};
sharedOverlays = [
(final: prev: {
__dontExport = true;
lib = prev.lib.extend (lfinal: lprev: {
our = self.lib;
});
})
nur.overlay
agenix.overlay
(import ./pkgs)
];
nixos = {
hostDefaults = {
system = "x86_64-linux";
channelName = "nixos";
imports = [(digga.lib.importExportableModules ./modules)];
modules = [
{lib.our = self.lib;}
# FIXME: upstream module causes a huge number of unnecessary
# dependencies to be pulled in for all systems -- many of them are
# graphical. should only be imported as needed.
# digga.nixosModules.bootstrapIso
digga.nixosModules.nixConfig
home.nixosModules.home-manager
agenix.nixosModules.age
];
};
imports = [(digga.lib.importHosts ./hosts)];
hosts = {
/*
set host specific properties here
*/
bootstrap = {
modules = [ modules = [
{ lib.our = self.lib; } digga.nixosModules.bootstrapIso
# FIXME: upstream module causes a huge number of unnecessary
# dependencies to be pulled in for all systems -- many of them are
# graphical. should only be imported as needed.
# digga.nixosModules.bootstrapIso
digga.nixosModules.nixConfig
home.nixosModules.home-manager
agenix.nixosModules.age
]; ];
}; };
PubSolarOS = {
imports = [ (digga.lib.importHosts ./hosts) ]; tests = [
hosts = { (import ./tests/first-test.nix {
/* set host specific properties here */ pkgs = nixos.legacyPackages.x86_64-linux;
bootstrap = { lib = nixos.lib;
modules = [ })
digga.nixosModules.bootstrapIso ];
];
};
PubSolarOS = {
tests = [
(import ./tests/first-test.nix { pkgs = nixos.legacyPackages.x86_64-linux; lib = nixos.lib; })
];
};
}; };
importables = rec { };
profiles = digga.lib.rakeLeaves ./profiles // { importables = rec {
profiles =
digga.lib.rakeLeaves ./profiles
// {
users = digga.lib.rakeLeaves ./users; users = digga.lib.rakeLeaves ./users;
}; };
suites = with profiles; rec { suites = with profiles; rec {
base = [ users.pub-solar users.root ]; base = [users.pub-solar users.root];
iso = base ++ [ base-user graphical pub-solar-iso ]; iso = base ++ [base-user graphical pub-solar-iso];
pubsolaros = [ full-install base-user users.root ]; pubsolaros = [full-install base-user users.root];
anonymous = [ pubsolaros users.pub-solar ]; anonymous = [pubsolaros users.pub-solar];
};
}; };
}; };
home = {
imports = [ (digga.lib.importExportableModules ./users/modules) ];
modules = [ ];
importables = rec {
profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; rec {
base = [ direnv git ];
};
};
users = {
pub-solar = { suites, ... }: { imports = suites.base; };
}; # digga.lib.importers.rakeLeaves ./users/hm;
};
devshell = ./shell;
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
}; };
home = {
imports = [(digga.lib.importExportableModules ./users/modules)];
modules = [];
importables = rec {
profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; rec {
base = [direnv git];
};
};
users = {
pub-solar = {suites, ...}: {imports = suites.base;};
}; # digga.lib.importers.rakeLeaves ./users/hm;
};
devshell = ./shell;
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {};
};
} }

8
hosts/PubSolarOS.nix
View file

@ -1,17 +1,15 @@
{ suites, ... }: {suites, ...}: {
{
### root password is empty by default ### ### root password is empty by default ###
### default password: pub-solar, optional: add your SSH keys ### default password: pub-solar, optional: add your SSH keys
imports = imports =
suites.iso suites.iso;
;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; }; fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

35
hosts/bootstrap.nix
View file

@ -1,19 +1,22 @@
{ config, lib, pkgs, profiles, ... }: {
with lib; config,
let lib,
pkgs,
profiles,
...
}:
with lib; let
# Gets hostname of host to be bundled inside iso # Gets hostname of host to be bundled inside iso
# Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11 # Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11
getFqdn = config: getFqdn = config: let
let net = config.networking;
net = config.networking; fqdn =
fqdn = if (net ? domain) && (net.domain != null)
if (net ? domain) && (net.domain != null) then "${net.hostName}.${net.domain}"
then "${net.hostName}.${net.domain}" else net.hostName;
else net.hostName; in
in fqdn;
fqdn; in {
in
{
# build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"` # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
imports = [ imports = [
# profiles.networking # profiles.networking
@ -28,7 +31,7 @@ in
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# will be overridden by the bootstrapIso instrumentation # will be overridden by the bootstrapIso instrumentation
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; }; fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
system.nixos.label = "PubSolarOS-" + config.system.nixos.version; system.nixos.label = "PubSolarOS-" + config.system.nixos.version;
@ -36,7 +39,7 @@ in
# https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L17 # https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L17
# https://github.com/NixOS/nixpkgs/blob/aecd4d8349b94f9bd5718c74a5b789f233f67326/nixos/modules/installer/cd-dvd/installation-cd-base.nix#L21-L22 # https://github.com/NixOS/nixpkgs/blob/aecd4d8349b94f9bd5718c74a5b789f233f67326/nixos/modules/installer/cd-dvd/installation-cd-base.nix#L21-L22
isoImage = { isoImage = {
isoBaseName = mkForce (getFqdn config); isoBaseName = mkForce (getFqdn config);
isoName = mkForce "${config.system.nixos.label}-${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso"; isoName = mkForce "${config.system.nixos.label}-${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso";
}; };

17
lib/compat/default.nix
View file

@ -1,6 +1,10 @@
let let
lock = builtins.fromJSON (builtins.readFile builtins.path { path = ../../flake.lock; name = "lockPath"; }); lock = builtins.fromJSON (builtins.readFile builtins.path {
flake = (import path = ../../flake.lock;
name = "lockPath";
});
flake =
import
( (
fetchTarball { fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
@ -8,7 +12,10 @@ let
} }
) )
{ {
src = builtins.path { path = ../../.; name = "projectRoot"; }; src = builtins.path {
}); path = ../../.;
name = "projectRoot";
};
};
in in
flake flake

5
lib/compat/nixos/default.nix
View file

@ -1,5 +1,4 @@
{ ... }: {...}: let
let
inherit (default.inputs.nixos) lib; inherit (default.inputs.nixos) lib;
host = configs.${hostname} or configs.PubSolarOS; host = configs.${hostname} or configs.PubSolarOS;
@ -7,4 +6,4 @@ let
default = (import ../.).defaultNix; default = (import ../.).defaultNix;
hostname = lib.fileContents /etc/hostname; hostname = lib.fileContents /etc/hostname;
in in
host host

4
lib/default.nix
View file

@ -1,2 +1,2 @@
{ lib }: {lib}:
lib.makeExtensible (self: { }) lib.makeExtensible (self: {})

30
modules/arduino/default.nix
View file

@ -1,23 +1,27 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.devops; cfg = config.pub-solar.devops;
in in {
{
options.pub-solar.arduino = { options.pub-solar.arduino = {
enable = mkEnableOption "Life with home automation"; enable = mkEnableOption "Life with home automation";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] { users.users = pkgs.lib.setAttrByPath [psCfg.user.name] {
extraGroups = [ "dialout" ]; extraGroups = ["dialout"];
}; };
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
arduino home.packages = [
arduino-cli arduino
]; arduino-cli
}; ];
};
}; };
} }

76
modules/audio/default.nix
View file

@ -1,11 +1,14 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.audio; cfg = config.pub-solar.audio;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in in {
{
options.pub-solar.audio = { options.pub-solar.audio = {
enable = mkEnableOption "Life in highs and lows"; enable = mkEnableOption "Life in highs and lows";
mopidy.enable = mkEnableOption "Life with mopidy"; mopidy.enable = mkEnableOption "Life with mopidy";
@ -20,39 +23,46 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] { users.users = pkgs.lib.setAttrByPath [psCfg.user.name] {
extraGroups = [ "audio" ]; extraGroups = ["audio"];
}; };
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
# easyeffects, e.g. for microphone noise filtering home.packages =
easyeffects [
mu # easyeffects, e.g. for microphone noise filtering
pavucontrol easyeffects
pa_applet mu
playerctl pavucontrol
# Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?) pa_applet
pulseaudio playerctl
vimpc # Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
] ++ (if cfg.spotify.enable then [ pkgs.spotify-tui ] else [ ]); pulseaudio
xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc; vimpc
systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs; ]
++ (
if cfg.spotify.enable
then [pkgs.spotify-tui]
else []
);
xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
services.spotifyd = mkIf cfg.spotify.enable { services.spotifyd = mkIf cfg.spotify.enable {
enable = true; enable = true;
settings = { settings = {
global = { global = {
username = cfg.spotify.username; username = cfg.spotify.username;
password_cmd = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus ${pkgs.libsecret}/bin/secret-tool lookup spotify password"; password_cmd = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1001/bus ${pkgs.libsecret}/bin/secret-tool lookup spotify password";
bitrate = 320; bitrate = 320;
volume_normalisation = true; volume_normalisation = true;
no_audio_cache = false; no_audio_cache = false;
max_cache_size = 1000000000; max_cache_size = 1000000000;
};
}; };
}; };
}; };
};
# Enable sound using pipewire-pulse # Enable sound using pipewire-pulse
services.pipewire = { services.pipewire = {
@ -63,7 +73,7 @@ in
config.pipewire = { config.pipewire = {
context.default.clock = { context.default.clock = {
allowed-rates = [ 44100 48000 88200 96000 ]; allowed-rates = [44100 48000 88200 96000];
rate = 44100; rate = 44100;
}; };
}; };

3
modules/audio/easyeffects.service.nix
View file

@ -1,5 +1,4 @@
pkgs: pkgs: {
{
Service = { Service = {
Type = "dbus"; Type = "dbus";
BusName = "com.github.wwmm.easyeffects"; BusName = "com.github.wwmm.easyeffects";

10
modules/audio/pipewire-pulse.conf.json
View file

@ -8,10 +8,7 @@
{ {
"name": "libpipewire-module-rtkit", "name": "libpipewire-module-rtkit",
"args": {}, "args": {},
"flags": [ "flags": ["ifexists", "nofail"]
"ifexists",
"nofail"
]
}, },
{ {
"name": "libpipewire-module-protocol-native" "name": "libpipewire-module-protocol-native"
@ -28,10 +25,7 @@
{ {
"name": "libpipewire-module-protocol-pulse", "name": "libpipewire-module-protocol-pulse",
"args": { "args": {
"server.address": [ "server.address": ["unix:native", "tcp:4713"],
"unix:native",
"tcp:4713"
],
"vm.overrides": { "vm.overrides": {
"pulse.min.quantum": "1024/48000" "pulse.min.quantum": "1024/48000"
} }

18
modules/ci-runner/default.nix
View file

@ -1,10 +1,14 @@
{ lib, config, pkgs, self, ... }: {
with lib; lib,
let config,
pkgs,
self,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.ci-runner; cfg = config.pub-solar.ci-runner;
in in {
{
options.pub-solar.ci-runner = { options.pub-solar.ci-runner = {
enable = mkEnableOption "Enables a systemd service that runs drone-ci-runner"; enable = mkEnableOption "Enables a systemd service that runs drone-ci-runner";
}; };
@ -26,8 +30,8 @@ in
pkgs.libvirt pkgs.libvirt
]; ];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
after = [ "network.target" "libvirtd.service" ]; after = ["network.target" "libvirtd.service"];
script = ''${pkgs.drone-runner-exec}/bin/drone-runner-exec daemon /run/agenix/drone-runner-exec-config''; script = ''${pkgs.drone-runner-exec}/bin/drone-runner-exec daemon /run/agenix/drone-runner-exec-config'';
}; };

10
modules/compat/default.nix
View file

@ -1,6 +1,12 @@
{ config, pkgs, lib, ... }: with lib; { {
config,
pkgs,
lib,
...
}:
with lib; {
# Both things below are for # Both things below are for
# https://github.com/NixOS/nixpkgs/issues/124215 # https://github.com/NixOS/nixpkgs/issues/124215
documentation.info.enable = lib.mkForce false; documentation.info.enable = lib.mkForce false;
nix.sandboxPaths = [ "/bin/sh=${pkgs.bash}/bin/sh" ]; nix.sandboxPaths = ["/bin/sh=${pkgs.bash}/bin/sh"];
} }

15
modules/core/boot.nix
View file

@ -1,9 +1,12 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.pub-solar.core;
in
{ {
config,
pkgs,
lib,
...
}:
with lib; let
cfg = config.pub-solar.core;
in {
options.pub-solar.core.iso-options.enable = mkOption { options.pub-solar.core.iso-options.enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -36,7 +39,7 @@ in
kernelPackages = pkgs.linuxPackages_5_15; kernelPackages = pkgs.linuxPackages_5_15;
# Support ntfs drives # Support ntfs drives
supportedFilesystems = [ "ntfs" ]; supportedFilesystems = ["ntfs"];
}; };
}; };
} }

13
modules/core/default.nix
View file

@ -1,10 +1,11 @@
{ config, lib, ... }:
with lib;
let
cfg = config.pub-solar.core;
in
{ {
config,
lib,
...
}:
with lib; let
cfg = config.pub-solar.core;
in {
imports = [ imports = [
./boot.nix ./boot.nix
./hibernation.nix ./hibernation.nix

14
modules/core/fonts.nix
View file

@ -1,12 +1,14 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
fonts = { fonts = {
fonts = with pkgs; [ powerline-fonts dejavu_fonts ]; fonts = with pkgs; [powerline-fonts dejavu_fonts];
fontconfig.defaultFonts = { fontconfig.defaultFonts = {
monospace = [ "DejaVu Sans Mono for Powerline" ]; monospace = ["DejaVu Sans Mono for Powerline"];
sansSerif = [ "DejaVu Sans" ]; sansSerif = ["DejaVu Sans"];
}; };
}; };
} }

15
modules/core/hibernation.nix
View file

@ -1,9 +1,12 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.pub-solar.core.hibernation;
in
{ {
config,
pkgs,
lib,
...
}:
with lib; let
cfg = config.pub-solar.core.hibernation;
in {
options.pub-solar.core.hibernation = { options.pub-solar.core.hibernation = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -27,7 +30,7 @@ in
config = { config = {
boot = mkIf cfg.enable { boot = mkIf cfg.enable {
resumeDevice = cfg.resumeDevice; resumeDevice = cfg.resumeDevice;
kernelParams = mkIf (cfg.resumeOffset != null) [ "resume_offset=${builtins.toString cfg.resumeOffset}" ]; kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
}; };
}; };
} }

8
modules/core/i18n.nix
View file

@ -1,6 +1,10 @@
{ config, pkgs, lib, ... }:
with lib;
{ {
config,
pkgs,
lib,
...
}:
with lib; {
config = { config = {
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";

27
modules/core/networking.nix
View file

@ -1,10 +1,12 @@
{ config, pkgs, lib, ... }:
with lib;
let cfg = config.pub-solar.core;
in
{ {
config,
pkgs,
lib,
...
}:
with lib; let
cfg = config.pub-solar.core;
in {
options.pub-solar.core = { options.pub-solar.core = {
enableCaddy = mkOption { enableCaddy = mkOption {
type = types.bool; type = types.bool;
@ -17,12 +19,12 @@ in
binaryCaches = mkOption { binaryCaches = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [];
description = "Binary caches to use."; description = "Binary caches to use.";
}; };
publicKeys = mkOption { publicKeys = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [];
description = "Public keys of binary caches."; description = "Public keys of binary caches.";
}; };
}; };
@ -44,10 +46,11 @@ in
# These entries get added to /etc/hosts # These entries get added to /etc/hosts
networking.hosts = { networking.hosts = {
"127.0.0.1" = [ ] "127.0.0.1" =
++ lib.optionals cfg.enableCaddy [ "caddy.local" ] []
++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ] ++ lib.optionals cfg.enableCaddy ["caddy.local"]
++ lib.optionals cfg.enableHelp [ "help.local" ]; ++ lib.optionals config.pub-solar.printing.enable ["cups.local"]
++ lib.optionals cfg.enableHelp ["help.local"];
}; };
# Caddy reverse proxy for local services like cups # Caddy reverse proxy for local services like cups

12
modules/core/nix.nix
View file

@ -1,6 +1,10 @@
{ config, pkgs, lib, inputs, ... }:
{ {
config,
pkgs,
lib,
inputs,
...
}: {
nix = { nix = {
# Use default version alias for nix package # Use default version alias for nix package
package = pkgs.nix; package = pkgs.nix;
@ -11,9 +15,9 @@
# Prevents impurities in builds # Prevents impurities in builds
useSandbox = true; useSandbox = true;
# give root and @wheel special privileges with nix # give root and @wheel special privileges with nix
trustedUsers = [ "root" "@wheel" ]; trustedUsers = ["root" "@wheel"];
# This is just a representation of the nix default # This is just a representation of the nix default
systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; systemFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
# Generally useful nix option defaults # Generally useful nix option defaults
extraOptions = '' extraOptions = ''
min-free = 536870912 min-free = 536870912

7
modules/core/services.nix
View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
# For rage encryption, all hosts need a ssh key pair # For rage encryption, all hosts need a ssh key pair
services.openssh = { services.openssh = {
enable = true; enable = true;

56
modules/crypto/default.nix
View file

@ -1,41 +1,45 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.crypto; cfg = config.pub-solar.crypto;
in in {
{
options.pub-solar.crypto = { options.pub-solar.crypto = {
enable = mkEnableOption "Life in private"; enable = mkEnableOption "Life in private";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.udev.packages = [ pkgs.yubikey-personalization ]; services.udev.packages = [pkgs.yubikey-personalization];
services.dbus.packages = [ pkgs.gcr ]; services.dbus.packages = [pkgs.gcr];
services.pcscd.enable = true; services.pcscd.enable = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs; pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
pinentryFlavor = "gnome3"; pinentryFlavor = "gnome3";
verbose = true; verbose = true;
};
programs.gpg = {
enable = true;
};
home.packages = [
gnome.seahorse
keepassxc
libsecret
qMasterPassword
restic
];
}; };
programs.gpg = {
enable = true;
};
home.packages = [
gnome.seahorse
keepassxc
libsecret
qMasterPassword
restic
];
};
}; };
} }

11
modules/crypto/polkit-gnome-authentication-agent.service.nix
View file

@ -1,16 +1,15 @@
pkgs: pkgs: {
{
Unit = { Unit = {
Description = "Legacy polkit authentication agent for GNOME"; Description = "Legacy polkit authentication agent for GNOME";
Documentation = [ "https://gitlab.freedesktop.org/polkit/polkit/" ]; Documentation = ["https://gitlab.freedesktop.org/polkit/polkit/"];
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" ]; After = ["sway-session.target"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

38
modules/devops/default.nix
View file

@ -1,26 +1,30 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.devops; cfg = config.pub-solar.devops;
in in {
{
options.pub-solar.devops = { options.pub-solar.devops = {
enable = mkEnableOption "Life automated"; enable = mkEnableOption "Life automated";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
drone-cli home.packages = [
nmap drone-cli
pgcli nmap
ansible pgcli
ansible-lint ansible
restic ansible-lint
shellcheck restic
terraform_0_15 shellcheck
]; terraform_0_15
}; ];
};
}; };
} }

20
modules/docker/default.nix
View file

@ -1,19 +1,23 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.docker; cfg = config.pub-solar.docker;
in in {
{
options.pub-solar.docker = { options.pub-solar.docker = {
enable = mkEnableOption "Life in metal boxes"; enable = mkEnableOption "Life in metal boxes";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
users.users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] { users.users = with pkgs;
extraGroups = [ "docker" ]; pkgs.lib.setAttrByPath [psCfg.user.name] {
}; extraGroups = ["docker"];
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
docker-compose docker-compose

40
modules/email/default.nix
View file

@ -1,29 +1,33 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.email; cfg = config.pub-solar.email;
in in {
{
options.pub-solar.email = { options.pub-solar.email = {
enable = mkEnableOption "Life in headers"; enable = mkEnableOption "Life in headers";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
w3m home.packages = [
urlscan w3m
neomutt urlscan
offlineimap neomutt
msmtp offlineimap
mailto-mutt msmtp
]; mailto-mutt
];
programs.offlineimap = { programs.offlineimap = {
enable = true; enable = true;
pythonFile = builtins.readFile ./offlineimap.py; pythonFile = builtins.readFile ./offlineimap.py;
};
}; };
};
}; };
} }

1
modules/email/offlineimap.nix
View file

@ -1 +0,0 @@

32
modules/gaming/default.nix
View file

@ -1,10 +1,13 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.gaming; cfg = config.pub-solar.gaming;
in in {
{
options.pub-solar.gaming = { options.pub-solar.gaming = {
enable = mkEnableOption "Life in shooters"; enable = mkEnableOption "Life in shooters";
}; };
@ -12,16 +15,17 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.steam.enable = true; programs.steam.enable = true;
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override { }; steam = pkgs.steam.override {};
}; };
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
playonlinux home.packages = [
godot playonlinux
obs-studio godot
obs-studio-plugins.wlrobs obs-studio
]; obs-studio-plugins.wlrobs
}; ];
};
}; };
} }

1
modules/gaming/steam.nix
View file

@ -1 +0,0 @@

136
modules/graphical/alacritty.nix
View file

@ -71,24 +71,94 @@
}; };
key_bindings = [ key_bindings = [
{ key = "V"; mods = "Control|Alt"; action = "Paste"; } {
{ key = "C"; mods = "Control|Alt"; action = "Copy"; } key = "V";
{ key = "Paste"; action = "Paste"; } mods = "Control|Alt";
{ key = "Copy"; action = "Copy"; } action = "Paste";
{ key = "Q"; mods = "Command"; action = "Quit"; } }
{ key = "W"; mods = "Command"; action = "Quit"; } {
{ key = "Insert"; mods = "Shift"; action = "PasteSelection"; } key = "C";
{ key = "Key0"; mods = "Control"; action = "ResetFontSize"; } mods = "Control|Alt";
{ key = "Equals"; mods = "Control"; action = "IncreaseFontSize"; } action = "Copy";
{ key = "PageUp"; mods = "Shift"; action = "ScrollPageUp"; } }
{ key = "PageDown"; mods = "Shift"; action = "ScrollPageDown"; } {
{ key = "Minus"; mods = "Control"; action = "DecreaseFontSize"; } key = "Paste";
{ key = "H"; mode = "Vi|~Search"; action = "ScrollToBottom"; } action = "Paste";
{ key = "H"; mode = "Vi|~Search"; action = "ToggleViMode"; } }
{ key = "I"; mode = "Vi|~Search"; action = "Up"; } {
{ key = "K"; mode = "Vi|~Search"; action = "Down"; } key = "Copy";
{ key = "J"; mode = "Vi|~Search"; action = "Left"; } action = "Copy";
{ key = "L"; mode = "Vi|~Search"; action = "Right"; } }
{
key = "Q";
mods = "Command";
action = "Quit";
}
{
key = "W";
mods = "Command";
action = "Quit";
}
{
key = "Insert";
mods = "Shift";
action = "PasteSelection";
}
{
key = "Key0";
mods = "Control";
action = "ResetFontSize";
}
{
key = "Equals";
mods = "Control";
action = "IncreaseFontSize";
}
{
key = "PageUp";
mods = "Shift";
action = "ScrollPageUp";
}
{
key = "PageDown";
mods = "Shift";
action = "ScrollPageDown";
}
{
key = "Minus";
mods = "Control";
action = "DecreaseFontSize";
}
{
key = "H";
mode = "Vi|~Search";
action = "ScrollToBottom";
}
{
key = "H";
mode = "Vi|~Search";
action = "ToggleViMode";
}
{
key = "I";
mode = "Vi|~Search";
action = "Up";
}
{
key = "K";
mode = "Vi|~Search";
action = "Down";
}
{
key = "J";
mode = "Vi|~Search";
action = "Left";
}
{
key = "L";
mode = "Vi|~Search";
action = "Right";
}
]; ];
# Base16 Burn 256 - alacritty color config # Base16 Burn 256 - alacritty color config
@ -164,12 +234,30 @@
}; };
indexed_colors = [ indexed_colors = [
{ index = 16; color = "0xdf5923"; } {
{ index = 17; color = "0xd70000"; } index = 16;
{ index = 18; color = "0x2d2a2e"; } color = "0xdf5923";
{ index = 19; color = "0x303030"; } }
{ index = 20; color = "0xd3d1d4"; } {
{ index = 21; color = "0x303030"; } index = 17;
color = "0xd70000";
}
{
index = 18;
color = "0x2d2a2e";
}
{
index = 19;
color = "0x303030";
}
{
index = 20;
color = "0xd3d1d4";
}
{
index = 21;
color = "0x303030";
}
]; ];
}; };
} }

141
modules/graphical/default.nix
View file

@ -1,31 +1,34 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.graphical; cfg = config.pub-solar.graphical;
yamlFormat = pkgs.formats.yaml { }; yamlFormat = pkgs.formats.yaml {};
recursiveMerge = attrList: recursiveMerge = attrList: let
let f = attrPath:
f = attrPath: zipAttrsWith (
zipAttrsWith (n: values: n: values:
if tail values == [ ] if tail values == []
then head values then head values
else if all isList values else if all isList values
then unique (concatLists values) then unique (concatLists values)
else if all isAttrs values else if all isAttrs values
then f (attrPath ++ [ n ]) values then f (attrPath ++ [n]) values
else last values else last values
); );
in in
f [ ] attrList; f [] attrList;
in in {
{
options.pub-solar.graphical = { options.pub-solar.graphical = {
enable = mkEnableOption "Life in color"; enable = mkEnableOption "Life in color";
alacritty = { alacritty = {
settings = mkOption { settings = mkOption {
type = yamlFormat.type; type = yamlFormat.type;
default = { }; default = {};
}; };
}; };
autologin.enable = mkOption { autologin.enable = mkOption {
@ -71,7 +74,7 @@ in
# Required for running Gnome apps outside the Gnome DE, see https://nixos.wiki/wiki/GNOME#Running_GNOME_programs_outside_of_GNOME # Required for running Gnome apps outside the Gnome DE, see https://nixos.wiki/wiki/GNOME#Running_GNOME_programs_outside_of_GNOME
programs.dconf.enable = true; programs.dconf.enable = true;
services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; services.udev.packages = with pkgs; [gnome3.gnome-settings-daemon];
# Enable Sushi, a quick previewer for nautilus # Enable Sushi, a quick previewer for nautilus
services.gnome.sushi.enable = true; services.gnome.sushi.enable = true;
# Enable GVfs, a userspace virtual filesystem # Enable GVfs, a userspace virtual filesystem
@ -92,65 +95,65 @@ in
source-sans-pro source-sans-pro
]; ];
home-manager = with pkgs; setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ setAttrByPath ["users" psCfg.user.name] {
alacritty home.packages = [
foot alacritty
chromium foot
firefox-wayland chromium
firefox-wayland
flameshot flameshot
libnotify libnotify
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
gnome.eog gnome.eog
gnome.nautilus gnome.nautilus
gnome.yelp gnome.yelp
hicolor-icon-theme hicolor-icon-theme
wine wine
toggle-kbd-layout toggle-kbd-layout
wcwd wcwd
vlc vlc
gimp gimp
]; ];
xdg.configFile."alacritty/alacritty.yml" = { xdg.configFile."alacritty/alacritty.yml" = {
source = yamlFormat.generate "alacritty.yml" (recursiveMerge [ (import ./alacritty.nix) cfg.alacritty.settings ]); source = yamlFormat.generate "alacritty.yml" (recursiveMerge [(import ./alacritty.nix) cfg.alacritty.settings]);
};
gtk = {
enable = true;
font.name = "Lato";
iconTheme = {
package = pkgs.papirus-icon-theme;
name = "Papirus-Adapta-Nokto-Maia";
};
theme = {
package = pkgs.matcha-gtk-theme;
name = "Matcha-dark-aliz";
};
gtk3.extraConfig = {
gtk-xft-antialias = "1";
gtk-xft-hinting = "1";
gtk-xft-hintstyle = "hintfull";
gtk-xft-rgba = "rgb";
gtk-application-prefer-dark-theme = "true";
};
};
# Fix KeepassXC rendering issue
# https://github.com/void-linux/void-packages/issues/23517
systemd.user.sessionVariables.QT_AUTO_SCREEN_SCALE_FACTOR = "0";
xresources.extraConfig = builtins.readFile ./.Xdefaults;
systemd.user.services.network-manager-applet = import ./network-manager-applet.service.nix pkgs;
}; };
gtk = {
enable = true;
font.name = "Lato";
iconTheme = {
package = pkgs.papirus-icon-theme;
name = "Papirus-Adapta-Nokto-Maia";
};
theme = {
package = pkgs.matcha-gtk-theme;
name = "Matcha-dark-aliz";
};
gtk3.extraConfig = {
gtk-xft-antialias = "1";
gtk-xft-hinting = "1";
gtk-xft-hintstyle = "hintfull";
gtk-xft-rgba = "rgb";
gtk-application-prefer-dark-theme = "true";
};
};
# Fix KeepassXC rendering issue
# https://github.com/void-linux/void-packages/issues/23517
systemd.user.sessionVariables.QT_AUTO_SCREEN_SCALE_FACTOR = "0";
xresources.extraConfig = builtins.readFile ./.Xdefaults;
systemd.user.services.network-manager-applet = import ./network-manager-applet.service.nix pkgs;
};
}; };
} }

11
modules/graphical/network-manager-applet.service.nix
View file

@ -1,16 +1,15 @@
pkgs: pkgs: {
{
Unit = { Unit = {
Description = "Lightweight Wayland notification daemon"; Description = "Lightweight Wayland notification daemon";
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" ]; After = ["sway-session.target"];
# ConditionEnvironment requires systemd v247 to work correctly # ConditionEnvironment requires systemd v247 to work correctly
ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; ConditionEnvironment = ["WAYLAND_DISPLAY"];
}; };
Service = { Service = {
ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --sm-disable --indicator"; ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --sm-disable --indicator";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

2
modules/hm-system-defaults.nix
View file

@ -1,4 +1,4 @@
{ config, ... }: { {config, ...}: {
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
home.sessionVariables = { home.sessionVariables = {

20
modules/nextcloud/default.nix
View file

@ -1,17 +1,21 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.nextcloud; cfg = config.pub-solar.nextcloud;
in in {
{
options.pub-solar.nextcloud = { options.pub-solar.nextcloud = {
enable = mkEnableOption "Life in sync"; enable = mkEnableOption "Life in sync";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs; pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
}; systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
};
}; };
} }

13
modules/nextcloud/nextcloud.service.nix
View file

@ -1,12 +1,11 @@
pkgs: pkgs: {
{
Unit = { Unit = {
Description = "Nextcloud Client"; Description = "Nextcloud Client";
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
Wants = [ "graphical-session-pre.target" ]; Wants = ["graphical-session-pre.target"];
After = [ "graphical-session-pre.target" ]; After = ["graphical-session-pre.target"];
# ConditionEnvironment requires systemd v247 to work correctly # ConditionEnvironment requires systemd v247 to work correctly
ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; ConditionEnvironment = ["WAYLAND_DISPLAY"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
@ -16,6 +15,6 @@ pkgs:
Restart = "on-failure"; Restart = "on-failure";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

6
modules/nix-path.nix
View file

@ -1,4 +1,8 @@
{ channel, inputs, ... }: { {
channel,
inputs,
...
}: {
nix.nixPath = [ nix.nixPath = [
"nixpkgs=${channel.input}" "nixpkgs=${channel.input}"
"nixos-config=${../lib/compat/nixos}" "nixos-config=${../lib/compat/nixos}"

34
modules/office/default.nix
View file

@ -1,10 +1,13 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.office; cfg = config.pub-solar.office;
in in {
{
options.pub-solar.office = { options.pub-solar.office = {
enable = mkEnableOption "Install office programs, also enables printing server"; enable = mkEnableOption "Install office programs, also enables printing server";
}; };
@ -14,15 +17,16 @@ in
# Gnome PDF viewer # Gnome PDF viewer
programs.evince.enable = true; programs.evince.enable = true;
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
libreoffice-fresh home.packages = [
gnome.simple-scan libreoffice-fresh
# Tools like pdfunite gnome.simple-scan
poppler_utils # Tools like pdfunite
# tool for annotating PDFs poppler_utils
xournalpp # tool for annotating PDFs
]; xournalpp
}; ];
};
}; };
} }

15
modules/paranoia/default.nix
View file

@ -1,11 +1,12 @@
{ config, lib, ... }: {
config,
with lib; lib,
let ...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.paranoia; cfg = config.pub-solar.paranoia;
in in {
{
options.pub-solar.paranoia = { options.pub-solar.paranoia = {
enable = mkOption { enable = mkOption {
description = '' description = ''
@ -34,7 +35,7 @@ in
# Remove the complete default environment of packages like # Remove the complete default environment of packages like
# nano, perl and rsync # nano, perl and rsync
environment.defaultPackages = lib.mkForce [ ]; environment.defaultPackages = lib.mkForce [];
# fileSystems."/".options = [ "noexec" ]; # fileSystems."/".options = [ "noexec" ];

17
modules/printing/default.nix
View file

@ -1,10 +1,13 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.printing; cfg = config.pub-solar.printing;
in in {
{
options.pub-solar.printing = { options.pub-solar.printing = {
enable = mkEnableOption "CUPSSSss"; enable = mkEnableOption "CUPSSSss";
}; };
@ -16,8 +19,8 @@ in
services.avahi.publish.userServices = true; services.avahi.publish.userServices = true;
services.printing.enable = true; services.printing.enable = true;
services.printing.browsing = true; services.printing.browsing = true;
services.printing.listenAddresses = [ "localhost:631" ]; services.printing.listenAddresses = ["localhost:631"];
services.printing.allowFrom = [ "all" ]; services.printing.allowFrom = ["all"];
services.printing.defaultShared = false; services.printing.defaultShared = false;
services.printing.drivers = [ services.printing.drivers = [
pkgs.gutenprint pkgs.gutenprint

30
modules/social/default.nix
View file

@ -1,22 +1,26 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.social; cfg = config.pub-solar.social;
in in {
{
options.pub-solar.social = { options.pub-solar.social = {
enable = mkEnableOption "Life with others"; enable = mkEnableOption "Life with others";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
signal-desktop home.packages = [
tdesktop signal-desktop
element-desktop tdesktop
irssi element-desktop
]; irssi
}; ];
};
}; };
} }

52
modules/sway/config/config.d/mode_system.conf.nix
View file

@ -1,23 +1,45 @@
{ pkgs, psCfg, ... }: '' {
pkgs,
psCfg,
...
}:
''
# Set shut down, restart and locking features # Set shut down, restart and locking features
'' + (if psCfg.core.hibernation.enable && !psCfg.paranoia.enable then '' ''
set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown + (
'' else if psCfg.paranoia.enable then '' if psCfg.core.hibernation.enable && !psCfg.paranoia.enable
set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown then ''
'' else '' set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown ''
'') else if psCfg.paranoia.enable
then ''
set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown
''
else ''
set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
''
)
+ '' + ''
bindsym $mod+0 mode "$mode_system" bindsym $mod+0 mode "$mode_system"
mode "$mode_system" { mode "$mode_system" {
bindsym e exec swaymsg exit, mode "default" bindsym e exec swaymsg exit, mode "default"
'' + (if psCfg.core.hibernation.enable then '' ''
bindsym h exec systemctl hibernate, mode "default" + (
'' else "") if psCfg.core.hibernation.enable
+ (if !psCfg.paranoia.enable then '' then ''
bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default" bindsym h exec systemctl hibernate, mode "default"
bindsym s exec systemctl suspend, mode "default" ''
'' else "") + '' else ""
)
+ (
if !psCfg.paranoia.enable
then ''
bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"
bindsym s exec systemctl suspend, mode "default"
''
else ""
)
+ ''
bindsym r exec systemctl reboot, mode "default" bindsym r exec systemctl reboot, mode "default"
bindsym Shift+s exec systemctl poweroff, mode "default" bindsym Shift+s exec systemctl poweroff, mode "default"

7
modules/sway/config/config.nix
View file

@ -1,5 +1,8 @@
{ config, pkgs, ... }: {
'' config,
pkgs,
...
}: ''
# Default config for sway # Default config for sway
# #
# Copy this to ~/.config/sway/config and edit it to your liking. # Copy this to ~/.config/sway/config and edit it to your liking.

108
modules/sway/default.nix
View file

@ -1,9 +1,12 @@
{ lib, config, pkgs, ... }:
with lib;
let
psCfg = config.pub-solar;
in
{ {
lib,
config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar;
in {
options.pub-solar.sway = { options.pub-solar.sway = {
enable = mkEnableOption "Life in boxes"; enable = mkEnableOption "Life in boxes";
@ -22,14 +25,14 @@ in
config = mkIf psCfg.sway.enable (mkMerge [ config = mkIf psCfg.sway.enable (mkMerge [
(mkIf (psCfg.sway.v4l2loopback.enable) { (mkIf (psCfg.sway.v4l2loopback.enable) {
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
boot.kernelModules = [ "v4l2loopback" ]; boot.kernelModules = ["v4l2loopback"];
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options v4l2loopback exclusive_caps=1 devices=3 options v4l2loopback exclusive_caps=1 devices=3
''; '';
}) })
({ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
linuxPackages.v4l2loopback linuxPackages.v4l2loopback
]; ];
@ -48,60 +51,61 @@ in
}; };
}; };
}; };
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; extraPortals = with pkgs; [xdg-desktop-portal-gtk];
gtkUsePortal = true; gtkUsePortal = true;
}; };
services.pipewire.enable = true; services.pipewire.enable = true;
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = with pkgs; [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
sway home.packages = with pkgs; [
grim sway
kanshi grim
mako kanshi
slurp mako
swayidle slurp
swaylock swayidle
swaybg swaylock
xwayland swaybg
xwayland
libappindicator-gtk3 libappindicator-gtk3
wl-clipboard wl-clipboard
wf-recorder wf-recorder
brightnessctl brightnessctl
gammastep gammastep
geoclue2 geoclue2
xsettingsd xsettingsd
ydotool ydotool
sway-launcher sway-launcher
record-screen record-screen
import-gtk-settings import-gtk-settings
s s
wcwd wcwd
]; ];
programs.waybar.enable = true; programs.waybar.enable = true;
#programs.waybar.systemd.enable = true; #programs.waybar.systemd.enable = true;
systemd.user.services.mako = import ./mako.service.nix { inherit pkgs psCfg; }; systemd.user.services.mako = import ./mako.service.nix {inherit pkgs psCfg;};
systemd.user.services.sway = import ./sway.service.nix { inherit pkgs psCfg; }; systemd.user.services.sway = import ./sway.service.nix {inherit pkgs psCfg;};
systemd.user.services.swayidle = import ./swayidle.service.nix { inherit pkgs psCfg; }; systemd.user.services.swayidle = import ./swayidle.service.nix {inherit pkgs psCfg;};
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix { inherit pkgs psCfg; }; systemd.user.services.xsettingsd = import ./xsettingsd.service.nix {inherit pkgs psCfg;};
systemd.user.services.waybar = import ./waybar.service.nix { inherit pkgs psCfg; }; systemd.user.services.waybar = import ./waybar.service.nix {inherit pkgs psCfg;};
systemd.user.targets.sway-session = import ./sway-session.target.nix { inherit pkgs psCfg; }; systemd.user.targets.sway-session = import ./sway-session.target.nix {inherit pkgs psCfg;};
xdg.configFile."sway/config".text = import ./config/config.nix { inherit config pkgs; }; xdg.configFile."sway/config".text = import ./config/config.nix {inherit config pkgs;};
xdg.configFile."sway/config.d/colorscheme.conf".source = ./config/config.d/colorscheme.conf; xdg.configFile."sway/config.d/colorscheme.conf".source = ./config/config.d/colorscheme.conf;
xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf; xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf;
xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf; xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf;
xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf; xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf;
xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix { inherit pkgs psCfg; }; xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix {inherit pkgs psCfg;};
xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf; xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf;
xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf; xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
}; };
}) }
]); ]);
} }

13
modules/sway/gammastep.service.nix
View file

@ -1,18 +1,17 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "set color temperature of display according to time of day"; Description = "set color temperature of display according to time of day";
Documentation = [ "man:gammastep(1)" ]; Documentation = ["man:gammastep(1)"];
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" ]; After = ["sway-session.target"];
# ConditionEnvironment requires systemd v247 to work correctly # ConditionEnvironment requires systemd v247 to work correctly
ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; ConditionEnvironment = ["WAYLAND_DISPLAY"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
ExecStart = "${pkgs.gammastep}/bin/gammastep -l geoclue2 -m wayland -v"; ExecStart = "${pkgs.gammastep}/bin/gammastep -l geoclue2 -m wayland -v";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

11
modules/sway/libinput-gestures.service.nix
View file

@ -1,10 +1,9 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "Actions gestures on your touchpad using libinput"; Description = "Actions gestures on your touchpad using libinput";
Documentation = [ "https://github.com/bulletmark/libinput-gestures" ]; Documentation = ["https://github.com/bulletmark/libinput-gestures"];
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" ]; After = ["sway-session.target"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
@ -14,6 +13,6 @@
TimeoutStopSec = "10"; TimeoutStopSec = "10";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

13
modules/sway/mako.service.nix
View file

@ -1,11 +1,10 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "Lightweight Wayland notification daemon"; Description = "Lightweight Wayland notification daemon";
Documentation = [ "man:mako(1)" ]; Documentation = ["man:mako(1)"];
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" ]; After = ["sway-session.target"];
ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; ConditionEnvironment = ["WAYLAND_DISPLAY"];
}; };
Service = { Service = {
Type = "dbus"; Type = "dbus";
@ -14,6 +13,6 @@
ExecReload = "${pkgs.mako}/bin/makoctl reload"; ExecReload = "${pkgs.mako}/bin/makoctl reload";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

11
modules/sway/sway-session.target.nix
View file

@ -1,10 +1,9 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "sway compositor session"; Description = "sway compositor session";
Documentation = [ "man:systemd.special(7)" ]; Documentation = ["man:systemd.special(7)"];
BindsTo = [ "graphical-session.target" ]; BindsTo = ["graphical-session.target"];
Wants = [ "graphical-session-pre.target" ]; Wants = ["graphical-session-pre.target"];
After = [ "graphical-session-pre.target" ]; After = ["graphical-session-pre.target"];
}; };
} }

11
modules/sway/sway.service.nix
View file

@ -1,11 +1,10 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "sway - SirCmpwn's Wayland window manager"; Description = "sway - SirCmpwn's Wayland window manager";
Documentation = [ "man:sway(5)" ]; Documentation = ["man:sway(5)"];
BindsTo = [ "graphical-session.target" ]; BindsTo = ["graphical-session.target"];
Wants = [ "graphical-session-pre.target" ]; Wants = ["graphical-session-pre.target"];
After = [ "graphical-session-pre.target" ]; After = ["graphical-session-pre.target"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";

39
modules/sway/swayidle.service.nix
View file

@ -1,26 +1,35 @@
{ pkgs, psCfg, ... }:
{ {
pkgs,
psCfg,
...
}: {
Unit = { Unit = {
Description = "Idle manager for Wayland"; Description = "Idle manager for Wayland";
Documentation = [ "man:swayidle(1)" ]; Documentation = ["man:swayidle(1)"];
BindsTo = [ "graphical-session.target" ]; BindsTo = ["graphical-session.target"];
Wants = [ "graphical-session-pre.target" ]; Wants = ["graphical-session-pre.target"];
After = [ "graphical-session-pre.target" ]; After = ["graphical-session-pre.target"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin:${pkgs.swaylock-bg}/bin:${pkgs.swayidle}/bin"; Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin:${pkgs.swaylock-bg}/bin:${pkgs.swayidle}/bin";
ExecStart = ''swayidle -w \ ExecStart =
after-resume 'swaymsg "output * dpms on"' \ '' swayidle -w \
before-sleep 'swaylock-bg' '' + (if psCfg.paranoia.enable then '' \ after-resume 'swaymsg "output * dpms on"' \
timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ before-sleep 'swaylock-bg' ''
timeout 150 'systemctl hibernate' + (
'' else '' \ if psCfg.paranoia.enable
timeout 600 'swaylock-bg' \ then '' \
timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
''); timeout 150 'systemctl hibernate'
''
else '' \
timeout 600 'swaylock-bg' \
timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
''
);
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

13
modules/sway/waybar.service.nix
View file

@ -1,12 +1,11 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors."; Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
Documentation = "https://github.com/Alexays/Waybar/wiki/"; Documentation = "https://github.com/Alexays/Waybar/wiki/";
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" "network-online.target" ]; After = ["sway-session.target" "network-online.target"];
Wants = [ "graphical-session-pre.target" "network-online.target" "blueman-applet.service" ]; Wants = ["graphical-session-pre.target" "network-online.target" "blueman-applet.service"];
ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; ConditionEnvironment = ["WAYLAND_DISPLAY"];
}; };
Service = { Service = {
@ -17,6 +16,6 @@
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

13
modules/sway/xsettingsd.service.nix
View file

@ -1,12 +1,11 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "X Settings Daemon"; Description = "X Settings Daemon";
Documentation = [ "https://github.com/derat/xsettingsd/wiki/Installation" ]; Documentation = ["https://github.com/derat/xsettingsd/wiki/Installation"];
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" ]; After = ["sway-session.target"];
# ConditionEnvironment requires systemd v247 to work correctly # ConditionEnvironment requires systemd v247 to work correctly
ConditionEnvironment = [ "WAYLAND_DISPLAY" ]; ConditionEnvironment = ["WAYLAND_DISPLAY"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
@ -14,6 +13,6 @@
ExecStop = "/run/current-system/sw/bin/env pkill xsettingsd"; ExecStop = "/run/current-system/sw/bin/env pkill xsettingsd";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

11
modules/sway/ydotool.service.nix
View file

@ -1,10 +1,9 @@
{ pkgs, ... }: {pkgs, ...}: {
{
Unit = { Unit = {
Description = "ydotool - Generic command-line automation tool (no X!)"; Description = "ydotool - Generic command-line automation tool (no X!)";
Documentation = [ "https://github.com/ReimuNotMoe/ydotool" ]; Documentation = ["https://github.com/ReimuNotMoe/ydotool"];
BindsTo = [ "sway-session.target" ]; BindsTo = ["sway-session.target"];
After = [ "sway-session.target" ]; After = ["sway-session.target"];
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
@ -14,6 +13,6 @@
TimeoutStopSec = "10"; TimeoutStopSec = "10";
}; };
Install = { Install = {
WantedBy = [ "sway-session.target" ]; WantedBy = ["sway-session.target"];
}; };
} }

65
modules/terminal-life/default.nix
View file

@ -1,10 +1,14 @@
{ lib, config, pkgs, self, ... }: {
with lib; lib,
let config,
pkgs,
self,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.terminal-life; cfg = config.pub-solar.terminal-life;
in in {
{
options.pub-solar.terminal-life = { options.pub-solar.terminal-life = {
enable = mkEnableOption "Life in black and white"; enable = mkEnableOption "Life in black and white";
@ -21,7 +25,7 @@ in
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
# Needed to get zsh completion for system packages (e.g. systemd). # Needed to get zsh completion for system packages (e.g. systemd).
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = ["/share/zsh"];
environment.shells = with pkgs; [ environment.shells = with pkgs; [
zsh zsh
@ -31,25 +35,36 @@ in
screen screen
]; ];
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
home.packages = [ pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
ack home.packages = [
asciinema ack
bat asciinema
exa bat
fd exa
gh fd
glow gh
nnn glow
powerline nnn
silver-searcher powerline
vifm silver-searcher
watson vifm
]; watson
];
programs.neovim = import ./nvim { inherit config; inherit pkgs; }; programs.neovim = import ./nvim {
programs.fzf = import ./fzf { inherit config; inherit pkgs; }; inherit config;
programs.zsh = import ./zsh { inherit config; inherit pkgs; inherit self; }; inherit pkgs;
}; };
programs.fzf = import ./fzf {
inherit config;
inherit pkgs;
};
programs.zsh = import ./zsh {
inherit config;
inherit pkgs;
inherit self;
};
};
}; };
} }

5
modules/terminal-life/fzf/default.nix
View file

@ -1,5 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
enable = true; enable = true;
defaultCommand = "fd --hidden --type f --exclude .git"; defaultCommand = "fd --hidden --type f --exclude .git";
defaultOptions = [ defaultOptions = [

53
modules/terminal-life/nvim/default.nix
View file

@ -1,12 +1,14 @@
{ config, pkgs, ... }: {
let config,
pkgs,
...
}: let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.terminal-life; cfg = config.pub-solar.terminal-life;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs); preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
in in {
{
enable = true; enable = true;
viAlias = true; viAlias = true;
@ -17,27 +19,28 @@ in
withRuby = true; withRuby = true;
withPython3 = true; withPython3 = true;
extraPackages = with pkgs; lib.mkIf (!cfg.lite) [ extraPackages = with pkgs;
ccls lib.mkIf (!cfg.lite) [
gopls ccls
nodejs gopls
nodePackages.bash-language-server nodejs
nodePackages.dockerfile-language-server-nodejs nodePackages.bash-language-server
nodePackages.svelte-language-server nodePackages.dockerfile-language-server-nodejs
nodePackages.typescript nodePackages.svelte-language-server
nodePackages.typescript-language-server nodePackages.typescript
nodePackages.vim-language-server nodePackages.typescript-language-server
nodePackages.vue-language-server nodePackages.vim-language-server
nodePackages.vscode-langservers-extracted nodePackages.vue-language-server
nodePackages.yaml-language-server nodePackages.vscode-langservers-extracted
python39Packages.python-lsp-server nodePackages.yaml-language-server
python3Full python39Packages.python-lsp-server
solargraph python3Full
rnix-lsp solargraph
rust-analyzer rnix-lsp
terraform-ls rust-analyzer
universal-ctags terraform-ls
]; universal-ctags
];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
nvim-cmp nvim-cmp

59
modules/terminal-life/nvim/preview-file.nix
View file

@ -1,35 +1,36 @@
self: with self; '' self:
IFS=':' read -r -a INPUT <<< "$1" with self; ''
FILE=''${INPUT[0]} IFS=':' read -r -a INPUT <<< "$1"
CENTER=''${INPUT[1]} FILE=''${INPUT[0]}
CENTER=''${INPUT[1]}
if [[ "$1" =~ ^[A-Za-z]:\\ ]]; then if [[ "$1" =~ ^[A-Za-z]:\\ ]]; then
FILE=$FILE:''${INPUT[1]} FILE=$FILE:''${INPUT[1]}
CENTER=''${INPUT[2]} CENTER=''${INPUT[2]}
fi fi
if [[ -n "$CENTER" && ! "$CENTER" =~ ^[0-9] ]]; then if [[ -n "$CENTER" && ! "$CENTER" =~ ^[0-9] ]]; then
exit 1 exit 1
fi fi
CENTER=''${CENTER/[^0-9]*/} CENTER=''${CENTER/[^0-9]*/}
FILE="''${FILE/#\~\//$HOME/}" FILE="''${FILE/#\~\//$HOME/}"
if [ ! -r "$FILE" ]; then if [ ! -r "$FILE" ]; then
echo "File not found ''${FILE}" echo "File not found ''${FILE}"
exit 1 exit 1
fi fi
if [ -z "$CENTER" ]; then if [ -z "$CENTER" ]; then
CENTER=0 CENTER=0
fi fi
exec cat "$FILE" \ exec cat "$FILE" \
| sed -e '/[#|\/\/ ?]-- copyright/,/[#\/\/]++/c\\' \ | sed -e '/[#|\/\/ ?]-- copyright/,/[#\/\/]++/c\\' \
| ${pkgs.coreutils}/bin/tr -s '\n' \ | ${pkgs.coreutils}/bin/tr -s '\n' \
| ${pkgs.bat}/bin/bat \ | ${pkgs.bat}/bin/bat \
--style="''${BAT_STYLE:-numbers}" \ --style="''${BAT_STYLE:-numbers}" \
--color=always \ --color=always \
--pager=never \ --pager=never \
--file-name=''$FILE \ --file-name=''$FILE \
--highlight-line=$CENTER --highlight-line=$CENTER
'' ''

103
modules/terminal-life/zsh/default.nix
View file

@ -1,9 +1,12 @@
{ config, pkgs, self, ... }: {
let config,
pkgs,
self,
...
}: let
psCfg = config.pub-solar; psCfg = config.pub-solar;
xdg = config.home-manager.users."${psCfg.user.name}".xdg; xdg = config.home-manager.users."${psCfg.user.name}".xdg;
in in {
{
enable = true; enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
enableCompletion = true; enableCompletion = true;
@ -64,57 +67,57 @@ in
} }
]; ];
initExtra = '' initExtra =
bindkey -v ''
bindkey -v 'jj' vi-cmd-mode bindkey -v
bindkey -a 'i' up-line bindkey -v 'jj' vi-cmd-mode
bindkey -a 'k' down-line bindkey -a 'i' up-line
bindkey -a 'j' backward-char bindkey -a 'k' down-line
bindkey -a 'h' vi-insert bindkey -a 'j' backward-char
bindkey '^[[H' beginning-of-line bindkey -a 'h' vi-insert
bindkey '^[[F' end-of-line bindkey '^[[H' beginning-of-line
bindkey '^R' history-incremental-pattern-search-backward bindkey '^[[F' end-of-line
bindkey '^ ' autosuggest-accept bindkey '^R' history-incremental-pattern-search-backward
bindkey '^q' push-line-or-edit bindkey '^ ' autosuggest-accept
bindkey '^q' push-line-or-edit
bindkey '^R' fzf-history-widget bindkey '^R' fzf-history-widget
# ArrowUp/Down start searching history with current input # ArrowUp/Down start searching history with current input
autoload -U up-line-or-beginning-search autoload -U up-line-or-beginning-search
autoload -U down-line-or-beginning-search autoload -U down-line-or-beginning-search
zle -N up-line-or-beginning-search zle -N up-line-or-beginning-search
zle -N down-line-or-beginning-search zle -N down-line-or-beginning-search
bindkey "^[[A" up-line-or-beginning-search bindkey "^[[A" up-line-or-beginning-search
bindkey "^[[B" down-line-or-beginning-search bindkey "^[[B" down-line-or-beginning-search
bindkey "^P" up-line-or-beginning-search bindkey "^P" up-line-or-beginning-search
bindkey "^N" down-line-or-beginning-search bindkey "^N" down-line-or-beginning-search
# MAKE CTRL+S WORK IN VIM # MAKE CTRL+S WORK IN VIM
stty -ixon stty -ixon
stty erase '^?' stty erase '^?'
precmd () { precmd () {
DIR_NAME=$(pwd | sed "s|^$HOME|~|g") DIR_NAME=$(pwd | sed "s|^$HOME|~|g")
echo -e -n "\e]2;$DIR_NAME\e\\" echo -e -n "\e]2;$DIR_NAME\e\\"
if [ $(date +%d%m) = '0104' ]; then if [ $(date +%d%m) = '0104' ]; then
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Success! That was a great command! I can't wait to see what amazing stuff you'll be up to next." echo "Success! That was a great command! I can't wait to see what amazing stuff you'll be up to next."
fi
fi fi
fi }
}
# If a command is not found, show me where it is # If a command is not found, show me where it is
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
'' ''
+ builtins.readFile ./base16.zsh + builtins.readFile ./base16.zsh
+ builtins.readFile ./p10k.zsh + builtins.readFile ./p10k.zsh
+ + ''
'' source ${pkgs.fzf}/share/fzf/key-bindings.zsh
source ${pkgs.fzf}/share/fzf/key-bindings.zsh source ${pkgs.fzf}/share/fzf/completion.zsh
source ${pkgs.fzf}/share/fzf/completion.zsh source ${pkgs.git-bug}/share/zsh/site-functions/git-bug
source ${pkgs.git-bug}/share/zsh/site-functions/git-bug eval "$(direnv hook zsh)"
eval "$(direnv hook zsh)" ''
'' + builtins.readFile ./fzf.zsh;
+ builtins.readFile ./fzf.zsh;
} }

13
modules/uhk/default.nix
View file

@ -1,10 +1,13 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.uhk; cfg = config.pub-solar.uhk;
in in {
{
options.pub-solar.uhk = { options.pub-solar.uhk = {
enable = mkEnableOption "Ultimate Hacking Keyboard"; enable = mkEnableOption "Ultimate Hacking Keyboard";
}; };

15
modules/user/default.nix
View file

@ -1,9 +1,12 @@
{ lib, config, pkgs, ... }:
with lib;
let
cfg = config.pub-solar;
in
{ {
lib,
config,
pkgs,
...
}:
with lib; let
cfg = config.pub-solar;
in {
options.pub-solar = { options.pub-solar = {
user = { user = {
name = mkOption { name = mkOption {
@ -24,7 +27,7 @@ in
publicKeys = mkOption { publicKeys = mkOption {
description = "User SSH public keys"; description = "User SSH public keys";
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [];
}; };
fullName = mkOption { fullName = mkOption {
description = "User full name"; description = "User full name";

38
modules/virtualisation/default.nix
View file

@ -1,12 +1,18 @@
{ lib, config, pkgs, ... }: {
with lib; lib,
let config,
pkgs,
...
}:
with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
cfg = config.pub-solar.virtualisation; cfg = config.pub-solar.virtualisation;
doesGaming = config.pub-solar.gaming.enable; doesGaming = config.pub-solar.gaming.enable;
extraObsPlugins = if doesGaming then [ pkgs.obs-studio-plugins.looking-glass-obs ] else [ ]; extraObsPlugins =
in if doesGaming
{ then [pkgs.obs-studio-plugins.looking-glass-obs]
else [];
in {
options.pub-solar.virtualisation = { options.pub-solar.virtualisation = {
enable = mkEnableOption "Life in libvirt"; enable = mkEnableOption "Life in libvirt";
}; };
@ -22,8 +28,8 @@ in
enable = true; enable = true;
qemu.ovmf.enable = true; qemu.ovmf.enable = true;
}; };
users.users = pkgs.lib.setAttrByPath [ psCfg.user.name ] { users.users = pkgs.lib.setAttrByPath [psCfg.user.name] {
extraGroups = [ "libvirtd" ]; extraGroups = ["libvirtd"];
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -42,18 +48,22 @@ in
lgcl lgcl
]; ];
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs;
xdg.dataFile."libvirt/.keep".text = "# this file is here to generate the directory"; pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
home.packages = extraObsPlugins; xdg.dataFile."libvirt/.keep".text = "# this file is here to generate the directory";
}; home.packages = extraObsPlugins;
};
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"f /dev/shm/looking-glass 0660 ${psCfg.user.name} kvm" "f /dev/shm/looking-glass 0660 ${psCfg.user.name} kvm"
]; ];
networking.bridges.virbr1.interfaces = [ ]; networking.bridges.virbr1.interfaces = [];
networking.interfaces.virbr1 = { networking.interfaces.virbr1 = {
ipv4.addresses = [ ipv4.addresses = [
{ address = "192.168.123.1"; prefixLength = 24; } {
address = "192.168.123.1";
prefixLength = 24;
}
]; ];
}; };
}; };

2
overlays/manix.nix
View file

@ -1,5 +1,5 @@
final: prev: { final: prev: {
manix = prev.manix.overrideAttrs (o: rec{ manix = prev.manix.overrideAttrs (o: rec {
inherit (prev.sources.manix) pname version src; inherit (prev.sources.manix) pname version src;
}); });
} }

40
overlays/neovim-plugins.nix
View file

@ -1,22 +1,24 @@
final: prev: { final: prev: {
vimPlugins = prev.vimPlugins // { vimPlugins =
instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { prev.vimPlugins
inherit (prev.sources.instant-nvim-nvfetcher) pname version src; // {
instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
};
vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vimagit-nvfetcher) pname version src;
};
vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src;
};
vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-workspace-nvfetcher) pname version src;
};
vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-beautify-nvfetcher) pname version src;
};
vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-apprentice-nvfetcher) pname version src;
};
}; };
vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vimagit-nvfetcher) pname version src;
};
vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src;
};
vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-workspace-nvfetcher) pname version src;
};
vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-beautify-nvfetcher) pname version src;
};
vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
inherit (prev.sources.vim-apprentice-nvfetcher) pname version src;
};
};
} }

1
overlays/overrides.nix
View file

@ -20,7 +20,6 @@ channels: final: prev: {
arduino-cli arduino-cli
; ;
haskellPackages = haskellPackages =
prev.haskellPackages.override prev.haskellPackages.override
(old: { (old: {

53
pkgs/_sources/generated.nix
View file

@ -1,136 +1,139 @@
# This file was generated by nvfetcher, please do not modify it manually. # This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub }:
{ {
fetchgit,
fetchurl,
fetchFromGitHub,
}: {
F-Sy-H = { F-Sy-H = {
pname = "F-Sy-H"; pname = "F-Sy-H";
version = "b935a87a75560f8173dd78deee6717c59d464e06"; version = "b935a87a75560f8173dd78deee6717c59d464e06";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "z-shell"; owner = "z-shell";
repo = "F-Sy-H"; repo = "F-Sy-H";
rev = "b935a87a75560f8173dd78deee6717c59d464e06"; rev = "b935a87a75560f8173dd78deee6717c59d464e06";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM="; sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM=";
}); };
}; };
instant-nvim-nvfetcher = { instant-nvim-nvfetcher = {
pname = "instant-nvim-nvfetcher"; pname = "instant-nvim-nvfetcher";
version = "294b6d08143b3db8f9db7f606829270149e1a786"; version = "294b6d08143b3db8f9db7f606829270149e1a786";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "jbyuki"; owner = "jbyuki";
repo = "instant.nvim"; repo = "instant.nvim";
rev = "294b6d08143b3db8f9db7f606829270149e1a786"; rev = "294b6d08143b3db8f9db7f606829270149e1a786";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4="; sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=";
}); };
}; };
manix = { manix = {
pname = "manix"; pname = "manix";
version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"; version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "mlvzk"; owner = "mlvzk";
repo = "manix"; repo = "manix";
rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4"; rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw="; sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
}); };
}; };
ohmyzsh = { ohmyzsh = {
pname = "ohmyzsh"; pname = "ohmyzsh";
version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "ohmyzsh"; owner = "ohmyzsh";
repo = "ohmyzsh"; repo = "ohmyzsh";
rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw="; sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw=";
}); };
}; };
powerlevel10k = { powerlevel10k = {
pname = "powerlevel10k"; pname = "powerlevel10k";
version = "8091c8a3a8a845c70046684235a01cd500075def"; version = "8091c8a3a8a845c70046684235a01cd500075def";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "romkatv"; owner = "romkatv";
repo = "powerlevel10k"; repo = "powerlevel10k";
rev = "8091c8a3a8a845c70046684235a01cd500075def"; rev = "8091c8a3a8a845c70046684235a01cd500075def";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo="; sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo=";
}); };
}; };
rnix-lsp-nvfetcher = { rnix-lsp-nvfetcher = {
pname = "rnix-lsp-nvfetcher"; pname = "rnix-lsp-nvfetcher";
version = "6925256babec4307479a4080b44f2be38056f210"; version = "6925256babec4307479a4080b44f2be38056f210";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "rnix-lsp"; repo = "rnix-lsp";
rev = "6925256babec4307479a4080b44f2be38056f210"; rev = "6925256babec4307479a4080b44f2be38056f210";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q="; sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q=";
}); };
}; };
vim-apprentice-nvfetcher = { vim-apprentice-nvfetcher = {
pname = "vim-apprentice-nvfetcher"; pname = "vim-apprentice-nvfetcher";
version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "romainl"; owner = "romainl";
repo = "Apprentice"; repo = "Apprentice";
rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo="; sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo=";
}); };
}; };
vim-beautify-nvfetcher = { vim-beautify-nvfetcher = {
pname = "vim-beautify-nvfetcher"; pname = "vim-beautify-nvfetcher";
version = "e0691483927dc5a0c051433602397419f9628623"; version = "e0691483927dc5a0c051433602397419f9628623";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "zeekay"; owner = "zeekay";
repo = "vim-beautify"; repo = "vim-beautify";
rev = "e0691483927dc5a0c051433602397419f9628623"; rev = "e0691483927dc5a0c051433602397419f9628623";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ="; sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
}); };
}; };
vim-caddyfile-nvfetcher = { vim-caddyfile-nvfetcher = {
pname = "vim-caddyfile-nvfetcher"; pname = "vim-caddyfile-nvfetcher";
version = "24fe0720551883e407cb70ae1d7c03f162d1d5a0"; version = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "isobit"; owner = "isobit";
repo = "vim-caddyfile"; repo = "vim-caddyfile";
rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0"; rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o="; sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
}); };
}; };
vim-workspace-nvfetcher = { vim-workspace-nvfetcher = {
pname = "vim-workspace-nvfetcher"; pname = "vim-workspace-nvfetcher";
version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62"; version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "thaerkh"; owner = "thaerkh";
repo = "vim-workspace"; repo = "vim-workspace";
rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62"; rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI="; sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI=";
}); };
}; };
vimagit-nvfetcher = { vimagit-nvfetcher = {
pname = "vimagit-nvfetcher"; pname = "vimagit-nvfetcher";
version = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4"; version = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "jreybert"; owner = "jreybert";
repo = "vimagit"; repo = "vimagit";
rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4"; rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0="; sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
}); };
}; };
zsh-nix-shell = { zsh-nix-shell = {
pname = "zsh-nix-shell"; pname = "zsh-nix-shell";
version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08"; version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
src = fetchFromGitHub ({ src = fetchFromGitHub {
owner = "chisui"; owner = "chisui";
repo = "zsh-nix-shell"; repo = "zsh-nix-shell";
rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08"; rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ="; sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=";
}); };
}; };
} }

2
pkgs/default.nix
View file

@ -1,7 +1,7 @@
final: prev: final: prev:
with final; { with final; {
# keep sources this first # keep sources this first
sources = prev.callPackage (import ./_sources/generated.nix) { }; sources = prev.callPackage (import ./_sources/generated.nix) {};
# then, call packages with `final.callPackage` # then, call packages with `final.callPackage`
import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final); import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
lgcl = writeShellScriptBin "lgcl" (import ./lgcl.nix final); lgcl = writeShellScriptBin "lgcl" (import ./lgcl.nix final);

3
pkgs/drone-docker-runner.nix
View file

@ -1,4 +1,5 @@
self: with self; '' self:
with self; ''
case $1 in case $1 in
start) start)
${self.docker}/bin/docker run --detach \ ${self.docker}/bin/docker run --detach \

3
pkgs/import-gtk-settings.nix
View file

@ -1,4 +1,5 @@
self: with self; '' self:
with self; ''
# usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ... # usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
expression="" expression=""

8
pkgs/lgcl.nix
View file

@ -1,9 +1,7 @@
self: with self; self: with self; let
let
looking-glass-client = self.looking-glass-client.overrideAttrs (old: { looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; meta.platforms = ["x86_64-linux" "aarch64-linux"];
}); });
in in ''
''
${looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no ${looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no
'' ''

3
pkgs/mailto-mutt.nix
View file

@ -1,4 +1,5 @@
self: with self; '' self:
with self; ''
mkdir -p $XDG_CACHE_HOME/log mkdir -p $XDG_CACHE_HOME/log
LOGFILE=$XDG_CACHE_HOME/log/mailto.log LOGFILE=$XDG_CACHE_HOME/log/mailto.log

37
pkgs/mopidy-jellyfin.nix
View file

@ -1,5 +1,4 @@
self: with self; self: with self; let
let
websocket-client = python39.pkgs.buildPythonPackage rec { websocket-client = python39.pkgs.buildPythonPackage rec {
pname = "websocket-client"; pname = "websocket-client";
version = "1.2.1"; version = "1.2.1";
@ -10,20 +9,20 @@ let
}; };
}; };
in in
python39.pkgs.buildPythonPackage rec { python39.pkgs.buildPythonPackage rec {
pname = "Mopidy-Jellyfin"; pname = "Mopidy-Jellyfin";
version = "1.0.2"; version = "1.0.2";
doCheck = false; doCheck = false;
propagatedBuildInputs = with python39.pkgs; [ propagatedBuildInputs = with python39.pkgs; [
unidecode unidecode
websocket-client websocket-client
requests requests
setuptools setuptools
pykka pykka
mopidy mopidy
]; ];
src = python39.pkgs.fetchPypi { src = python39.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g="; sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g=";
}; };
} }

3
pkgs/mu.nix
View file

@ -1,3 +1,4 @@
self: with self; '' self:
with self; ''
exec ${alacritty}/bin/alacritty --class mu_vimpc --option dimensions.columns=120 --option dimensions.lines=80 -e vimpc -- "$@" exec ${alacritty}/bin/alacritty --class mu_vimpc --option dimensions.columns=120 --option dimensions.lines=80 -e vimpc -- "$@"
'' ''

45
pkgs/psos-docs.nix
View file

@ -1,26 +1,27 @@
self: with self; self:
stdenv.mkDerivation rec { with self;
pname = "psos-docs"; stdenv.mkDerivation rec {
version = "0.0.1"; pname = "psos-docs";
buildInputs = [ version = "0.0.1";
mdbook buildInputs = [
mdbook-pdf mdbook
]; mdbook-pdf
];
src = ../docs/..; # wut src = ../docs/..; # wut
phases = [ "buildPhase" "installPhase" ]; phases = ["buildPhase" "installPhase"];
buildPhase = '' buildPhase = ''
cp -r $src/doc ./doc cp -r $src/doc ./doc
cp $src/README.md ./README.md cp $src/README.md ./README.md
chmod ug+w -R . chmod ug+w -R .
ls -la . ls -la .
mdbook build doc mdbook build doc
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/lib/ mkdir -p $out/lib/
cp -r doc/book $out/lib/html cp -r doc/book $out/lib/html
''; '';
} }

Some files were not shown because too many files have changed in this diff Show more