| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Signed-off-by: devhell <devhell@mailfresser.de>
|
|
|
|
|
|
|
| |
For whatever reason the /boot configuration was missing and subsequently
nixos-rebuild would fail. Thanks for pointing out the error @aszlig!
Signed-off-by: devhell <devhell@mailfresser.de>
|
|
|
|
|
|
|
| |
Let's see how the touchpad on this new laptop behaves with libinput
instead of synaptics.
Signed-off-by: devhell <devhell@mailfresser.de>
|
|
|
|
|
|
|
| |
I no longer need to actively debug the kernel or do much development on
the machine, so this is no longer needed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This reverts commit 2e90b9562939208e5392790834c6ffd89aede692.
Sorry about this. I was wrong as it seems networking.wireless is
required for connman.
|
|
|
|
| |
Not even sure if it is needed anymore to keep connman working.
|
| |
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
This merges pull request #15 and thus also introduces @devhell as a new
member of vuizvui.
Changes were approved by @devhell via XMPP.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 646e0cb3dede3880ed578d09b7337445990f5416.
The layout checker has been fixed in NixOS/nixpkgs@44c64fef16ed566786c8.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This introduces another profile module called "packages", which contains
all the package configuration (including overrides) of all the machines
in the devhell namespace.
The machine-specific configuration is now merged into the machine
configurations the same way as we've done previously with the services.
One major difference here is that the haskellPackages workaround is no
longer needed in the package configuration, as it is handled by vuizvui.
Tested this by evaluating all machines and all evaluations succeeded.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
I've added another profile called "services", which now resembles the
services_common.nix from the previous configuration.
The machine-specific definitions now reside directly inside the
machine's Nix expressions for now, until they're properly refactored.
Most of these machine-specific values can be easily modularized,
especially the xrdb config, for example having one base xrdb module
and only small machine-specific definitions if stuff needs to be
overridden.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Those definitions are machine-specific, so IMHO it doesn't make sense to
abstract those options because in the end they're bound to a specific
machine nonetheless and won't be re-used.
If one day it's necessary to re-use these definitions it still can be
done very easily.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In his configuration he had machine_common.nix which was imported from
the other machine_*.nix files. However in order to start modularizing
I've converted machine_common.nix into a proper NixOS module which now
resides in modules/user/devhell/profiles/base.nix and can be simply
activated via:
vuizvui.user.devhell.profiles.base.enable = true;
Apart from that I've removed the following configuration definitiens
from machine_common.nix:
nix.binaryCaches = [
"https://headcounter.org/hydra/"
"https://cache.nixos.org/"
];
nix.requireSignedBinaryCaches = true;
nix.binaryCachePublicKeys = [
"headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
];
nix.nixPath = lib.mkOptionDefault [
"nixpkgs=/home/dev/git/remote/other_github/nixpkgs"
];
The reason for removing them is because we already handle that via the
vuizvui core modules (modules/core/common.nix).
I've tested this by evaluating the machines by temporarily setting
"allowUnfree = true" (which is part of another module I didn't migrate
yet) and it succeeds.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The package fails because the mtp-jolla.patch was already applied
upstream, see the following build log:
https://headcounter.org/hydra/log/d21f1590i2hs6xhgkdr00906ksnvgxfz-libmtp-1.1.13.drv
This is the upstream commit by @Profpatsch that's now part of libmtp
version 1.1.13:
https://sourceforge.net/p/libmtp/code/ci/8919ebeef58251639454c2394c0274597be3df9c/
Tested by evaluating machines.profpatsch.katara.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
We only use the firmware blobs for the CPU microcode and the GPU, both
of them are redistributable so there is no need to enable those that
have even more licensing restrictions.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Tomahawk is no longer actively developed and the current state within
vuizvui is also broken. So after asking the users of brawndo and tyree
whether they still use it they answered with a "no", so it doesn't make
sense to fix up that package if noone is using it anyway.
This has also been announced via the README in the official GitHub
repository, where the change + comments can be seen here:
https://github.com/tomahawk-player/tomahawk/commit/c8389592488c07079
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Evaluation error introduced by 736e0da1e251df836b1669ffee80cecfd6bbf0e9.
The attribute "hledger" isn't a top-level pkgs attribute but resides
within haskellPackages.
This fixes evaluation, as tested by:
nix-instantiate machines -A profpatsch.katara.build
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Hopefully temporarily.
|
| |
|
|
|
|
|
|
|
|
| |
This is for the time being until either NixOS/nixpkgs#21671 has been
resolved or the next major version of Gajim has been released, because
the latter no longer uses pycrypto.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
Tested evaluation using:
nix-instantiate pkgs -A vuizvui.profpatsch.show-qr-code
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This already has started in e0abe1dbbda54c1f048b5d38df05e1a3289216a6
with @Profpatsch putting his packages into its own namespace, so let's
continue on that and move my crap into my own namespace as well.
The only difference in my approach is that I'm now also using a new
function called callPackageScope, which declutters pkgs/default.nix a
bit and moves the individual callPackage invocations into
aszlig/default.nix.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
This clearly is something currently only @Profpatsch wants, so lets move
it into the user namespace.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This makes sense to put into the core module here, because we already
have the public key in there as well and if we want to use the binary
cache outside of a channel it's a good idea to provide it here by
default.
Being a default of course also means that users can easily override this
using:
nix.binaryCaches = mkForce [ "something else" ];
I've also removed the redundant setting of that option in all of the
machine configurations.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @sternenseemann
|
|
|
|
|
|
|
|
| |
Miro is unmaintained and very buggy, while gpodder is a bit more minimal
it's still maintained and also more reliable.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @dwenola
|
|
|
|
|
|
|
|
|
|
|
| |
The derivation name now is just "hplip-VERSION" (eg. "hplip-3.16.11")
instead of "pythonX.Y-hplip-VERSION".
The upstream commit changing this was:
NixOS/nixpkgs@3760c8c7fde6e8b15d19b063579d05018fc2d8b3
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts the following commits:
* f34f60216a94f41e684b2b2a29be9ca5f8f72940
* fb6cd06936a469fad708e1095b5ee25ad1298375
Using permittedInsecurePackages on all my machines isn't something I
want to pursue, because this really affects *one* single package and I
really don't want to whitelist webkitgtk-2.4.11 across all of my
machines.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Unfortunately, mmrnmhrm has died because of three blown up capacitors
which resulted in hard shut downs due to CPU0 temperature values that
were out of range.
At first I assumed a real temperature problem and thus vacuumed the fan
and everything else, applied new thermal paste and it still failed after
a few minutes. What I found a bit odd was the fact that the machine
powered off even though the last reading of the CPU temperature was 40
degrees Celsius, so that definitly wasn't the problem.
So I went on to look for any blown capacitors on the main board, because
that's probably one of the most frequent cause of hardware failure... at
least for mainboards and monitors. One of the three capacitors I found
to be leaking seems to be leading to the CPU temperature sensor as far
as I can tell (I didn't test with a multimeter though, because I have
lent it out to someone else).
While it shouldn't be hard to fix the blown capacitors (apart from the
fact that we had national holiday during the Easter week), my long-term
goal was to make mmrnmhrm obsolete anyway, so it was a good opportunity
to do exactly that.
The reason why I wanted to get rid of mmrnmhrm was that it has been a
very slow machine since commit 2df7ee103a01da34c9c82235bc286dde35e0f1ba,
which was essentially a hardware downgrade back then.
Dnyarri always has been the better machine hardware-wise but I couldn't
use it to its full potential because it had a cooling issue. The latter
has been resolved a few weeks ago, where I replaced the CPU fan and it's
now not only less noisy but stays at below 50 degrees Celsius even on
high load.
Merging mmrnmhrm into dnyarri also means, that we now have a new disk
layout:
+---------------+--------------+--------------+--------------+
| Disk 1 | Disk 2 | Whole disk 3 | Whole disk 4 |
+---------------+--------------+--------------+--------------+
| EFI partition | crypt-vault | crypt-root-3 | crypt-root-4 |
| crypt-swap-1 | crypt-swap-2 +-----------------------------+
| crypt-root-1 | crypt-root-2 |
+---------------+--------------+
Disk 1 and 2 use GUID partitions while disk 3 and 4 don't have a
partition table but use btrfs across the whole device. The crypt-vault
partition is solely for unlocking other crypto volumes so that a single
passphrase unlocks all of the LUKS containers rather than needing to
provide 6 passphrases.
Also, I've migrated to using UEFI for booting, which is why there now is
an EFI partition as well. Having no redundancy on the EFI and the
crypt-vault partitions doesn't hurt so much because in the event of
drive failure all of the containers can still be unlocked via a
passphrase instead of the vault key.
Disk 3 and 4 are the disks that were formerly installed into mmrnmhrm
and now comprise one big btrfs volume together with the two disks (1 and
2) already present inside dnyarri.
Instead of RAID1 on data and metadata, the btrfs file system layout now
is RAID10 for data and metadata.
This merge also removes synergy for obvious reasons (no other machine
anymore) and disables kmscon because it was just a test in the first
place and I found it a bit annoying to work with.
Summary: Mmrnmhrm is (are?) dead, long live dnyarri!
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|