about summary refs log tree commit diff
path: root/modules/user/aszlig/profiles/managed.nix
Commit message (Collapse)AuthorAgeFilesLines
* machines + modules: Fix Nix option definitionsaszlig2022-08-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/managed: Remove TLPaszlig2022-08-151-2/+0
| | | | | | | | | | | | | | Right now we're getting an eval error like this: Failed assertions: - You have set services.power-profiles-daemon.enable = true; which conflicts with services.tlp.enable = true; Since the machines in question are for desktop environment users, TLP doesn't make a lot of sense. Besides, the option should not be defined in managed.nix anyway, because it's a hardware-specific option. Signed-off-by: aszlig <aszlig@nix.build>
* aszlig/managed: skype -> skypeforlinuxdevhell2022-03-021-1/+1
|
* treewide: Rename packagesdevhell2022-03-021-1/+1
| | | | More packages have been renamed recently.
* aszlig/profiles/managed: Fix plasma5 -> plasmadevhell2022-01-081-1/+1
| | | | | This has been renamed upstream at some point and subsequently produced eval errors.
* treewide: Fix eval errors post 21.05 releasedevhell2021-06-091-1/+1
| | | | | A few things have changed since the recent NixOS 21.05 release. Mostly naming stuff, so nothing dramatic.
* modules/user/aszlig/managed: disable flashsternenseemann2021-02-111-1/+0
| | | | | | | | | | nixpkgs has removed flash support in chromium without replacement in d55603f11d36ae38ca76dec8d95bc55d2115f104 following the removal in upstream chromium M88, so I'm disabling it completely in vuizvui.user.aszlig.profiles.managed to fix the evaluation of shiki and brawndo. cc @aszlig
* profiles/managed: Fix kdeApplications eval erroraszlig2021-02-051-10/+10
| | | | | | | | | The kdeApplications attribute got removed from the top-level a while ago, so the machines using the "managed" profile no longer evaluate. Instead, the plasma5Packages exposes the same set of packages. Signed-off-by: aszlig <aszlig@nix.build>
* treewide: Remove hardware.opengl.s3tcSupportdevhell2020-04-231-1/+0
| | | | | | | This option has been dropped upstream in 4732f59226a21b01d630c7ef4fb884bbfbe7dc83 Cc: @aszlig
* treewide: Switch to displayManager.defaultSessionaszlig2020-02-101-2/+1
| | | | | | | | | | | | | | The option services.xserver.desktopManager.default and services.xserver.windowManager.default are deprecated since quite a while[1], so let's use the displayManager.defaultSession option instead. Additionally, there no longer is any need to explicitly disable the "xterm" desktopManager, so I removed that option as well. [1]: https://github.com/NixOS/nixpkgs/commit/8dc5ff7dcfd1c58c32004ffae25 Signed-off-by: aszlig <aszlig@nix.build> Cc: @devhell
* profiles/managed: Fix up renamed gvfs optionaszlig2019-12-081-1/+1
| | | | | | | | | | The option has been moved[1] out of services.gnome3 since quite a while, so let's actually use the new option "services.gvfs.enable" instead. [1]: https://github.com/NixOS/nixpkgs/commit/67ad8a788fe0a8c22910d68d470416b6f5626740 Signed-off-by: aszlig <aszlig@nix.build> Reported-by: @dwenola
* profiles/managed: Enable zswapaszlig2018-07-161-0/+1
| | | | | | | Most of these machines have limited RAM and come to a crawl whenever swap space needs to be used. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Add kdepim-addonsaszlig2018-05-081-0/+1
| | | | | | This is needed in order to add locations to contacts in KAddressbook. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Add kontact to systemPackagesaszlig2018-05-081-0/+1
| | | | | | | This is probably the main part of the KDE PIM suite, so it really makes sense to add this to managed machines as they're end user oriented. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Add boot.cleanTmpDiraszlig2018-04-251-0/+1
| | | | | | | A lot of trash has accumulated in /tmp on some of the machines, so let's clean it up. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Move Chromium to machinesaszlig2018-04-121-1/+0
| | | | | | | The new machine (shakti) is going to use Firefox, so let's make sure this is machine-specific. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Add RAR support for Arkaszlig2018-04-121-2/+5
| | | | | | | | | Unfortunately people still tend to use RAR archives for whatever reason. The unfreeAndNonDistributablePkgs is a bit wrong here though, because Ark and unrar *are* actually redistributable. This needs to be fixed in nixpkgs though. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Enable GVFSaszlig2018-04-121-1/+4
| | | | | | | | | This module adds udev rules for MTP devices, so in theory we do not need it. However I can remember one occasion where this was needed, but I don't remember exactly why. So let's better err on our side rather than causing problems for the users. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Move updateMicrocode to machinesaszlig2018-04-121-1/+0
| | | | | | | | This is clearly something that is specific to the actual hardware, so even though both brawndo and tyree share the same CPU vendor, we will have a third managed machine that is going to be different. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Enable sound by defaultaszlig2018-04-081-0/+1
| | | | | | | | | | This is no longer enabled by default since NixOS/nixpkgs@a43e33d0e48b2284ac3a2222d7f1965cef66f5e2. Those machines are desktop machines/laptops where users expect to have support for sound ;-) Signed-off-by: aszlig <aszlig@nix.build>
* Remove my patched version of Gajim everywhereaszlig2018-04-041-1/+1
| | | | | | | | | | | | | | | | | | The config.patch doesn't apply for Gajim 1.0 anymore anyway, so let's throw everything away, including my custom config in order to start with a new abomination. With the new approach, I'm going to patch the configuration defaults *directly* into Gajim, because one of the problems with the old approach was that whenever specifics about a configuration value has changed, I didn't get noticed by a patch failure. So in the end the config I was ending up was a big mess. I'm going to start this with a new unpatched version and someday get to a patched version that I'm staisfied with... hopefully ;-) Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Remove bomiaszlig2018-04-041-1/+0
| | | | | | It doesn't seem to be maintained anymore. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Add ark to systemPackagesaszlig2017-11-041-0/+1
| | | | | | | | | | This really makes sense for an end user system, so let's actually add it to the system path. It seems that it also needs unzip and other archivers in $PATH but I haven't actually verified if that's really the case, because the Nix expression for ark already contains those archivers. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Set a default desktop manageraszlig2017-11-041-0/+1
| | | | | | | | | | This has changed in NixOS/nixpkgs@93c54acf97077567e8d6135a36f191e872b2 so that there's now an assertion to set a default. For all the profiles I've set this properly but managed to forget it for brawndo and tyree, which is now the case. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Remove kmix againaszlig2017-09-251-1/+0
| | | | | | | | | | | Reverts adding kmix as introduced in e49eca5c0c9c27352825c455d3e1b8a938245755. This causes two mixer icons to show up in the tray, which is kinda redundant. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @dwenola, @BrokkoliBerta
* profiles/managed: Replace simple-scan by skanliteaszlig2017-09-171-1/+1
| | | | | | | | | | This has been introduced by NixOS/nixpkgs@c4c187ed7226e2132c13070444d0, thanks to @pshendry. IMHO it makes more sense to use this instead of simple-scan, because the managed machines run KDE while simple-scan is a Gnome application. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Unify most options for brawndo and tyreeaszlig2017-09-071-1/+65
| | | | | | | | | | | | | | | | | | | 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
* profiles: Remove IPv6 patch for systemd v233aszlig2017-07-311-11/+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>
* profiles/managed: Add patch for networkd IPv6 fixaszlig2017-07-261-0/+11
| | | | | | | | | | This is exactly the same patch/implementation as I've added for my machines in 85f3d5340e53e2624f65248740ed04cb1f5e94e9. I wanted to delay this a bit until I have tested it by myself, which I have by now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/managed: Enable BFQ scheduler by defaultaszlig2017-07-061-0/+2
| | | | | | | Now that the scheduler is in mainline, I think there is nothing now to stop us from unleashing it to end users :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/managed: Add simple-scanaszlig2017-01-191-0/+2
| | | | | | | Might be a good idea to have an actual application that can be used to scan stuff (apart from Gimp and others with SANE support). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/managed: Implement a preliminary profileaszlig2017-01-021-0/+39
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>