about summary refs log tree commit diff
path: root/machines/aszlig/tishtushi.nix
Commit message (Collapse)AuthorAgeFilesLines
* machines/tishtushi: Add xxhash to available modsaszlig2022-04-011-0/+1
| | | | | | | | | | | | | | | I created the BTRFS module with a few different options than I did initially, one of them is that I changed the checksum algorithm to XXHASH. Unfortunately, the xxhash_generic module providing the algorithm is not available during stage 1, so mounting the volume would fail. In the local configuration.nix I already added it to availableKernelModules, but when I moved the config over to Vuizvui in e04c7e04f2fe63cece7a2f2064212bc055cdd035, I forgot to add it. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tishtushi: Switch to new SSDaszlig2022-04-011-20/+9
| | | | | | | | | | | | | | | | | | | | | | Previously, the machine had an internal SSD with a size of around 20 GB, which until it died in 2018[1] was used as the /nix/store. With dnyarri getting a hardware upgrade[2], the SSD that was used back then as a bcache became obsolete. Given that the spinning rust inside Tishtushi is slow as hell and also way smaller (320 GB) than the former bcache SSD (512 GB), I decided to just replace the spinning rust with the SSD, which should at least make I/O operations bearable while falling asleep on CPU-bound operations. Since the NixOS LUKS setup now also propagates passphrases to other devices, we also no longer need the vault device because the reason it existed was to avoid being prompted multiple times for the passphrase. [1]: 54c99271f7570c32a4215a097e577272cd4210b2 [2]: be0fb40a12b5a9301509ad45fda1eda11971fa8e Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Remove GRUB from base profileaszlig2021-06-021-0/+1
| | | | | | | | | | | After all the goal was to move all hardware specific stuff to the actual machine definition, which includes the boot loader. Since GRUB is enabled by default but with a higher priority value, we now no longer need to mkForce-disable the option for machines using systemd-boot. Signed-off-by: aszlig <aszlig@nix.build>
* machines/dnyarri: Switch to AMD CPU microcodeaszlig2021-06-021-0/+2
| | | | | | | | The new hardware for dnyarri no longer contains an Intel CPU, so apart from switching the microcode updates to AMD I also removed the setting from the base profile because it clearly doesn't belong there. Signed-off-by: aszlig <aszlig@nix.build>
* Use attribute sets for boot.initrd.luks.devicesaszlig2020-09-141-8/+8
| | | | | | | | | | | | | | | | | | | | This was one of the places where types.loaOf was still in place and it got removed a while[1] ago and this in turn causes evaluation to fail for quite a few machines: The option value `boot.initrd.luks.devices' in `...' is not of type `attribute set of submodules'. I've not only changed all the machines to use attribute sets but also fixed the check in core/tests.nix, because comparing against a list when the actual type is an attribute set will result in all the LUKS tests to be part of *all* channels, no matter whether you're actually using LUKS. [1]: https://github.com/NixOS/nixpkgs/commit/20d491a317d9956ddca80913f07 Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch Cc: @sternenseemann
* machines/aszlig: Explicitly set useDHCPaszlig2019-10-081-0/+1
| | | | | | | | | | | | | | | | | | The usage of DHCP is no longer global since a while[1] and we now have to explicitly enable it for the interfaces in question. This actually is a good thing and makes it far less problematic if we use tunnel interfaces and other more complicated networking configuration. I added the definitions for all machines where I actually know which interfaces are in use and disabled useNetworkd for shakti, because I don't know the interface names for that machine and the machine currently isn't in use anyway, so we can add it later if needed. [1]: https://github.com/NixOS/nixpkgs/pull/69302 Signed-off-by: aszlig <aszlig@nix.build>
* tishtushi: Remove mount for /nix/storeaszlig2018-12-121-10/+0
| | | | | | | | | | | | The internal SSD of the machine just died, so I reconstructed the Nix store on the spinning rust from the machine configuration and we're now left without the SSD. Maybe it makes sense to still use the SSD with bcache, depending on how failure-resilient it is, but for now, let's just remove it so we at least have a working system. Signed-off-by: aszlig <aszlig@nix.build>
* tishtushi: Remove fbcon and usb-storage modulesaszlig2018-04-211-1/+0
| | | | | | | | Not sure why I added them in the first place, but it was probably because they were listed in the hardware config generated by nixos-generate-config. Signed-off-by: aszlig <aszlig@nix.build>
* machines: Remove unneeded crypto modules in initrdaszlig2018-04-211-4/+0
| | | | | | | These were needed a few months ago but they're now automatically added if boot.initrd.luks.devices is non-empty. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tishtushi: Use latest release kernelaszlig2018-04-211-2/+3
| | | | | | | I'm a bit tired of constantly running into regression from release canidate kernels, so let's switch to released kernels for now. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tishtushi: Remove discard option in /nixaszlig2018-04-211-1/+1
| | | | | | | We no longer write directly to the physical block device, so let's not try to TRIM a mapper device. Signed-off-by: aszlig <aszlig@nix.build>
* tishtushi: Change to new partitioning schemeaszlig2018-04-211-16/+43
| | | | | | | | | | | I had to recover tishtushi while on the road because I have used zstd compression, which GRUB doesn't support. So instead of just adding a boot partition I decided to actually do what I long wanted to do, which is to actually encrypt the disks, so the new partitioning reflects that. Signed-off-by: aszlig <aszlig@nix.build>
* machines/aszlig: Use zstd compression for btrfsaszlig2018-02-041-2/+2
| | | | | | | I've been using this for a while and got better results than zlib and lzo, so let's actually use this for all my machines. Signed-off-by: aszlig <aszlig@nix.build>
* machines/tishushi: Remove obsolete synergy clientaszlig2017-10-301-3/+0
| | | | | | | I'm no longer using Synergy for anything, so let's prevent synergc from attempting to connect to a non-existant server. Signed-off-by: aszlig <aszlig@nix.build>
* Introduce new system.kernel.useBleedingEdge optionaszlig2017-07-201-1/+2
| | | | | | | | | | | | 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>
* machines/aszlig: Revert whitelisting webkitgtkaszlig2017-04-191-5/+0
| | | | | | | | | | | | | | 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>
* machines/aszlig: temporarily whitelist webkitgtksternenseemann2017-03-071-0/+5
| | | | | | | | 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!
* machines/aszlig: Remove "with lib;"aszlig2017-01-021-4/+2
| | | | | | | | | | | 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>
* Move taalo-build to workstation profileaszlig2016-12-151-1/+0
| | | | | | | 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>
* tishtushi: Switch to common kernel configaszlig2016-11-281-23/+2
| | | | | | | | | | | 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>
* tishtushi: Update BFQ scheduler patch for v4.9-rc2aszlig2016-10-271-4/+10
| | | | | | | | | | | | | | | | 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>
* kernel: Switch to use boot.kernelPatchesaszlig2016-10-131-14/+13
| | | | | | | | 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>
* machines/tishtushi: Set boot loader timeout to 1saszlig2016-08-301-1/+1
| | | | | | | | 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>
* machines/tishtushi: Add BFQ patch replacing CFQaszlig2016-08-301-9/+10
| | | | | | | | | | | | | | | | 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>
* machines/tishtushi: Fix bootloader timeout optionaszlig2016-06-041-1/+1
| | | | | | | As of NixOS/nixpkgs@32bed83 the boot loader specific timeout options are gone and there is only a single option for all boot loaders now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/aszlig: Use lists for filesystem optionsaszlig2016-02-151-6/+2
| | | | | | | | | We had this since NixOS/nixpkgs@3c5fca9 and since the merge of master into closure-size (NixOS/nixpkgs@d039c87) we also have it there, so there is no excuse now to not switch to lists, especially because we already used concatStringsSep on lists anyway. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Fix overriding kernel patchesaszlig2016-01-281-3/+3
| | | | | | | | | | | | | | | | | | | | The commit NixOS/nixpkgs@23f5e3c directly provides kernelPatches to the build attributes and we did an override by passing back the kernelPatches attributes from the result instead of the original arguments. So instead of using the resulting arguments, we simply reinject the kernelPatches attribute from the input arguments. Tested using: nix-instantiate --eval --strict -I nixpkgs=/home/aszlig/nixpkgs -E ' with import <nixpkgs/lib>; let with ((import ./machines {}).aszlig.tishtushi) eval; in map (getAttr "name") eval.config.boot.kernelPackages.kernel.kernelPatches ' Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Enable taalo-build.aszlig2015-12-141-0/+1
| | | | | | | It's my primary laptop and it has a very limited bandwidth to the internet right now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tishtushi: Revert patching Dragonfly quirk.aszlig2015-11-161-3/+1
| | | | | | | | | | | | | | | This reverts commit 7f9f88e90b8ab41a97a86fa4ff8a501e0e0eea27. The reason why I'm reverting this is because while it indeed fixes the volume mapping, it doesn't fix my main problem that it takes a few seconds to go from 100% volume to the desired volume level that's currently set. So instead of applying this patch and maintaining it until it may eventually hit mainline, it's better to debug the original issue rather than applying a patch that _may_ fix an unrelated issue. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tishtushi: Enable Synaptics tapButtons.aszlig2015-11-071-1/+1
| | | | | | | | | | I had these disabled because I prefer to actually press the touch pad. Unfortunately I spilled liquid into the touch pad which causes the "press" veent to no longer work. So let's bring back these annoying tap buttons. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tishtushi: Patch quirk for AudioQuest Dragonfly.aszlig2015-10-161-1/+3
| | | | | | | | | It's already in version 4.3-rc5, but the following patch seems to be more correct: http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096516.html Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Add to synergy configuration.aszlig2015-10-131-0/+3
| | | | | | | | | Having to switch keyboards when I have my laptop at home is quite annoying, so let's add the laptop (tishtushi) to the synergy config but without setting a mouse region so it won't get more annoying than switching keyboards ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/aszlig: Remove CONFIG_CGROUP_BFQIO.aszlig2015-10-071-1/+0
| | | | | | Since the new BFQ patch, this option does no longer exist. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Fix conflicting definitions for wireless.enable.aszlig2015-06-161-1/+1
| | | | | | | | | Since NixOS/nixpkgs@e212e07, boolean options don't default to true anymore if they're defined multiple times. So we need to explicitly override the value for networking.wireless.enable, because we have set it to false in the base profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Add Synaptics configuration.aszlig2015-05-041-0/+5
| | | | | | | | | | Not really optimized to what I would like it to, but much better than with the default setup and it's annoying tap buttons. Odds are greater that I might switch back to keynav instead of investing more time in configuring a pointing device. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Remove references to pkgs.lib within modules.aszlig2015-04-041-2/+2
| | | | | | | | We now no longer can (or even should) refer to pkgs.lib within modules since the merge of the module system improvements in NixOS/nixpkgs@889f72b. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/tishtushi: Fix evaluation error.aszlig2015-03-181-1/+1
| | | | | | | | Regression is from 012fc8e4f399af06ab013ba136fe1d2cffb913f1. We have renamed the package, so let's put in the right attribute path. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move common{-workstation}.nix into profiles.aszlig2015-03-181-1/+1
| | | | | | | | | | | | Both files are specific to my machines only and need to be generalized in order to be useful for anyone else. Moving these files has a few other censequences, such that we now need to automatically import the module-list.nix in callMachine. Speaking of module-list.nix, the file is now alphabetically sorted. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Move own machines into machines/aszlig.aszlig2015-03-181-0/+65
Introduces callMachine in machines/default.nix, which returns an attribute set containing the (input) configuration and also a build attribute containing the output configuration and thus also the builds. However, we still have references to ../../common-workstation.nix which we need to refactor very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>