about summary refs log tree commit diff
path: root/modules/user/aszlig/profiles/base.nix
Commit message (Collapse)AuthorAgeFilesLines
* profile: Use /run instead of /var/run for shellaszlig2024-02-241-1/+1
| | | | | | | | | | | | | | The /var/run directory no longer is the canonical location for what is now /run and /var/run is also not in /etc/shells, so let's switch to /run instead. From hier(7): /run This directory contains information which describes the system since it was booted. Once this purpose was served by /var/run and programs may continue to use it. Signed-off-by: aszlig <aszlig@nix.build>
* profiles: Revert "Use Nix stable for nixos-option"aszlig2023-09-141-8/+0
| | | | | | | | | | | | | | | | This reverts commit b9a7b3f0710ed828c9ec7562a6e641810fadd61b. Our override is no longer needed and it actually doesn't build anymore since even current stable Nix (2.17.0) is too new for nixos-option. This is why in nixpkgs, there is a specific override for nixos-option which uses Nix 2.15 instead. For us this essentially means that we can drop the override, since either someone fixes nixos-option to work with newer Nix versions or we get a specific override that doesn't interfere with our (as in Vuizvui) override of the "nix" attribute. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Fix XKB Dvorak keyboard layoutaszlig2023-08-021-1/+2
| | | | | | | | | | | | The right XKB configuration should be using "us" as its layout and "dvorak" as the variant, because there are other such variants such as "it", "fr" or "de" and just using "dvorak" as the layout has very long been an alias that now has been removed[1] in the latest version of xkeyboard-config. [1]: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/470ad2cd8fea84d7210377161d86b31999bb5ea6 Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Use Nix stable for nixos-optionaszlig2023-07-141-0/+8
| | | | | | | | | Right now, nixos-option fails to build with latest nixUnstable and since I currently don't have a lot of time to properly fix it and also don't care a whole lot about nixos-option, I decided to override it using the normal Nix stable package. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Fix deprecated option definitionsaszlig2023-03-151-4/+7
| | | | | | | | | | | | | | | | | | | | Essentially gets rid of these warnings: * The option `services.openssh.permitRootLogin' defined in `...' has been renamed to `services.openssh.settings.PermitRootLogin'. * The option `services.openssh.passwordAuthentication' defined in `...' has been renamed to `services.openssh.settings.PasswordAuthentication'. * The option `services.openssh.kbdInteractiveAuthentication' defined in `...' has been renamed to `services.openssh.settings.KbdInteractiveAuthentication'. * The option `nix.readOnlyStore' defined in `...' has been renamed to `boot.readOnlyNixStore'. Evaluation leads to the same derivation path as before, so apart from shutting up warnings this should not change any functionality. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Explicitly set locale categoriesaszlig2023-01-201-0/+12
| | | | | | | | | | | | | | | The default locale is en_US.UTF-8, but this also comes with a 12 hour clock and a few other nuisances such as imperial units. So while I do prefer a German locale I don't want things to be in the German *language*, so setting something like de_DE.UTF-8 for LC_TIME doesn't fly very well, since it could result in something like "Freitag, 20. Januar". To cope with this, I used the C locale to make sure that we get a 24h clock and english week/month names. Similarily I do not want floats to be formatted with a comma. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Revert fix for i3 config validationaszlig2022-11-141-12/+2
| | | | | | | | | This reverts commit 7aa89c91f34c0acf4fe6dc62cf6387a12698853f. The change in question is part of release 4.21.1 and thus we no longer need to keep the patch around. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Add fix for i3 config validationaszlig2022-10-061-2/+12
| | | | | | | | | | | | | Quoting from https://github.com/i3/i3/pull/5173: A bug was introduced in https://github.com/i3/i3/pull/5118 in which configs with bar blocks will segfault during validation. They were copying the i3 font which is not set during validation. This PR simply checks that the load_type is not validated before copying the font. This fixes the Hydra build for the i3 configuration on my machines. Signed-off-by: aszlig <aszlig@nix.build>
* machines + modules: Fix Nix option definitionsaszlig2022-08-151-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the options in nix.conf are now exposed as a submodule with a freeform type and since that change[1] got introduced, we get a bunch of warnings during machine evaluation: trace: warning: The option `nix.useSandbox' defined in `...' has been renamed to `nix.settings.sandbox'. trace: warning: The option `nix.maxJobs' defined in `...' has been renamed to `nix.settings.max-jobs'. trace: warning: The option `nix.buildCores' defined in `...' has been renamed to `nix.settings.cores'. To shut them up, I went through all machines and modules and renamed the remaining options that were not renamed back then when @devhell did some renames in a0297bf921399c3243dcca99626d8697f0735abe. This was done by looking through the output of: $ git grep -A 10 '\<nix\(\.\| *=\)' machines modules After that I tested the contents of the nix.conf of all the machines against the changes this commit introduced via the following command: $ nix-build --no-out-link -E ' with import <nixpkgs/lib>; map (m: m.eval.config.environment.etc."nix/nix.conf".source) (collect (m: m ? eval) (import ./machines)) ' I've sorted the resulting nix.conf files and diffed on that result and the only difference that showed up was the following: allowed-users = * -auto-optimise-store = false auto-optimise-store = true builders-use-substitutes = true cores = 0 This is because the previous way to generate the config was by concatenating strings whereas the new way works on an attribute set, so we get deduplication by design. [1]: https://github.com/NixOS/nixpkgs/pull/139075 Signed-off-by: aszlig <aszlig@nix.build> Cc: @devhell Cc: @Profpatsch Cc: @sternenseemann
* profiles/base: Use XKB config for console keymapaszlig2022-08-031-1/+2
| | | | | | | | | | | | This is mainly for having a consistent and central way to define our keybord config. The main reason for doing so is because of Slylandro, which comes with a keyboard that has a caps lock key atop the left shift key and it drives me mad. Since I'd like to keep things DRY, let's just use XKB for everything keymap-related. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Fix deprecated SSH config optionaszlig2022-05-141-3/+3
| | | | | | | | | | | | | | | | | | This gets rid of the following warning: trace: warning: The option `services.openssh.challengeResponseAuthentication' defined in `.../modules/user/aszlig/profiles/base.nix' has been renamed to `services.openssh.kbdInteractiveAuthentication'. The option actually didn't make sense in the first place because it was an alias leftover from SSH 1. I also changed the priority for the OpenSSH options from 1000 to 500 to avoid any future conflicts should the upstream module use mkDefault one day. Signed-off-by: aszlig <aszlig@nix.build>
* treewide: Fix broken package symbolsProfpatsch2022-03-021-1/+1
| | | | | | | | Due to unnecessary renames in https://github.com/NixOS/nixpkgs/pull/161146 I replaced the packages with the ones the error messages mentioned, I have not checked whether they are actually a no-op replacement.
* profiles/aszlig: Add ddrescue to base profileaszlig2021-09-141-0/+1
| | | | | | | | Since I regularly use this for recovering data from various hard drives and it's also a good idea to have it at hand with no Internet connection in case something bad[TM] happens, let's make it available everywhere. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Remove GRUB from base profileaszlig2021-06-021-5/+0
| | | | | | | | | | | 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-2/+0
| | | | | | | | 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>
* profiles/base: Disable Beets "Alternatives" pluginaszlig2021-02-051-3/+0
| | | | | | | | | | I no longer use this plugin and since evaluation currently is broken upstream (blocked by [1]), let's make sure that at least the rest of Vuizvui continues to evaluate. [1]: https://github.com/NixOS/nixpkgs/pull/109679 Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Add helper for showing last Nix logaszlig2020-12-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This is a common pattern I encounter on a daily basis, which involves copy & pasting the store path of a failed build to "nix log". Now the same is just a matter of running "nlast" and we get rid of the useless copy & paste. The way we do this does have a small goof: Using mtime (or really any time, other than atime, which commonly is disabled) is not going to work if we *repeat* an older Nix build, since this will only change the log file but the prefix directory will be unchanged. Since addressing this goof would most likely result in iterating through *all* log files, I'm not doing it since I think it doesn't occur very often in practice. If I happen to be wrong on that, we could still go for the heavyweight solution. Also, I went for implementing this in Python instead of a shell script, because the latter would not only be less readable but also way slower since we need to either fork out for every stat command or use ls and head to figure out the newest file. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Remove showManual option definitionaszlig2020-08-161-2/+0
| | | | | | | | | | | | | | The option has been removed upstream[1] and it only has been true by default for a very small time frame in 2014[2] and I believe even earlier (before the nixos -> nixpkgs merge) there was another occasion where it defaulted to true. However, with the option gone, this is now no longer necessary. [1]: https://github.com/NixOS/nixpkgs/commit/aebf9a4709215c230e5841d60e2 [2]: https://github.com/NixOS/nixpkgs/commit/b792394119b8ffc4a2fd34a6704 Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Enable Nix experimental featuresaszlig2020-06-231-0/+1
| | | | | | | | I've had this in my configuration.nix for a while and since I got used to it, I think it's a good idea to enable both Nix Flakes and the "nix" command by default for all my machines. Signed-off-by: aszlig <aszlig@nix.build>
* machines: `consoleFont` and `consoleKeyMap` moved to `console`Profpatsch2019-12-221-2/+2
| | | | | | Fixes the evaluation warning. cc @aszlig @devhell @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>
* profiles/base: Add moreutilsaszlig2018-09-191-0/+1
| | | | | | | This really has a few very useful commands that make working with the shell on a daily basis less painful. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Remove IcedTea Firefox pluginaszlig2018-06-301-1/+0
| | | | | | | I really didn't use it at all and there is also no reason to keep it there anyway. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Remove config override for Miroaszlig2018-06-291-3/+0
| | | | | | | I'm no longer using Miro, so there really is no point in having this override in there. Signed-off-by: aszlig <aszlig@nix.build>
* profile/base: Set default priority on SSHd optionsaszlig2018-04-211-3/+3
| | | | | | | | | | | The parent commit actually introduced an eval error with meshuggah, because the machine defined permitRootLogin. Setting these values to priority 1000 (which is what mkDefault does) makes sure that setting the value somewhere else always takes precedence (unless of course it has a value >= 1000). Signed-off-by: aszlig <aszlig@nix.build>
* profiles/base: Provide sane OpenSSH defaultsaszlig2018-04-211-0/+4
| | | | | | | | | It's been ages since I needed to authenticate to SSHd via a password, so let's actually make sure we only use pubkey auth by default. If we need more than that we can still change the value to something else on a per- machine basis. Signed-off-by: aszlig <aszlig@nix.build>
* profiles: Remove IPv6 patch for systemd v233aszlig2017-07-311-8/+0
| | | | | | | | | | | This reverts commit 224a63100f6233fda762c72818cad57173411802 and 85f3d5340e53e2624f65248740ed04cb1f5e94e9. Since the last staging merge done in commit NixOS/nixpkgs@740d76371e6c1c76bae4801fc5b736a796c1ebbe we have systemd version 234, which already has the change this patch has addressed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/aszlig: Make vim module a plain packageaszlig2017-07-241-1/+1
| | | | | | | | | | | | 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>
* profiles/base: Add patch for networkd IPv6 fixaszlig2017-07-171-0/+8
| | | | | | | | | | | | | | | The upstream issue is systemd/systemd#3879 and this bug has annoyed me for a while now. I've also opened a pull request (NixOS/systemd#12) to the NixOS fork of systemd, but this is pending since almost a month now and the bug is still annoying as fuck, so let's patch it in vuizvui. I'm not yet porting this to other machines yet, because I want to test whether this actually really solves my problem (even though it's exactly what the upstream bug describes) or whether we need to patch something else as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell (uses networkd as well)
* Convert packageOverrides to overlaysaszlig2017-07-171-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* profiles/base: Remove nix.conf option log-serversaszlig2017-06-221-1/+0
| | | | | | | This option does no longer exist in current Nix 1.12 and has been removed in NixOS/nix@0afeb7f51e3465c7c27bc5a83017e9ffde8c6725. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Remove nix-repl from packagesaszlig2017-06-221-14/+0
| | | | | | | Nix 1.12 already contains "nix repl" and as I'm using Nix 1.12 on all of my machines the nix-repl package is obsolete. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Fix build of nix-replaszlig2017-04-191-0/+1
| | | | | | | | Compiling nix-repl with Nix 1.12pre5152_915f62fa will only work by enabling support for ISO C++ 2014, because nix/util.hh uses includes from <experimental/*>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Fix build of nix-replaszlig2017-02-071-2/+5
| | | | | | | | Since NixOS/nix@21948deed99a3295e4d5666e027a6ca42dc00b40 nix::Pid::wait() no longer takes a boolean argument and is now blocking by default. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/profile/base: Fix nix.useSandbox optionaszlig2016-06-041-1/+1
| | | | | | | Since NixOS/nixpkgs@7cf8daa every chroot*-option has been renamed to refer to "sandbox", because the name fits better (it's not only chroot). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles/base: Disable allowUnfree globallyaszlig2016-05-171-5/+2
| | | | | | | | | | | The CPU microcode is already excempted from it and unrar is unfree but redistributable, so let's use our new unfreePkgs module attribute for that. Apart from that I haven't found anything else on my machines, but let's see what happens after Hydra evaluates the jobset. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles/base: Use IcedTea for FireFoxaszlig2016-05-041-1/+1
| | | | | | | | | | | | | I use FireFox occasionally for whenever I'm forced to run ugly Java plugins (in particular Hetzner's Lara machines use it). I hope IcedTea is capable of running the Lara plugin, but even when not, it's not a big deal-breaker as I didn't have to use Lara consoles for a whole while now. And if it's the case, I can still look for a "fix" :-) So another step towards being free of proprietary software. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles/chromium: Disable pepper Flashaszlig2016-04-041-1/+0
| | | | | | | | I've disabled Flash support via chrome://plugins since quite a while and I have to say that I'm quite happy without Flash, so let's finally get rid of that proprietary blob for good :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Use full source info for nix-replaszlig2016-03-211-2/+4
| | | | | | | | Using overrideDerivation on fetchFromGitHub is going to only override the attributes from fetchzip, because fetchFromGitHub isn't directly overridable. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/profiles: Fix build of nix-replaszlig2016-03-211-0/+8
| | | | | | | | As of edolstra/nix-repl@8a2f5f0, this won't build with current nixUnstable (version 1.12pre4509_69f28eb) and it already has been fixed upstream (edolstra/nix-repl#25 and edolstra/nix-repl@ff8d069). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Add Headcounter Hydra as log serveraszlig2016-01-191-0/+1
| | | | | | | | | | Quite useful for paging logs so that I don't all the time need to either scroll back the buffer (which is also limited so it's not very useful for large builds) or use something like: curl https://headcounter.org/hydra/log/$drvbasename | less Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Switch to nix.buildCoresaszlig2016-01-141-1/+1
| | | | | | | | | This option has been there for a long time (since NixOS/nixpkgs@e8dace2), so let's actually use it instead of putting it into extraOptions to make sure we get an error should the option be renamed or removed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Enable beets-alternatives pluginaszlig2015-12-181-0/+3
| | | | | | | | This has been introduced in NixOS/nixpkgs@662ab05 and it's quite useful for creating USB sticks for crappy audio players which are only able to read crappy audio formats ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Remove patch for nixUnstable.aszlig2015-12-111-9/+2
| | | | | | | | | This reverts commit c4915296f064587b7ead2c8ddb7bf42aeca522dc. We no longer need this because the nixUnstable version has been updated in NixOS/nixpkgs@2de76b275366a700f7f79709bf30d67358f2838a. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Enable global nixpkgs config.aszlig2015-12-011-0/+1
| | | | | | | | | | | | | | Until now I had a ~/.nixpkgs/config.nix with content like this: (import <vuizvui/machines> {}).aszlig.mmrnmhrm.build.config.nixpkgs.config Unfortunately, this has side-effects on a lot of things, essentially whenever I import <nixpkgs> without a config attribute, so I'd like to disable this by just modifying NIX_PATH instead of either moving ~/.nixpkgs/config.nix out of place or replace all imports of nixpkgs with an empty config attribute. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Use overrides for nixUnstable.aszlig2015-12-011-2/+2
| | | | | | | | Setting nix.package uses nixUnstable for the deamon but not for packages depending on Nix, so instead of setting nix.package, let's just override the "nix" attribute directly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Don't require libSystem in Nix.aszlig2015-12-011-0/+7
| | | | | | | | | | | | I'm using nixUnstable and without fiddling around, updating the channel or installing anything into a user environment is going to fail with a request of the impure paths /usr/lib/libSystem.dylib and /usr/lib/system. This patch is from NixOS/nix#688 and I'll keep it until the Nix tests on Hydra are succeeding and we can update nixUnstable in <nixpkgs>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Keep journal entries for 3 months.aszlig2015-12-011-0/+4
| | | | | | | | So far I tried to keep logs as long as possible, but in practice it turns out that I'm not really interested in logs that are a few years old. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Revert kernel 4.3 VirtualBox patch.aszlig2015-10-121-12/+0
| | | | | | | | | | | | This reverts the following commits: * 3b50260bb166a70a661634b3496e920d21a3ae3d * d6e723dec33951120d8b8299fbb9e49e55cc1d91 The patch is no longer needed since the upgrade in NixOS/nixpkgs@5fee5c6 because the patch was already from upstream. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Properly strip VirtualBox patch.aszlig2015-09-251-1/+2
| | | | | | | We need to strip off one path component, because the patches generated by Trac's diff viewer contain absolute paths. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-05 21:08:36 +0000