about summary refs log tree commit diff
path: root/machines/aszlig/managed
Commit message (Collapse)AuthorAgeFilesLines
* machines + modules: Fix Nix option definitionsaszlig2022-08-152-2/+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
* machines/shakti: Remove machine configaszlig2022-08-151-73/+0
| | | | | | | The machine no longer exists, so it doesn't make sense to continuously build it on Hydra. Signed-off-by: aszlig <aszlig@nix.build>
* Use attribute sets for boot.initrd.luks.devicesaszlig2020-09-142-16/+17
| | | | | | | | | | | | | | | | | | | | 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/tyree: Fix evaluation of weboobaszlig2020-04-041-1/+1
| | | | | | | | | | | | One (or maybe more?) dependency of weboob requires Python 3 and hence using weboob from python2Packages isn't going to evaluate and instead result in this error: error: google-api-core-1.16.0 not supported for interpreter python2.7 Using weboob from python3Packages fixes the eval error. Signed-off-by: aszlig <aszlig@nix.build>
* treewide: use `runCommandLocal` where applicableProfpatsch2019-12-081-1/+1
| | | | | | | `runCommandLocal` was added to nixpkgs in https://github.com/NixOS/nixpkgs/pull/74642 to speed up trivial `runCommand` derivations by always building them locally. We have a few places where that’s good to use.
* machines/brawndo: Add Visual Studio Codeaszlig2019-10-301-2/+2
| | | | | | | | | Unfortunately, this is a work requirement for the user in question, so while I'd (personally) prefer to pretty much stay on free software, the circumstances prevent this :-/ Signed-off-by: aszlig <aszlig@nix.build> Cc: @dwenola
* machines/aszlig: Explicitly set useDHCPaszlig2019-10-082-1/+2
| | | | | | | | | | | | | | | | | | 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>
* machines/brawndo: Use cnijfilter2 from nixpkgsaszlig2019-09-231-13/+1
| | | | | | | https://github.com/NixOS/nixpkgs/pull/58399 has been merged a few hours ago, so we no longer need to use our manual override. Signed-off-by: aszlig <aszlig@nix.build>
* machines/managed: Switch to libinputaszlig2019-09-073-5/+0
| | | | | | | | | | | | Since NixOS/nixpkgs@466f5e534688049be2ed6e75ae5659633016b45e, libinput is enabled by default for Plasma 5, so we no longer need to explicitly enable it anymore. Furthermore, there was brawndo as the only machine still using Synaptics and it's about time it's using libinput as well, so I subsequently removed synaptics there. Signed-off-by: aszlig <aszlig@nix.build>
* machines/brawndo: Add cnijfilter2 version 5.70aszlig2019-06-121-1/+13
| | | | | | | | | | | | | | | | | I don't recall the exact model which was used for that machine, but it was definitely one that required version 5.70. Now I made a pull request for nixpkgs a while ago[1], which hasn't been merged and as I didn't have the chance to test it by myself I didn't merge that pull request yet. Since the user asked about that printer driver again, I decided to give version 5.70 a shot in vuizvui only and merge it upstream, once the user reports that the driver is working. [1]: https://github.com/NixOS/nixpkgs/pull/58399 Signed-off-by: aszlig <aszlig@nix.build>
* machines/brawndo: Add Firefox to systemPackagesaszlig2018-07-251-1/+2
| | | | | | | | User is likely to switch, so let's add Firefox alongside to Chromium and eventually remove Chromium at some day. Signed-off-by: aszlig <aszlig@nix.build> Cc: @dwenola
* machines/brawndo: Add Python 3 to system pathaszlig2018-07-221-1/+1
| | | | | Signed-off-by: aszlig <aszlig@nix.build> Cc: @dwenola
* machines/tyree: Add auxiliary pkgs around KMyMoneyaszlig2018-05-061-1/+2
| | | | | | | | Those are useful for HBCI/FinTS support and scraping other banking websites. KGPG is for encrypting the ledger. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* Revert "machines/tyree: Add Microsoft Core Fonts"aszlig2018-05-061-3/+1
| | | | | | | | | | This reverts commit d813e5de7f84ad57d25b5c0ec95c2098204e976b. Turns out that the machine's owner has found an alternative font already installed on the system, so we don't need proprietary fonts, yay! Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Add Microsoft Core Fontsaszlig2018-05-061-1/+3
| | | | | | | | | | I thought about whether this would be a good idea to generally add this to the managed profile, but didn't do so because we don't want to encourage users to use proprietary fonts if possible. If requested we can still add it on a by-machine basis. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Add KMyMoney to systemPackagesaszlig2018-05-061-1/+1
| | | | | | | This has been on the machine for a while and it's now in nixpkgs master. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Enable libinputaszlig2018-04-251-0/+1
| | | | | | | | | | This has been in the configuration.nix for a while and it seems to be working. It might be a good idea to add it to the managed profile, but we first have to test whether this really works for other machines than tyree. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Impose a size limit on journaldaszlig2018-04-251-0/+2
| | | | | | | | | The machine doesn't have a lot of MMC space, so putting a whole lot of logs which we probably won't need for such a long time isn't a good idea. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Add options for encryptionaszlig2018-04-251-0/+18
| | | | | | | | | The new installation of this Laptop uses encryption and so far these options have been residing in the local configuration.nix, so let's get it over to Vuizvui. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Switch from Chromium to Firefoxaszlig2018-04-251-1/+1
| | | | | | | | The machine's user already has switched to Firefox since quite a while, so let's actually add it to systemPackages. Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/shakti: Provide EDID informationaszlig2018-04-231-0/+15
| | | | | | | | | | | | | | The monitor reports back EDID via DVI but the HDMI->DVI adapter seems to not handle that correctly. Also the monitor has weird resolutions, so using the fallback modes provided by the kernel also doesn't seem to work and the monitor stays blank. While hardcoding the EDID information isn't a very good idea for this machine in general (because it might be connected to a different monitor), for now this is the easiest workaround because I don't have access to that machine. 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/shakti: Add file systemsaszlig2018-04-131-6/+27
| | | | Signed-off-by: aszlig <aszlig@nix.build>
* machines/shakti: Add Firefox to systemPackagesaszlig2018-04-121-0/+1
| | | | Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Move Chromium to machinesaszlig2018-04-122-2/+2
| | | | | | | 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>
* machines/shakti: Enable deluge serviceaszlig2018-04-121-0/+2
| | | | Signed-off-by: aszlig <aszlig@nix.build>
* shakti: Add dropbox to systemPackagesaszlig2018-04-121-2/+2
| | | | | | At least for now until the owner gets rid of it. Signed-off-by: aszlig <aszlig@nix.build>
* machines: Add new machine "shakti"aszlig2018-04-121-0/+39
| | | | | | This is only a placeholder right now so we get Hydra builds. Signed-off-by: aszlig <aszlig@nix.build>
* profiles/managed: Move updateMicrocode to machinesaszlig2018-04-122-0/+3
| | | | | | | | 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>
* machines/aszlig: Use zstd compression for btrfsaszlig2018-02-042-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>
* Revert "machines: Remove tyree"aszlig2018-02-021-0/+47
| | | | | | | | | This reverts commit dfd3d86562f09d812b330893cec053ab3d371bdf. The machine is back on NixOS again :-) Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines: Remove tyreeaszlig2017-12-111-47/+0
| | | | | | | Tyree is dead, no further comment... Signed-off-by: aszlig <aszlig@nix.build> Cc: @brokkoliberta
* machines/tyree: Add a few photo editing programsaszlig2017-10-181-1/+3
| | | | | | | | 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
* machines: Unify most options for brawndo and tyreeaszlig2017-09-072-120/+12
| | | | | | | | | | | | | | | | | | | 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
* machines/tyree: Add a few more KDE applicationsaszlig2017-09-071-4/+11
| | | | | | | | | | | 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
* modules/aszlig: Make vim module a plain packageaszlig2017-07-242-4/+4
| | | | | | | | | | | | 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>
* machines/tyree: Remove OpenSSH serviceaszlig2017-06-291-1/+0
| | | | | | | 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>
* machines/tyree: Add kate to systemPackagesaszlig2017-06-241-3/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Remove Tomahawk from the source treeaszlig2017-06-182-3/+2
| | | | | | | | | | | | | | 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>
* pkgs: Add an overridden Gajim with old pycryptoaszlig2017-04-232-5/+5
| | | | | | | | 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>
* pkgs: Move all of my packages into pkgs/aszligaszlig2017-04-232-3/+3
| | | | | | | | | | | | | 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>
* machines/brawndo: Add gpodder instead of miroaszlig2017-04-191-1/+1
| | | | | | | | 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
* machines/aszlig: Revert whitelisting webkitgtkaszlig2017-04-192-8/+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: fix double definition of a setsternenseemann2017-03-072-10/+8
|
* machines/aszlig: temporarily whitelist webkitgtksternenseemann2017-03-072-0/+10
| | | | | | | | 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!
* Remove/rename occurences of kde5aszlig2017-03-022-7/+8
| | | | | | | | | | | | | | 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>
* machines: Remove notsureaszlig2017-02-161-95/+0
| | | | | | | | 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>
* machines/tyree: Add calibre to systemPackagesaszlig2017-01-191-1/+1
| | | | | | Needed for access to Kobo reader. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines/brawndo: Switch to SDDMaszlig2017-01-131-1/+1
| | | | | | | 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>
* machines/managed: Implement a preliminary profileaszlig2017-01-023-17/+9
| | | | | | | | | | | | 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>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-06 04:32:58 +0000