| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
In the end I guess we're going to remove one or more of these, but right
now let's add all of them to have a way to evaluate.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @BrokkoliBerta
|
|
|
|
|
|
|
| |
Actually this is the only one workstation where I use gpodder, so let's
move it there and also don't make it a lazy package.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Both machines are using Plasma along with a few common KDE applications,
so let's actually be more aggressive about deduplicating the options,
because after all whenever these machines start to deviate more from
each other, we can still either override those options or move them out.
I've also cleaned up a few packages, so instead of having mpv *and* vlc
we now have mpv and bomi for both machines. The latter is mostly about
figuring out whether it's actually a good GUI video player, as it is
basically a front-end for mpv.
With this unification this means that some packages which are generally
useful, such as okular and gwenview are now not only available to tyree
but brawndo as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @dwenola, @BrokkoliBerta
|
|
|
|
|
|
|
|
|
|
|
| |
Most of them are KDE PIM applications and kmail so far was already
within the systemPackages in the configuration.nix directly so far.
The one exception to these is kmix (an audio volume mixer), which is
generally useful to have I think.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @BrokkoliBerta
|
|
|
|
|
|
|
|
|
|
|
|
| |
I don't use anything that's machine specific within my Vim
configuration (and even if, we can pass it via the callPackage
arguments) so it's kinda pointless that it's a module instead of a plain
package (override).
This makes it also easier to nix-build the package without the need to
go through the module system.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This dissolves the user.aszlig.system.kernel module, which was not only
to stay on the latest bleeding edge kernel but also to enable BFQ. The
latter has been factored out already a while ago already.
Originally, I had a fully custom kernel config for mmrnmhrm and dnyarri,
but it's no longer the case and thus the user.aszlig.system.kernel
module is now no longer needed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are two other occasions where packageOverrides are still in use,
one of them is @sternenseemann's fliewatuet machine and another one is
@devhell's package profile.
I've replaced every other occurence of packageOverrides and replaced it
with overlays and checked the store path hash after evaluation.
The reason why I left @sternenseemann's fliewatuet alone was that for
I wasn't quite sure whether "bluez = pkgs.bluez5" is still needed or
intentional to pin it to version 5. Because if it's not the case the
packageOverrides can just be dropped because bluez is already bluez5 in
upstream <nixpkgs>.
For @devhell's package profile, I did the conversion, but the store path
turned out to be a different one than what it was prior to the change.
I did take a quick look at the requisites of the drv and found that sox
was one of the different paths that led to the change in the final store
path.
This obviously needs to be tested and/or investigated first.
Other than that, the main reason why I'm moving everything to overlays
is that it's the replacement for packageOverrides and also has a better
way to pass through chains of overrides than packageOverrides had.
My guess is that after NixOS 17.09, the old packageOverrides function
will be removed, so let's make sure we're ready for that.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @devhell, @sternenseemann
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
|
| |
webkitgtk-2.4.11 is insecure, I am whitelisting it for now to fix the
evaluation errors on the hydra.
Consider, what you want to do on the issue long term, or just revert
this commit as soon as the CVEs are fixed upstream, @aszlig!
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes the attributes accordingly to the following two upstream
commits:
* NixOS/nixpkgs@f21d4d00152726c02f870cb20faba4aca18ef49a
* NixOS/nixpkgs@8eb4d2afbc1d61d316073f25f5885a46ccb37ea2
The first renames desktopManager.kde5 to desktopManager.plasma5 and the
second one removes the kde5 attribute from the top-level packages set
and puts applications in kdeApplications instead.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
This machine hasn't been in use since a year or even longer and the
successor machine (brawndo) is already in use since a while, so we can
safely drop the machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Needed for access to Kobo reader.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
I guess it's time very soon[TM] to switch these machines to a common
profile, because I got rid of the legacy KDM for tyree already.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This is mainly to distinguish the prompt color from my workstations so
it's clearly obvious that I'm working on meshuggah rather than say
mmrnmhrm.
We needed to add another option to the zsh module so that we can easily
override machine colors for other machines as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Currently only a very minimal base configuration, nothing too fancy yet.
The machine is going to serve as a audio/media server in my living room.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This machine is used for collecting all that useless paperwork gathered
since a few years, so I need scanner support.
Unfortunately the scanner (it's part of a HP Officejet all-in-one
thingy) needs to have a proprietary plugin for hplip in order to work,
which is not nice and I'm not very proud about needing to do this.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
I now prefer to explicitly state the function along with the "lib."
namespace instead of making it available over the whole scope of the
module.
One of the main reasons for this is that you can do early error checking
with nix-instantiate --parse.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently I just needed to support HP printers and scanners among all
the managed machines, so I thought it would be a good oportunity to
start a common profile for end user machines.
Right now there isn't that much factored out yet, but instead of copy &
pasting the printer/scanner config into all three machines I'm putting
it into the profile.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
I use this machine to archive all the crap that's piling up over the
years and paperwork is quite useful in this regard :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
I need this on all my machines, so nix-env'ing it on every machine on
demand was getting tedious over time.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
We want to have sandboxed builds and a read-only store. Might make sense
to apply this to all machines in the long term.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This brings tishtushi in par with dnyarri and mmrnmhrm, because the
patch for the BFQ scheduler doesn't apply, while the one we already have
in pkgs.vuizvui.kernel.bfqsched *does* apply.
Besides it doesn't make sense to use different versions of the *same*
patch within the same repository.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
This is needed mostly for the GPUs and for KMS to hopefully work.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've been patching these machines up since ages and I'm tired now to do
both kernel configs *again* for the recent kernel versions.
Of course, in the long run I still want them to have their customized
kernel, but right now it's better to have a recent generic kernel rather
than have a fucked up custom kernel.
Also, this removes all that cruft for the Intel HDA pinning on dnyarri,
because the machine now has two X-Fi sound cards.
Both machines probably won't boot now, so we'll have to adjust a few
things very soon.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The rebased patch has been announced upstream at:
https://groups.google.com/forum/#!topic/bfq-iosched/Et-axgapbrs
Unfortunately the GitHub branch isn't linked there, but it can be found
here:
https://github.com/linusw/linux-bfq/tree/add-bfq-logical
This time the patch adds the BFQ scheduler as an extra scheduler instead
of modifying CFQ, so we need to add extra kernel options again.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Now that internal WiFi is working, we don't need that WiFi dongle
anymore.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@da36847d925058fd86f027b64cc712c57be11ad8 we no
longer need so much cruft to specify kernel patches, so let's switch to
boot.kernelPatches instead of the hackery we had so far.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Not being able to get into boot menu is quite annoying. IIRC I saw some
Grub config in other distros that allow to hold a key to display the
boot menu without the need to set the timeout >0.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far until version 4.7.0 I've used the BFQ patch that adds BFQ as
another I/O scheduler to the kernel. I'm using BFQ as the default
scheduler on this machine, so it makes sense to completely replace the
CFQ scheduler with the BFQ implementation.
Paolo Valente has already ported this to 4.8 according to this post:
https://groups.google.com/d/msg/bfq-iosched/RQNkbDf9rAg/DqgVDGs7AAAJ
So let's just switch to the implementation that might get mainlined
someday.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This now is a top-level attribute and it has been removed from kde5.* in
NixOS/nixpkgs@de27f97e2d612bf372ad625f42d860ca8363dee4.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
We have a real VT for debugging and even if we'd need an XTerm for the
xsession, we can still do so from the VT as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Most of the initial development is done on this laptop and it's going to
get into production mode. So having a Laptop with autologin is kinda
pointless, especially while you're travelling.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Unfortunately, this is a requirement for Steam and other 32bit games, so
let's make sure it's available.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit decd0f04f517e832e2479ec2543141399cc87c80.
Since NixOS/nixpkgs@9f0acda, the containers-imperative NixOS test is
succeeding again, so we don't need this workaround anymore.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch
|
|
|
|
|
|
|
| |
For now the containers-imperative tests are failing and containers
aren't used on this machine either, so let's just disable them.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts the following commits:
4f4c778e424e72d51242dbfadde0a2a806efb68b
22fac6bad53e797ca84d7c7ac7e0fca3c0a912c8
We can now move Tomahawk back to the corresponding profiles/machines,
because the build has been fixed in f7e934e74595a0d7524159d6faa1b2bb5d.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|