Compare commits
No commits in common. "7d0948851328c6f987d7459ba707e9fab24a535c" and "bd7b8649279e219e5a57dfba9628d35807812060" have entirely different histories.
7d09488513
...
bd7b864927
|
|
@ -1,2 +0,0 @@
|
||||||
# Formatted code using treefmt and alejandra
|
|
||||||
73bf158392a427d188b7aad36244b94506f57a15
|
|
||||||
|
|
@ -109,4 +109,6 @@
|
||||||
|
|
||||||
## [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)*
|
||||||
|
|
|
||||||
18
README.md
18
README.md
|
|
@ -10,36 +10,36 @@ 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.
|
||||||
|
|
||||||
|
|
|
||||||
13
default.nix
13
default.nix
|
|
@ -9,22 +9,17 @@ let
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
];
|
];
|
||||||
|
|
||||||
filterSystems =
|
filterSystems = lib.filterAttrs
|
||||||
lib.filterAttrs
|
|
||||||
(system: _: lib.elem system ciSystems);
|
(system: _: lib.elem system ciSystems);
|
||||||
|
|
||||||
recurseIntoAttrsRecursive = lib.mapAttrs (
|
recurseIntoAttrsRecursive = lib.mapAttrs (_: v:
|
||||||
_: v:
|
|
||||||
if lib.isAttrs v
|
if lib.isAttrs v
|
||||||
then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
|
then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
|
||||||
else v
|
else v
|
||||||
);
|
);
|
||||||
|
|
||||||
systemOutputs =
|
systemOutputs = lib.filterAttrs
|
||||||
lib.filterAttrs
|
(name: set: lib.isAttrs set
|
||||||
(
|
|
||||||
name: set:
|
|
||||||
lib.isAttrs set
|
|
||||||
&& lib.any
|
&& lib.any
|
||||||
(system: set ? ${system} && name != "legacyPackages")
|
(system: set ? ${system} && name != "legacyPackages")
|
||||||
ciSystems
|
ciSystems
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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
|
||||||
|
|
@ -10,6 +9,5 @@
|
||||||
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
|
||||||
|
|
|
||||||
|
|
@ -28,3 +28,4 @@
|
||||||
- [NixOS](./api-reference-nixos.md)
|
- [NixOS](./api-reference-nixos.md)
|
||||||
- [Library Reference]()
|
- [Library Reference]()
|
||||||
- [Contributing](./CONTRIBUTING.md)
|
- [Contributing](./CONTRIBUTING.md)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,76 +1,91 @@
|
||||||
# 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_*
|
||||||
```
|
```
|
||||||
[]
|
[]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,59 +1,72 @@
|
||||||
# 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_*
|
||||||
```
|
```
|
||||||
[]
|
[]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,97 +1,119 @@
|
||||||
# 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_*
|
||||||
```
|
```
|
||||||
{}
|
{}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,191 +1,234 @@
|
||||||
# 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
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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)
|
||||||
|
|
@ -9,55 +8,73 @@
|
||||||
- [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"]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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,7 +47,6 @@ flake.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
hosts/librem.nix:
|
hosts/librem.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ suites, ... }:
|
{ suites, ... }:
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
# 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.
|
||||||
|
|
@ -12,7 +10,6 @@ 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;
|
||||||
|
|
@ -31,7 +28,6 @@ You can also pull modules from other channels. All modules have access to the
|
||||||
`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 }:
|
||||||
{
|
{
|
||||||
|
|
@ -41,7 +37,6 @@ 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
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ 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
|
||||||
|
|
@ -15,14 +14,12 @@ 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.
|
||||||
> - For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
|
> * This directory takes inspiration from
|
||||||
> - 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
|
||||||
|
|
@ -31,7 +28,6 @@ to all its sister profiles.
|
||||||
### Example
|
### Example
|
||||||
|
|
||||||
profiles/develop/common.nix:
|
profiles/develop/common.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
imports = [ ./zsh ];
|
imports = [ ./zsh ];
|
||||||
|
|
@ -40,7 +36,6 @@ profiles/develop/common.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
profiles/develop/zsh.nix:
|
profiles/develop/zsh.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
|
@ -50,7 +45,6 @@ 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 = {
|
||||||
|
|
@ -61,7 +55,6 @@ 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
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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.
|
||||||
|
|
||||||
|
|
@ -9,7 +8,6 @@ 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 ];
|
||||||
|
|
@ -18,9 +16,7 @@ rec {
|
||||||
```
|
```
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
`hosts/my-laptop.nix`:
|
`hosts/my-laptop.nix`:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ suites, ... }:
|
{ suites, ... }:
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
> ##### _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.
|
||||||
|
|
@ -13,9 +12,7 @@ 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
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
|
@ -31,7 +28,6 @@ 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`.
|
||||||
|
|
||||||
|
|
@ -41,9 +37,7 @@ 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, ... }: {
|
||||||
|
|
@ -52,8 +46,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.
|
||||||
|
|
||||||
|
|
@ -61,7 +55,6 @@ 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'
|
||||||
|
|
@ -71,7 +64,6 @@ 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,5 +1,4 @@
|
||||||
# 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
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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
|
||||||
|
|
@ -12,7 +11,6 @@ the command line.
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
Just add your ssh key to the host:
|
Just add your ssh key to the host:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
|
@ -23,7 +21,6 @@ Just add your ssh key to the host:
|
||||||
```
|
```
|
||||||
|
|
||||||
And the private key to your user:
|
And the private key to your user:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
|
@ -42,20 +39,16 @@ 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
|
||||||
|
|
@ -79,4 +72,5 @@ Substitute `<HOSTNAME>`, `<HM_PROFILE>` and `<YOUR_USERNAME>` placeholders (omit
|
||||||
`<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
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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
|
||||||
|
|
@ -9,7 +8,6 @@ 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
|
||||||
|
|
@ -17,7 +15,6 @@ 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!
|
||||||
|
|
@ -26,7 +23,6 @@ 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,5 +1,4 @@
|
||||||
# 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
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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
|
||||||
|
|
@ -16,7 +15,6 @@ 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"
|
||||||
|
|
@ -24,7 +22,6 @@ 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
|
||||||
|
|
@ -32,7 +29,6 @@ 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
|
||||||
|
|
@ -40,7 +36,6 @@ 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,4 +1,3 @@
|
||||||
# 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.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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.
|
||||||
|
|
@ -7,21 +6,18 @@ 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
|
||||||
|
|
@ -41,9 +37,7 @@ 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
|
||||||
|
|
@ -53,9 +47,7 @@ modules/module-list.nix:
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
### Internal
|
### Internal
|
||||||
|
|
||||||
profiles/profile-category/my-profile.nix:
|
profiles/profile-category/my-profile.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
|
@ -64,9 +56,7 @@ profiles/profile-category/my-profile.nix:
|
||||||
```
|
```
|
||||||
|
|
||||||
### External
|
### External
|
||||||
|
|
||||||
flake.nix:
|
flake.nix:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
{
|
{
|
||||||
# inputs omitted
|
# inputs omitted
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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.
|
||||||
|
|
||||||
|
|
@ -10,9 +9,7 @@ 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 {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
# 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.
|
||||||
|
|
@ -20,24 +19,20 @@ 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
|
||||||
|
|
@ -50,7 +45,6 @@ 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 {
|
||||||
|
|
@ -65,8 +59,8 @@ 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
|
||||||
|
|
@ -75,7 +69,6 @@ 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";
|
||||||
|
|
@ -88,7 +81,6 @@ 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`
|
||||||
|
|
@ -97,7 +89,6 @@ 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
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
# 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.
|
||||||
|
|
||||||
|
|
@ -19,7 +17,6 @@ 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.
|
||||||
|
|
@ -27,7 +24,6 @@ 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>";
|
||||||
|
|
@ -41,25 +37,22 @@ 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
|
||||||
...
|
...
|
||||||
|
|
@ -69,26 +62,21 @@ 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`.
|
||||||
|
|
||||||
|
|
@ -101,14 +89,15 @@ 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.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,18 @@
|
||||||
# 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 .
|
||||||
|
|
@ -26,14 +20,11 @@ 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
|
||||||
```
|
```
|
||||||
|
|
@ -44,7 +35,6 @@ 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
|
||||||
|
|
@ -56,4 +46,5 @@ 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
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,12 @@ 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,
|
||||||
|
|
|
||||||
136
flake.lock
136
flake.lock
|
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673301561,
|
"lastModified": 1665870395,
|
||||||
"narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=",
|
"narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68",
|
"rev": "a630400067c6d03c9b3e0455347dc8559db14288",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -42,11 +42,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673295039,
|
"lastModified": 1671891118,
|
||||||
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
|
"narHash": "sha256-+GJYiT7QbfA306ex4sGMlFB8Ts297pn3OdQ9kTd4aDw=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
|
"rev": "267040e7a2b8644f1fdfcf57b7e808c286dbdc7b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -85,11 +85,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674127017,
|
"lastModified": 1672327199,
|
||||||
"narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=",
|
"narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=",
|
||||||
"owner": "serokell",
|
"owner": "serokell",
|
||||||
"repo": "deploy-rs",
|
"repo": "deploy-rs",
|
||||||
"rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77",
|
"rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -192,11 +192,27 @@
|
||||||
"flake-compat_3": {
|
"flake-compat_3": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673956053,
|
"lastModified": 1668681692,
|
||||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_4": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1650374568,
|
||||||
|
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -254,24 +270,38 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1667077288,
|
||||||
|
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home": {
|
"home": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixos"
|
"nixos"
|
||||||
],
|
]
|
||||||
"utils": "utils_2"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674440933,
|
"lastModified": 1667907331,
|
||||||
"narHash": "sha256-CASRcD/rK3fn5vUCti3jzry7zi0GsqRsBohNq9wPgLs=",
|
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "65c47ced082e3353113614f77b1bc18822dc731f",
|
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-22.11",
|
"ref": "release-22.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -294,11 +324,11 @@
|
||||||
},
|
},
|
||||||
"latest_2": {
|
"latest_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674641431,
|
"lastModified": 1672350804,
|
||||||
"narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
|
"narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
|
"rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -310,11 +340,11 @@
|
||||||
},
|
},
|
||||||
"master": {
|
"master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674941334,
|
"lastModified": 1672686111,
|
||||||
"narHash": "sha256-hLNilB0cO4KTUhqOLRfuJMakmNyitKUfj37u1DtRX6w=",
|
"narHash": "sha256-7otTe3dIGdqBiK9f6LEi+fgWUbIxMLd06phv1NyNb8I=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "327dc97d8708c65bde5e41e210c335df4e18c3bb",
|
"rev": "9f5839a6ea0e62a85c8ed35eb6b665fe778c3b4a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -361,16 +391,16 @@
|
||||||
},
|
},
|
||||||
"nixos": {
|
"nixos": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674868155,
|
"lastModified": 1672441599,
|
||||||
"narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
|
"narHash": "sha256-5s/aa/0cpw6MNXQSiUedDnnMVleL/WThL8Q8jYNcc+g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
|
"rev": "0c5a734cdeadc39d253018ad0f83fb77eac7ab08",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-22.11",
|
"ref": "nixos-22.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -381,11 +411,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674666581,
|
"lastModified": 1672682641,
|
||||||
"narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
|
"narHash": "sha256-940TLvtdT8YKuP5nXcPhUfNeK0A/leSjjG8hfqvWM84=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-generators",
|
"repo": "nixos-generators",
|
||||||
"rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
|
"rev": "30516cb2b01896e14ce66893e414b6e3eec71cac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -396,11 +426,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674550793,
|
"lastModified": 1672644464,
|
||||||
"narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
|
"narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
|
"rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -453,6 +483,28 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nvfetcher": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_4",
|
||||||
|
"flake-utils": "flake-utils_3",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixos"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1667620329,
|
||||||
|
"narHash": "sha256-v1Zk7rtEbAGpevBGPZvZBKpwbmw4I+uVwxvd+pBlp3o=",
|
||||||
|
"owner": "berberman",
|
||||||
|
"repo": "nvfetcher",
|
||||||
|
"rev": "294826951113dcd3aa9abbcacfb1aa5b95a19116",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "berberman",
|
||||||
|
"repo": "nvfetcher",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"pub-solar": {
|
"pub-solar": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1654372286,
|
"lastModified": 1654372286,
|
||||||
|
|
@ -484,6 +536,7 @@
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
|
"nvfetcher": "nvfetcher",
|
||||||
"pub-solar": "pub-solar"
|
"pub-solar": "pub-solar"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -501,21 +554,6 @@
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"utils_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667395993,
|
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
||||||
55
flake.nix
55
flake.nix
|
|
@ -5,10 +5,13 @@
|
||||||
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.11";
|
nixos.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||||
latest.url = "github:nixos/nixpkgs/nixos-unstable";
|
latest.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
master.url = "github:nixos/nixpkgs/master";
|
||||||
|
pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
|
||||||
|
|
||||||
flake-compat.url = "github:edolstra/flake-compat";
|
flake-compat.url = "github:edolstra/flake-compat";
|
||||||
flake-compat.flake = false;
|
flake-compat.flake = false;
|
||||||
|
|
@ -19,7 +22,7 @@
|
||||||
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.11";
|
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";
|
||||||
|
|
@ -31,34 +34,35 @@
|
||||||
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.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";
|
||||||
|
|
||||||
master.url = "github:nixos/nixpkgs/master";
|
|
||||||
pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs =
|
||||||
self,
|
{ self
|
||||||
digga,
|
, digga
|
||||||
nixos,
|
, nixos
|
||||||
home,
|
, home
|
||||||
nixos-hardware,
|
, nixos-hardware
|
||||||
nur,
|
, nur
|
||||||
agenix,
|
, agenix
|
||||||
deploy,
|
, nvfetcher
|
||||||
...
|
, 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" ];
|
||||||
|
|
@ -69,6 +73,7 @@
|
||||||
overlays = [ ];
|
overlays = [ ];
|
||||||
};
|
};
|
||||||
latest = { };
|
latest = { };
|
||||||
|
master = { };
|
||||||
};
|
};
|
||||||
|
|
||||||
lib = import ./lib { lib = digga.lib // nixos.lib; };
|
lib = import ./lib { lib = digga.lib // nixos.lib; };
|
||||||
|
|
@ -105,9 +110,7 @@
|
||||||
|
|
||||||
imports = [ (digga.lib.importHosts ./hosts) ];
|
imports = [ (digga.lib.importHosts ./hosts) ];
|
||||||
hosts = {
|
hosts = {
|
||||||
/*
|
/* set host specific properties here */
|
||||||
set host specific properties here
|
|
||||||
*/
|
|
||||||
bootstrap = {
|
bootstrap = {
|
||||||
modules = [
|
modules = [
|
||||||
digga.nixosModules.bootstrapIso
|
digga.nixosModules.bootstrapIso
|
||||||
|
|
@ -115,20 +118,14 @@
|
||||||
};
|
};
|
||||||
PubSolarOS = {
|
PubSolarOS = {
|
||||||
tests = [
|
tests = [
|
||||||
(import ./tests/first-test.nix {
|
(import ./tests/first-test.nix { pkgs = nixos.legacyPackages.x86_64-linux; lib = nixos.lib; })
|
||||||
pkgs = nixos.legacyPackages.x86_64-linux;
|
|
||||||
lib = nixos.lib;
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
importables = rec {
|
importables = rec {
|
||||||
profiles =
|
profiles = digga.lib.rakeLeaves ./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 ];
|
||||||
|
|
@ -151,7 +148,7 @@
|
||||||
importables = rec {
|
importables = rec {
|
||||||
profiles = digga.lib.rakeLeaves ./users/profiles;
|
profiles = digga.lib.rakeLeaves ./users/profiles;
|
||||||
suites = with profiles; rec {
|
suites = with profiles; rec {
|
||||||
base = [direnv git];
|
base = [ direnv ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
users = {
|
users = {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
{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;
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
with lib;
|
||||||
pkgs,
|
let
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; 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
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
];
|
];
|
||||||
|
|
@ -23,8 +20,7 @@ in {
|
||||||
|
|
||||||
networking.networkmanager.wifi.backend = mkForce "wpa_supplicant";
|
networking.networkmanager.wifi.backend = mkForce "wpa_supplicant";
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
xdg.configFile = mkIf psCfg.sway.enable {
|
xdg.configFile = mkIf psCfg.sway.enable {
|
||||||
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
|
"sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
|
||||||
"sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
|
"sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config,
|
imports =
|
||||||
pkgs,
|
[
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
@ -23,3 +23,4 @@
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "20.09"; # Did you read the comment?
|
system.stateVersion = "20.09"; # Did you read the comment?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{suites, ...}: {
|
{ suites, ... }:
|
||||||
imports =
|
{
|
||||||
[
|
imports = [
|
||||||
./biolimo.nix
|
./biolimo.nix
|
||||||
]
|
] ++ suites.biolimo;
|
||||||
++ suites.biolimo;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,9 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
modulesPath,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
{
|
{ config, lib, pkgs, profiles, ... }:
|
||||||
config,
|
with lib;
|
||||||
lib,
|
let
|
||||||
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: let
|
getFqdn = config:
|
||||||
|
let
|
||||||
net = config.networking;
|
net = config.networking;
|
||||||
fqdn =
|
fqdn =
|
||||||
if (net ? domain) && (net.domain != null)
|
if (net ? domain) && (net.domain != null)
|
||||||
|
|
@ -16,7 +12,8 @@ with lib; let
|
||||||
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
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
{
|
{ config, pkgs, lib, self, ... }:
|
||||||
config,
|
with lib;
|
||||||
pkgs,
|
let
|
||||||
lib,
|
|
||||||
self,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; 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
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./virtualisation
|
./virtualisation
|
||||||
|
|
@ -27,13 +23,7 @@ in {
|
||||||
pub-solar.core.hibernation.resumeOffset = 115075072;
|
pub-solar.core.hibernation.resumeOffset = 115075072;
|
||||||
|
|
||||||
services.openssh.openFirewall = true;
|
services.openssh.openFirewall = true;
|
||||||
networking.firewall.allowedTCPPorts =
|
networking.firewall.allowedTCPPorts = [ 443 ] ++ (if psCfg.sway.vnc.enable then [ 5901 ] else [ ]);
|
||||||
[443]
|
|
||||||
++ (
|
|
||||||
if psCfg.sway.vnc.enable
|
|
||||||
then [5901]
|
|
||||||
else []
|
|
||||||
);
|
|
||||||
networking.firewall.allowedUDPPorts = [ 43050 ];
|
networking.firewall.allowedUDPPorts = [ 43050 ];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config,
|
imports =
|
||||||
pkgs,
|
[
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{suites, ...}: {
|
{ suites, ... }:
|
||||||
imports =
|
{
|
||||||
[
|
imports = [
|
||||||
./chocolatebar.nix
|
./chocolatebar.nix
|
||||||
]
|
] ++ suites.chocolatebar;
|
||||||
++ suites.chocolatebar;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{ config, pkgs, lib, self, ... }:
|
||||||
config,
|
with lib;
|
||||||
pkgs,
|
let
|
||||||
lib,
|
|
||||||
self,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; 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;
|
||||||
|
|
||||||
|
|
@ -20,7 +15,8 @@ with lib; let
|
||||||
cp $src far-reach_1.1.2.zip
|
cp $src far-reach_1.1.2.zip
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
services.factorio = {
|
services.factorio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config,
|
imports =
|
||||||
lib,
|
[
|
||||||
pkgs,
|
|
||||||
modulesPath,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -17,14 +14,16 @@
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" =
|
||||||
|
{
|
||||||
device = "/dev/disk/by-uuid/a3a74208-b244-4268-b374-e58265810fce";
|
device = "/dev/disk/by-uuid/a3a74208-b244-4268-b374-e58265810fce";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/afcde41f-9811-4ac8-bb7b-a683844acc5c";
|
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/afcde41f-9811-4ac8-bb7b-a683844acc5c";
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" =
|
||||||
|
{
|
||||||
device = "/dev/disk/by-uuid/12FD-62A8";
|
device = "/dev/disk/by-uuid/12FD-62A8";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
@ -35,4 +34,5 @@
|
||||||
size = 68 * 1024; # 68 GB
|
size = 68 * 1024; # 68 GB
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,23 @@
|
||||||
{
|
{ config, pkgs, lib, vm, ... }:
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
vm,
|
|
||||||
...
|
|
||||||
}: 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;
|
||||||
varsFile = "${xdg.dataHome}/libvirt/OVMF_VARS_${vm.name}.fd";
|
varsFile = "${xdg.dataHome}/libvirt/OVMF_VARS_${vm.name}.fd";
|
||||||
generateXML = import ./guest-xml.nix;
|
generateXML = import ./guest-xml.nix;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
RemainAfterExit = "yes";
|
RemainAfterExit = "yes";
|
||||||
Restart = "no";
|
Restart = "no";
|
||||||
};
|
};
|
||||||
|
|
||||||
script = let
|
script =
|
||||||
networkXML = pkgs.writeText "network.xml" (import ./network-xml.nix {
|
let
|
||||||
inherit config;
|
networkXML = pkgs.writeText "network.xml" (import ./network-xml.nix { inherit config; inherit pkgs; inherit lib; });
|
||||||
inherit pkgs;
|
machineXML = pkgs.writeText "${vm.name}.xml" (vm.generateXML { inherit config; inherit pkgs; inherit lib; inherit vm; varsFile = varsFile; });
|
||||||
inherit lib;
|
in
|
||||||
});
|
''
|
||||||
machineXML = pkgs.writeText "${vm.name}.xml" (vm.generateXML {
|
|
||||||
inherit config;
|
|
||||||
inherit pkgs;
|
|
||||||
inherit lib;
|
|
||||||
inherit vm;
|
|
||||||
varsFile = varsFile;
|
|
||||||
});
|
|
||||||
in ''
|
|
||||||
echo "Checking if ${vm.name} is already running"
|
echo "Checking if ${vm.name} is already running"
|
||||||
STATUS=$(${pkgs.libvirt}/bin/virsh list --all | grep "${vm.name}" | ${pkgs.gawk}/bin/awk '{ print $3 " " $4 }' )
|
STATUS=$(${pkgs.libvirt}/bin/virsh list --all | grep "${vm.name}" | ${pkgs.gawk}/bin/awk '{ print $3 " " $4 }' )
|
||||||
if [[ $STATUS != "shut off" && $STATUS != "" ]]; then
|
if [[ $STATUS != "shut off" && $STATUS != "" ]]; then
|
||||||
|
|
@ -63,9 +51,7 @@ in {
|
||||||
UUID="$(${pkgs.libvirt}/bin/virsh domuuid '${vm.name}' || true)"
|
UUID="$(${pkgs.libvirt}/bin/virsh domuuid '${vm.name}' || true)"
|
||||||
sed -i "s/UUID/''${UUID}/" "$TMP_FILE"
|
sed -i "s/UUID/''${UUID}/" "$TMP_FILE"
|
||||||
|
|
||||||
${
|
${if vm.handOverUSBDevices then ''
|
||||||
if vm.handOverUSBDevices
|
|
||||||
then ''
|
|
||||||
# Hand over mouse
|
# Hand over mouse
|
||||||
USB_BUS=3
|
USB_BUS=3
|
||||||
USB_DEV=$(${pkgs.usbutils}/bin/lsusb | grep 046d:c52b | grep "Bus 00''${USB_BUS}" | cut -b 18)
|
USB_DEV=$(${pkgs.usbutils}/bin/lsusb | grep 046d:c52b | grep "Bus 00''${USB_BUS}" | cut -b 18)
|
||||||
|
|
@ -77,9 +63,7 @@ in {
|
||||||
USB_DEV=$(${pkgs.usbutils}/bin/lsusb | grep 046d:c328 | cut -b 18)
|
USB_DEV=$(${pkgs.usbutils}/bin/lsusb | grep 046d:c328 | cut -b 18)
|
||||||
LINE_NUMBER=$(cat $TMP_FILE | grep -n -A 1 0xc328 | tail -n 1 | cut -b 1,2,3)
|
LINE_NUMBER=$(cat $TMP_FILE | grep -n -A 1 0xc328 | tail -n 1 | cut -b 1,2,3)
|
||||||
sed -i "''${LINE_NUMBER}s/.*/<address bus=\"''${USB_BUS}\" device=\"''${USB_DEV}\" \/>/" "$TMP_FILE"
|
sed -i "''${LINE_NUMBER}s/.*/<address bus=\"''${USB_BUS}\" device=\"''${USB_DEV}\" \/>/" "$TMP_FILE"
|
||||||
''
|
'' else ""}
|
||||||
else ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# TODO: Set correct pci address for the GPU too
|
# TODO: Set correct pci address for the GPU too
|
||||||
|
|
||||||
|
|
@ -94,7 +78,8 @@ in {
|
||||||
${pkgs.libvirt}/bin/virsh start '${vm.name}'
|
${pkgs.libvirt}/bin/virsh start '${vm.name}'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preStop = ''
|
preStop =
|
||||||
|
''
|
||||||
${pkgs.libvirt}/bin/virsh shutdown '${vm.name}'
|
${pkgs.libvirt}/bin/virsh shutdown '${vm.name}'
|
||||||
let "timeout = $(date +%s) + 10"
|
let "timeout = $(date +%s) + 10"
|
||||||
while [ "$(${pkgs.libvirt}/bin/virsh list --name | grep --count '^${vm.name}$')" -gt 0 ]; do
|
while [ "$(${pkgs.libvirt}/bin/virsh list --name | grep --count '^${vm.name}$')" -gt 0 ]; do
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
with lib;
|
||||||
pkgs,
|
let
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; 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;
|
||||||
createService = import ./create-service.nix;
|
createService = import ./create-service.nix;
|
||||||
|
|
@ -16,12 +12,12 @@ with lib; let
|
||||||
handOverUSBDevices = false;
|
handOverUSBDevices = false;
|
||||||
|
|
||||||
isolateAnyGPU = isolateGPU != null;
|
isolateAnyGPU = isolateGPU != null;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = mkIf psCfg.virtualisation.enable {
|
config = mkIf psCfg.virtualisation.enable {
|
||||||
boot.extraModprobeConfig = mkIf isolateAnyGPU (concatStringsSep "\n" [
|
boot.extraModprobeConfig = mkIf isolateAnyGPU (concatStringsSep "\n" [
|
||||||
"softdep amdgpu pre: vfio vfio_pci"
|
"softdep amdgpu pre: vfio vfio_pci"
|
||||||
(
|
(if isolateGPU == "rx5700xt"
|
||||||
if isolateGPU == "rx5700xt"
|
|
||||||
then "options vfio-pci ids=1002:731f,1002:ab38"
|
then "options vfio-pci ids=1002:731f,1002:ab38"
|
||||||
else "options vfio-pci ids=1002:699f,1002:aae0"
|
else "options vfio-pci ids=1002:699f,1002:aae0"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,10 @@
|
||||||
{
|
{ config, pkgs, lib, vm, varsFile, ... }:
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
vm,
|
|
||||||
varsFile,
|
|
||||||
...
|
|
||||||
}: 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;
|
||||||
home = config.home-manager.users."${psCfg.user.name}".home;
|
home = config.home-manager.users."${psCfg.user.name}".home;
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
|
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
|
||||||
<name>${vm.name}</name>
|
<name>${vm.name}</name>
|
||||||
<uuid>UUID</uuid>
|
<uuid>UUID</uuid>
|
||||||
|
|
@ -161,17 +156,13 @@ in ''
|
||||||
<controller type='virtio-serial' index='0'>
|
<controller type='virtio-serial' index='0'>
|
||||||
<address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
|
||||||
</controller>
|
</controller>
|
||||||
${
|
${if vm.mountHome then ''
|
||||||
if vm.mountHome
|
|
||||||
then ''
|
|
||||||
<filesystem type='mount' accessmode='mapped'>
|
<filesystem type='mount' accessmode='mapped'>
|
||||||
<source dir='/home/${psCfg.user.name}'/>
|
<source dir='/home/${psCfg.user.name}'/>
|
||||||
<target dir='/media/home'/>
|
<target dir='/media/home'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
|
||||||
</filesystem>
|
</filesystem>
|
||||||
''
|
'' else ""}
|
||||||
else ""
|
|
||||||
}
|
|
||||||
<interface type='network'>
|
<interface type='network'>
|
||||||
<mac address='52:54:00:44:cd:ac'/>
|
<mac address='52:54:00:44:cd:ac'/>
|
||||||
<source network='default'/>
|
<source network='default'/>
|
||||||
|
|
@ -194,9 +185,7 @@ in ''
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
||||||
</video>
|
</video>
|
||||||
${
|
${if vm.handOverUSBDevices then ''
|
||||||
if vm.handOverUSBDevices
|
|
||||||
then ''
|
|
||||||
<hostdev mode='subsystem' type='usb' managed='yes'>
|
<hostdev mode='subsystem' type='usb' managed='yes'>
|
||||||
<source>
|
<source>
|
||||||
<vendor id='0x046d'/>
|
<vendor id='0x046d'/>
|
||||||
|
|
@ -213,12 +202,8 @@ in ''
|
||||||
</source>
|
</source>
|
||||||
<address type='usb' bus='0' port='5'/>
|
<address type='usb' bus='0' port='5'/>
|
||||||
</hostdev>
|
</hostdev>
|
||||||
''
|
'' else ""}
|
||||||
else ""
|
${if vm.gpu && vm.isolateGPU != null then ''
|
||||||
}
|
|
||||||
${
|
|
||||||
if vm.gpu && vm.isolateGPU != null
|
|
||||||
then ''
|
|
||||||
<hostdev mode='subsystem' type='pci' managed='yes'>
|
<hostdev mode='subsystem' type='pci' managed='yes'>
|
||||||
<driver name='vfio'/>
|
<driver name='vfio'/>
|
||||||
<source>
|
<source>
|
||||||
|
|
@ -234,9 +219,7 @@ in ''
|
||||||
</source>
|
</source>
|
||||||
<address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x1'/>
|
<address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x1'/>
|
||||||
</hostdev>
|
</hostdev>
|
||||||
''
|
'' else ""}
|
||||||
else ""
|
|
||||||
}
|
|
||||||
<redirdev bus='usb' type='spicevmc'>
|
<redirdev bus='usb' type='spicevmc'>
|
||||||
<address type='usb' bus='0' port='2'/>
|
<address type='usb' bus='0' port='2'/>
|
||||||
</redirdev>
|
</redirdev>
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,5 @@
|
||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
''
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: ''
|
|
||||||
<network>
|
<network>
|
||||||
<name>default</name>
|
<name>default</name>
|
||||||
<uuid>UUID</uuid>
|
<uuid>UUID</uuid>
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,10 @@
|
||||||
{
|
{ config, pkgs, lib, vm, varsFile, ... }:
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
vm,
|
|
||||||
varsFile,
|
|
||||||
...
|
|
||||||
}: 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;
|
||||||
home = config.home-manager.users."${psCfg.user.name}".home;
|
home = config.home-manager.users."${psCfg.user.name}".home;
|
||||||
in ''
|
in
|
||||||
|
''
|
||||||
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
|
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
|
||||||
<name>${vm.name}</name>
|
<name>${vm.name}</name>
|
||||||
<uuid>UUID</uuid>
|
<uuid>UUID</uuid>
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
|
{ config, pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
config,
|
imports =
|
||||||
pkgs,
|
[
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
@ -28,3 +26,4 @@
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "21.11"; # Did you read the comment?
|
system.stateVersion = "21.11"; # Did you read the comment?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{suites, ...}: {
|
{ suites, ... }:
|
||||||
imports =
|
{
|
||||||
[
|
imports = [
|
||||||
./droppie.nix
|
./droppie.nix
|
||||||
]
|
] ++ suites.droppie;
|
||||||
++ suites.droppie;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
{
|
{ config, pkgs, lib, self, ... }:
|
||||||
config,
|
with lib;
|
||||||
pkgs,
|
let
|
||||||
lib,
|
|
||||||
self,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; 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
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./nextcloud-web-tunnel.nix
|
./nextcloud-web-tunnel.nix
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config,
|
imports =
|
||||||
lib,
|
[
|
||||||
pkgs,
|
|
||||||
modulesPath,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -17,27 +14,32 @@
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" =
|
||||||
|
{
|
||||||
device = "/dev/disk/by-uuid/1dca9d02-555c-4b23-9450-8f3413fa7694";
|
device = "/dev/disk/by-uuid/1dca9d02-555c-4b23-9450-8f3413fa7694";
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" =
|
||||||
|
{
|
||||||
device = "/dev/disk/by-uuid/A24C-F252";
|
device = "/dev/disk/by-uuid/A24C-F252";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/media/internal" = {
|
fileSystems."/media/internal" =
|
||||||
|
{
|
||||||
device = "/dev/disk/by-uuid/5cf314a8-82f4-4037-a724-62d2ff226cff";
|
device = "/dev/disk/by-uuid/5cf314a8-82f4-4037-a724-62d2ff226cff";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" = {
|
fileSystems."/home" =
|
||||||
|
{
|
||||||
device = "/dev/disk/by-uuid/2ef980f1-1f27-4d2a-9789-00f45e791fcc";
|
device = "/dev/disk/by-uuid/2ef980f1-1f27-4d2a-9789-00f45e791fcc";
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [{device = "/dev/disk/by-uuid/0203b641-280f-4a3d-971d-fd32a666c852";}];
|
swapDevices =
|
||||||
|
[{ device = "/dev/disk/by-uuid/0203b641-280f-4a3d-971d-fd32a666c852"; }];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
{
|
{ pkgs, config, ... }:
|
||||||
pkgs,
|
let
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
services.openssh.knownHosts = {
|
services.openssh.knownHosts = {
|
||||||
"cloud.pub.solar".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIABPJSwr9DfnqV0KoL23BcxlWtRxuOqQpnFnCv4SG/LW";
|
"cloud.pub.solar".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIABPJSwr9DfnqV0KoL23BcxlWtRxuOqQpnFnCv4SG/LW";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
{pkgs, ...}: let
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
shutdownWaitMinutes = 15;
|
shutdownWaitMinutes = 15;
|
||||||
shutdownScript = pkgs.writeShellScriptBin "shutdown-wait" ''
|
shutdownScript = pkgs.writeShellScriptBin "shutdown-wait" ''
|
||||||
STATUS_FILES="/media/internal/backups-pub-solar/status"
|
STATUS_FILES="/media/internal/backups-pub-solar/status"
|
||||||
|
|
@ -30,7 +32,8 @@
|
||||||
|
|
||||||
shutdown -P +${builtins.toString shutdownWaitMinutes}
|
shutdown -P +${builtins.toString shutdownWaitMinutes}
|
||||||
'';
|
'';
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
systemd.services."shutdown-after-backup" = {
|
systemd.services."shutdown-after-backup" = {
|
||||||
enable = true;
|
enable = true;
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
let
|
let
|
||||||
lock = builtins.fromJSON (builtins.readFile builtins.path {
|
lock = builtins.fromJSON (builtins.readFile builtins.path { path = ../../flake.lock; name = "lockPath"; });
|
||||||
path = ../../flake.lock;
|
flake = (import
|
||||||
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";
|
||||||
|
|
@ -12,10 +8,7 @@ let
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
src = builtins.path {
|
src = builtins.path { path = ../../.; name = "projectRoot"; };
|
||||||
path = ../../.;
|
});
|
||||||
name = "projectRoot";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
flake
|
flake
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{...}: let
|
{ ... }:
|
||||||
|
let
|
||||||
inherit (default.inputs.nixos) lib;
|
inherit (default.inputs.nixos) lib;
|
||||||
|
|
||||||
host = configs.${hostname} or configs.PubSolarOS;
|
host = configs.${hostname} or configs.PubSolarOS;
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
@ -16,8 +13,7 @@ in {
|
||||||
extraGroups = [ "dialout" ];
|
extraGroups = [ "dialout" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
arduino
|
arduino
|
||||||
arduino-cli
|
arduino-cli
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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";
|
||||||
|
|
@ -27,10 +24,8 @@ in {
|
||||||
extraGroups = [ "audio" ];
|
extraGroups = [ "audio" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
home.packages = [
|
||||||
home.packages =
|
|
||||||
[
|
|
||||||
# easyeffects, e.g. for microphone noise filtering
|
# easyeffects, e.g. for microphone noise filtering
|
||||||
easyeffects
|
easyeffects
|
||||||
mu
|
mu
|
||||||
|
|
@ -40,12 +35,7 @@ in {
|
||||||
# Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
|
# Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
|
||||||
pulseaudio
|
pulseaudio
|
||||||
vimpc
|
vimpc
|
||||||
]
|
] ++ (if cfg.spotify.enable then [ pkgs.spotify-tui ] else [ ]);
|
||||||
++ (
|
|
||||||
if cfg.spotify.enable
|
|
||||||
then [pkgs.spotify-tui]
|
|
||||||
else []
|
|
||||||
);
|
|
||||||
xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
|
xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
|
||||||
systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
|
systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
|
||||||
|
|
||||||
|
|
@ -64,8 +54,6 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# rtkit is optional but recommended
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
# Enable sound using pipewire-pulse
|
# Enable sound using pipewire-pulse
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
pkgs: {
|
pkgs:
|
||||||
|
{
|
||||||
Service = {
|
Service = {
|
||||||
Type = "dbus";
|
Type = "dbus";
|
||||||
BusName = "com.github.wwmm.easyeffects";
|
BusName = "com.github.wwmm.easyeffects";
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,10 @@
|
||||||
{
|
{
|
||||||
"name": "libpipewire-module-rtkit",
|
"name": "libpipewire-module-rtkit",
|
||||||
"args": {},
|
"args": {},
|
||||||
"flags": ["ifexists", "nofail"]
|
"flags": [
|
||||||
|
"ifexists",
|
||||||
|
"nofail"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "libpipewire-module-protocol-native"
|
"name": "libpipewire-module-protocol-native"
|
||||||
|
|
@ -25,7 +28,10 @@
|
||||||
{
|
{
|
||||||
"name": "libpipewire-module-protocol-pulse",
|
"name": "libpipewire-module-protocol-pulse",
|
||||||
"args": {
|
"args": {
|
||||||
"server.address": ["unix:native", "tcp:4713"],
|
"server.address": [
|
||||||
|
"unix:native",
|
||||||
|
"tcp:4713"
|
||||||
|
],
|
||||||
"vm.overrides": {
|
"vm.overrides": {
|
||||||
"pulse.min.quantum": "1024/48000"
|
"pulse.min.quantum": "1024/48000"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, self, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,6 @@
|
||||||
{
|
{ 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.settings.extra-sandbox-paths = ["/bin/sh=${pkgs.bash}/bin/sh"];
|
nix.sandboxPaths = [ "/bin/sh=${pkgs.bash}/bin/sh" ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,9 @@
|
||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.pub-solar.core;
|
cfg = config.pub-solar.core;
|
||||||
in {
|
in
|
||||||
|
with lib;
|
||||||
|
{
|
||||||
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;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
{
|
{ config, lib, ... }:
|
||||||
config,
|
|
||||||
lib,
|
with lib;
|
||||||
...
|
let
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.pub-solar.core;
|
cfg = config.pub-solar.core;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./boot.nix
|
./boot.nix
|
||||||
./hibernation.nix
|
./hibernation.nix
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
|
{ 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 = {
|
||||||
|
|
@ -12,3 +9,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,9 @@
|
||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
with lib;
|
||||||
pkgs,
|
let
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.pub-solar.core.hibernation;
|
cfg = config.pub-solar.core.hibernation;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.core.hibernation = {
|
options.pub-solar.core.hibernation = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
|
{ 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";
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,10 @@
|
||||||
|
{ 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;
|
||||||
|
|
@ -29,9 +27,8 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
# disable NetworkManager and systemd-networkd -wait-online by default
|
# disable NetworkManager-wait-online by default
|
||||||
systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
|
systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
|
||||||
systemd.services.systemd-networkd-wait-online.enable = lib.mkDefault false;
|
|
||||||
|
|
||||||
networking.networkmanager = {
|
networking.networkmanager = {
|
||||||
# Enable networkmanager. REMEMBER to add yourself to group in order to use nm related stuff.
|
# Enable networkmanager. REMEMBER to add yourself to group in order to use nm related stuff.
|
||||||
|
|
@ -42,18 +39,19 @@ in {
|
||||||
networking.firewall.enable = true;
|
networking.firewall.enable = true;
|
||||||
|
|
||||||
# Customized binary caches list (with fallback to official binary cache)
|
# Customized binary caches list (with fallback to official binary cache)
|
||||||
nix.settings.substituters = cfg.binaryCaches;
|
nix.binaryCaches = cfg.binaryCaches;
|
||||||
nix.settings.trusted-public-keys = cfg.publicKeys;
|
nix.binaryCachePublicKeys = cfg.publicKeys;
|
||||||
|
|
||||||
# These entries get added to /etc/hosts
|
# These entries get added to /etc/hosts
|
||||||
networking.hosts = let
|
networking.hosts =
|
||||||
hostnames =
|
let
|
||||||
[]
|
hostnames = [ ]
|
||||||
++ lib.optionals cfg.enableCaddy [ "caddy.local" ]
|
++ lib.optionals cfg.enableCaddy [ "caddy.local" ]
|
||||||
++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ]
|
++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ]
|
||||||
++ lib.optionals config.pub-solar.paperless.enable [ "paperless.local" ]
|
++ lib.optionals config.pub-solar.paperless.enable [ "paperless.local" ]
|
||||||
++ lib.optionals cfg.enableHelp [ "help.local" ];
|
++ lib.optionals cfg.enableHelp [ "help.local" ];
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
"127.0.0.1" = hostnames;
|
"127.0.0.1" = hostnames;
|
||||||
"::1" = hostnames;
|
"::1" = hostnames;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,19 @@
|
||||||
|
{ 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;
|
||||||
|
# Improve nix store disk usage
|
||||||
|
autoOptimiseStore = true;
|
||||||
gc.automatic = true;
|
gc.automatic = true;
|
||||||
optimise.automatic = true;
|
optimise.automatic = true;
|
||||||
settings = {
|
|
||||||
# Improve nix store disk usage
|
|
||||||
auto-optimise-store = true;
|
|
||||||
# Prevents impurities in builds
|
# Prevents impurities in builds
|
||||||
sandbox = true;
|
useSandbox = true;
|
||||||
# give root and @wheel special privileges with nix
|
# give root and @wheel special privileges with nix
|
||||||
trusted-users = ["root" "@wheel"];
|
trustedUsers = [ "root" "@wheel" ];
|
||||||
# This is just a representation of the nix default
|
# This is just a representation of the nix default
|
||||||
system-features = ["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
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,13 @@
|
||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
|
||||||
pkgs,
|
with lib;
|
||||||
lib,
|
let
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.core;
|
cfg = config.pub-solar.core;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = with pkgs;
|
systemPackages = with pkgs; [
|
||||||
[
|
|
||||||
# Core unix utility packages
|
# Core unix utility packages
|
||||||
coreutils-full
|
coreutils-full
|
||||||
dnsutils
|
dnsutils
|
||||||
|
|
@ -37,6 +34,7 @@ in {
|
||||||
croc
|
croc
|
||||||
jq
|
jq
|
||||||
]
|
]
|
||||||
|
|
||||||
++ lib.optionals (!cfg.lite) [
|
++ lib.optionals (!cfg.lite) [
|
||||||
mtr
|
mtr
|
||||||
|
|
||||||
|
|
@ -60,7 +58,6 @@ in {
|
||||||
exfat
|
exfat
|
||||||
|
|
||||||
# Nix specific utilities
|
# Nix specific utilities
|
||||||
alejandra
|
|
||||||
niv
|
niv
|
||||||
manix
|
manix
|
||||||
nix-index
|
nix-index
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
|
{ 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;
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
@ -19,8 +16,7 @@ in {
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
|
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
|
||||||
|
|
||||||
services.gpg-agent = {
|
services.gpg-agent = {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
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/" ];
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,16 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
croc
|
croc
|
||||||
drone-cli
|
drone-cli
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,17 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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;
|
users.users = with pkgs; pkgs.lib.setAttrByPath [ psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath [psCfg.user.name] {
|
|
||||||
extraGroups = [ "docker" ];
|
extraGroups = [ "docker" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,16 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
w3m
|
w3m
|
||||||
urlscan
|
urlscan
|
||||||
|
|
|
||||||
1
modules/email/offlineimap.nix
Normal file
1
modules/email/offlineimap.nix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
@ -18,8 +15,8 @@ in {
|
||||||
steam = pkgs.steam.override { };
|
steam = pkgs.steam.override { };
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users = pkgs.lib.setAttrByPath [psCfg.user.name] {
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
home.packages = with pkgs; [
|
home.packages = [
|
||||||
playonlinux
|
playonlinux
|
||||||
godot
|
godot
|
||||||
obs-studio
|
obs-studio
|
||||||
|
|
|
||||||
1
modules/gaming/steam.nix
Normal file
1
modules/gaming/steam.nix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -66,97 +66,29 @@
|
||||||
x = 0;
|
x = 0;
|
||||||
y = 0;
|
y = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use_thin_strokes = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
key_bindings = [
|
key_bindings = [
|
||||||
{
|
{ key = "V"; mods = "Control|Alt"; action = "Paste"; }
|
||||||
key = "V";
|
{ key = "C"; mods = "Control|Alt"; action = "Copy"; }
|
||||||
mods = "Control|Alt";
|
{ key = "Paste"; action = "Paste"; }
|
||||||
action = "Paste";
|
{ key = "Copy"; action = "Copy"; }
|
||||||
}
|
{ key = "Q"; mods = "Command"; action = "Quit"; }
|
||||||
{
|
{ key = "W"; mods = "Command"; action = "Quit"; }
|
||||||
key = "C";
|
{ key = "Insert"; mods = "Shift"; action = "PasteSelection"; }
|
||||||
mods = "Control|Alt";
|
{ key = "Key0"; mods = "Control"; action = "ResetFontSize"; }
|
||||||
action = "Copy";
|
{ key = "Equals"; mods = "Control"; action = "IncreaseFontSize"; }
|
||||||
}
|
{ key = "PageUp"; mods = "Shift"; action = "ScrollPageUp"; }
|
||||||
{
|
{ key = "PageDown"; mods = "Shift"; action = "ScrollPageDown"; }
|
||||||
key = "Paste";
|
{ key = "Minus"; mods = "Control"; action = "DecreaseFontSize"; }
|
||||||
action = "Paste";
|
{ key = "H"; mode = "Vi|~Search"; action = "ScrollToBottom"; }
|
||||||
}
|
{ key = "H"; mode = "Vi|~Search"; action = "ToggleViMode"; }
|
||||||
{
|
{ key = "I"; mode = "Vi|~Search"; action = "Up"; }
|
||||||
key = "Copy";
|
{ key = "K"; mode = "Vi|~Search"; action = "Down"; }
|
||||||
action = "Copy";
|
{ key = "J"; mode = "Vi|~Search"; action = "Left"; }
|
||||||
}
|
{ 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
|
||||||
|
|
@ -232,30 +164,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
indexed_colors = [
|
indexed_colors = [
|
||||||
{
|
{ index = 16; color = "0xdf5923"; }
|
||||||
index = 16;
|
{ index = 17; color = "0xd70000"; }
|
||||||
color = "0xdf5923";
|
{ index = 18; color = "0x2d2a2e"; }
|
||||||
}
|
{ index = 19; color = "0x303030"; }
|
||||||
{
|
{ index = 20; color = "0xd3d1d4"; }
|
||||||
index = 17;
|
{ index = 21; color = "0x303030"; }
|
||||||
color = "0xd70000";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 18;
|
|
||||||
color = "0x2d2a2e";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 19;
|
|
||||||
color = "0x303030";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 20;
|
|
||||||
color = "0xd3d1d4";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
index = 21;
|
|
||||||
color = "0x303030";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,13 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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: let
|
recursiveMerge = attrList:
|
||||||
|
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
|
||||||
|
|
@ -22,7 +18,8 @@ with lib; let
|
||||||
);
|
);
|
||||||
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 = {
|
||||||
|
|
@ -95,8 +92,7 @@ in {
|
||||||
source-sans-pro
|
source-sans-pro
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
alacritty
|
alacritty
|
||||||
foot
|
foot
|
||||||
|
|
@ -145,6 +141,7 @@ in {
|
||||||
gtk-xft-rgba = "rgb";
|
gtk-xft-rgba = "rgb";
|
||||||
gtk-application-prefer-dark-theme = "true";
|
gtk-application-prefer-dark-theme = "true";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Fix KeepassXC rendering issue
|
# Fix KeepassXC rendering issue
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
pkgs: {
|
pkgs:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "Lightweight Wayland notification daemon";
|
Description = "Lightweight Wayland notification daemon";
|
||||||
BindsTo = [ "sway-session.target" ];
|
BindsTo = [ "sway-session.target" ];
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.mobile;
|
cfg = config.pub-solar.mobile;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.mobile = {
|
options.pub-solar.mobile = {
|
||||||
enable = mkEnableOption "Add android adb and tooling";
|
enable = mkEnableOption "Add android adb and tooling";
|
||||||
};
|
};
|
||||||
|
|
@ -15,8 +12,7 @@ in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
|
|
||||||
users.users = with pkgs;
|
users.users = with pkgs; lib.setAttrByPath [ psCfg.user.name ] {
|
||||||
lib.setAttrByPath [psCfg.user.name] {
|
|
||||||
extraGroups = [ "adbusers" ];
|
extraGroups = [ "adbusers" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,16 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
|
systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
pkgs: {
|
pkgs:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "Nextcloud Client";
|
Description = "Nextcloud Client";
|
||||||
BindsTo = [ "sway-session.target" ];
|
BindsTo = [ "sway-session.target" ];
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ channel, inputs, ... }: {
|
||||||
channel,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
nix.nixPath = [
|
nix.nixPath = [
|
||||||
"nixpkgs=${channel.input}"
|
"nixpkgs=${channel.input}"
|
||||||
"nixos-config=${../lib/compat/nixos}"
|
"nixos-config=${../lib/compat/nixos}"
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
@ -17,8 +14,7 @@ in {
|
||||||
|
|
||||||
# Gnome PDF viewer
|
# Gnome PDF viewer
|
||||||
programs.evince.enable = true;
|
programs.evince.enable = true;
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
libreoffice-fresh
|
libreoffice-fresh
|
||||||
gnome.simple-scan
|
gnome.simple-scan
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
cfg = config.pub-solar.paperless;
|
cfg = config.pub-solar.paperless;
|
||||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.paperless = {
|
options.pub-solar.paperless = {
|
||||||
enable = mkEnableOption "All you need to go paperless";
|
enable = mkEnableOption "All you need to go paperless";
|
||||||
ocrLanguage = mkOption {
|
ocrLanguage = mkOption {
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
{
|
{ config, lib, ... }:
|
||||||
config,
|
|
||||||
lib,
|
with 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 = ''
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,16 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
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;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
signal-desktop
|
signal-desktop
|
||||||
tdesktop
|
tdesktop
|
||||||
|
|
|
||||||
|
|
@ -1,45 +1,23 @@
|
||||||
{
|
{ 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 ''
|
||||||
+ (
|
|
||||||
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
|
set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
|
||||||
''
|
'' else if psCfg.paranoia.enable then ''
|
||||||
else if psCfg.paranoia.enable
|
|
||||||
then ''
|
|
||||||
set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown
|
set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown
|
||||||
''
|
'' else ''
|
||||||
else ''
|
|
||||||
set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
|
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 ''
|
||||||
+ (
|
|
||||||
if psCfg.core.hibernation.enable
|
|
||||||
then ''
|
|
||||||
bindsym h exec systemctl hibernate, mode "default"
|
bindsym h exec systemctl hibernate, mode "default"
|
||||||
''
|
'' else "")
|
||||||
else ""
|
+ (if !psCfg.paranoia.enable then ''
|
||||||
)
|
|
||||||
+ (
|
|
||||||
if !psCfg.paranoia.enable
|
|
||||||
then ''
|
|
||||||
bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"
|
bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"
|
||||||
bindsym s exec systemctl suspend, mode "default"
|
bindsym s exec systemctl suspend, mode "default"
|
||||||
''
|
'' else "") + ''
|
||||||
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"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
{
|
{ 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.
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
{
|
{ psCfg, pkgs }: "
|
||||||
psCfg,
|
|
||||||
pkgs,
|
|
||||||
}: "
|
|
||||||
address=0.0.0.0
|
address=0.0.0.0
|
||||||
enable_auth=true
|
enable_auth=true
|
||||||
username=${psCfg.user.name}
|
username=${psCfg.user.name}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,9 @@
|
||||||
{
|
{ lib, config, pkgs, ... }:
|
||||||
lib,
|
with lib;
|
||||||
config,
|
let
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
psCfg = config.pub-solar;
|
psCfg = config.pub-solar;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.pub-solar.sway = {
|
options.pub-solar.sway = {
|
||||||
enable = mkEnableOption "Life in boxes";
|
enable = mkEnableOption "Life in boxes";
|
||||||
|
|
||||||
|
|
@ -34,7 +31,7 @@ in {
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
||||||
{
|
({
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
linuxPackages.v4l2loopback
|
linuxPackages.v4l2loopback
|
||||||
];
|
];
|
||||||
|
|
@ -54,12 +51,12 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
|
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
|
||||||
|
gtkUsePortal = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.pipewire.enable = true;
|
services.pipewire.enable = true;
|
||||||
|
|
||||||
home-manager = with pkgs;
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
sway
|
sway
|
||||||
grim
|
grim
|
||||||
|
|
@ -99,10 +96,6 @@ in {
|
||||||
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; };
|
||||||
|
|
||||||
systemd.user.services.wayvnc = mkIf psCfg.sway.vnc.enable (import ./wayvnc.service.nix pkgs);
|
systemd.user.services.wayvnc = mkIf psCfg.sway.vnc.enable (import ./wayvnc.service.nix pkgs);
|
||||||
xdg.configFile."wayvnc/config".text = import ./config/wayvnc/config.nix {
|
|
||||||
inherit psCfg;
|
|
||||||
inherit pkgs;
|
|
||||||
};
|
|
||||||
|
|
||||||
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;
|
||||||
|
|
@ -112,7 +105,8 @@ in {
|
||||||
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;
|
||||||
|
xdg.configFile."wayvnc/config".text = import ./config/wayvnc/config.nix { inherit psCfg; inherit pkgs; };
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{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)" ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{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" ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{pkgs, ...}: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "Lightweight Wayland notification daemon";
|
Description = "Lightweight Wayland notification daemon";
|
||||||
Documentation = [ "man:mako(1)" ];
|
Documentation = [ "man:mako(1)" ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{pkgs, ...}: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "sway compositor session";
|
Description = "sway compositor session";
|
||||||
Documentation = [ "man:systemd.special(7)" ];
|
Documentation = [ "man:systemd.special(7)" ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{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)" ];
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
|
{ pkgs, psCfg, ... }:
|
||||||
{
|
{
|
||||||
pkgs,
|
|
||||||
psCfg,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
Unit = {
|
Unit = {
|
||||||
Description = "Idle manager for Wayland";
|
Description = "Idle manager for Wayland";
|
||||||
Documentation = [ "man:swayidle(1)" ];
|
Documentation = [ "man:swayidle(1)" ];
|
||||||
|
|
@ -13,21 +10,15 @@
|
||||||
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 =
|
ExecStart = ''swayidle -w \
|
||||||
'' swayidle -w \
|
|
||||||
after-resume 'swaymsg "output * dpms on"' \
|
after-resume 'swaymsg "output * dpms on"' \
|
||||||
before-sleep 'swaylock-bg' ''
|
before-sleep 'swaylock-bg' '' + (if psCfg.paranoia.enable then '' \
|
||||||
+ (
|
|
||||||
if psCfg.paranoia.enable
|
|
||||||
then '' \
|
|
||||||
timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
|
timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
|
||||||
timeout 150 'systemctl hibernate'
|
timeout 150 'systemctl hibernate'
|
||||||
''
|
'' else '' \
|
||||||
else '' \
|
|
||||||
timeout 600 'swaylock-bg' \
|
timeout 600 'swaylock-bg' \
|
||||||
timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
|
timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
|
||||||
''
|
'');
|
||||||
);
|
|
||||||
};
|
};
|
||||||
Install = {
|
Install = {
|
||||||
WantedBy = [ "sway-session.target" ];
|
WantedBy = [ "sway-session.target" ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{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/";
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue