about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* aszlig/workstation: Disable KSM again.aszlig2015-04-031-1/+0
| | | | | | | | | | | | | | | | | | | | I wanted to use it for my countless XTerms, so I patched xterm+zsh to use madvise() with MADV_MERGEABLE on every allocation and the results weren't *that* bright: pages_shared: 83 pages_sharing: 1498 pages_unshared: 942 pages_volatile: 1 With 20 terminals, so roughly 5.85 MB "saved" and ~9 for 120 instances. That really isn't worth the CPU overhead, thus I'm turning it off again. So, I need a better strategy to support my habit of running hundreds of terminals (or better: shells, because that's really what's actually eating up my RAM). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest upstream master.aszlig2015-04-031-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: small mouse improvementOpenlab Labtop2015-04-031-1/+1
|
* labtop: device ID for grupOpenlab Labtop2015-04-031-1/+1
|
* labtop tmux & fish, mouse configOpenlab Labtop2015-04-031-8/+22
|
* labtop: Add slic3r to systemPackages.aszlig2015-04-021-4/+1
| | | | | | Also, since NixOS/nixpkgs@6b467ad we no longer need to use allowBroken. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Actually enable trackpoint support.aszlig2015-04-021-0/+1
| | | | | | | So far only emulateWheel has been set, but it doesn't work if you don't also enable the module. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Add pronterface to systemPackages.aszlig2015-04-021-1/+1
| | | | | | Its upstream package is called "printrun" and includes Pronterface. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Update to latest upstream master.aszlig2015-04-021-2/+2
| | | | | | | Contains a bunch of fixes especially some related to the Hetzner backend. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Revert new system module to enable KSM.aszlig2015-04-013-23/+1
| | | | | | | | This reverts commit fc53a72f48ae6b567e7bf9901a2bd3657853633c. Applied upstream at NixOS/nixpkgs@224ed7e. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mainlineKernel: Update to version 4.0.0-rc6.aszlig2015-04-011-3/+3
| | | | | | | | | | They're just a few commits from 7fc377e..6c310bc and 24 changed files, with 156 insertions and 93 deletions, so this really isn't necessary, but I want to have that -rc6 instead of -rc5. Actually, this isn't really -rc6 anyway, but -rc6 plus 9 more commits. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/workstation: Enable KSM by default.aszlig2015-04-011-0/+2
| | | | | | | | I can't stand it anymore when my excessive use of "lots of xterms" is getting my machines into the need to use swapspace. The last time one of my machines got to a crawl was with >300 open xterms. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add a new system module to enable KSM.aszlig2015-04-012-0/+21
| | | | | | | | This is very useful if you're running a lot of the same instances of particular applications. For example virtual machines or even lots of terminals. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* labtop: Merge hardware config into one labtop.nix.aszlig2015-04-012-34/+25
| | | | | | | | | | This reverts the split up of the config from 55ec3a1 and puts all the stuff from the hardware configuration file into the main config. The reason for this is that vuizvui is structured so that the machine definition *IS* the actual hardware configuration which deviates from a common profile. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Improved Config for LabtopOpenlab Labtop2015-04-012-15/+59
|
* aszlig/kernel: Remove leftover grub devices.aszlig2015-04-011-5/+0
| | | | | | | Installing the GRUB bootloader to non-existing devices of mmrnmhrm to for example dnyarri is not going to help anyone, right? ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* machines: Add an "use" attr for configuration.nix.aszlig2015-04-011-0/+3
| | | | | | | | Useful to call the machine from configuration.nix like this: (import <vuizvui/machines> {}).aszlig.mmrnmhrm.use Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Add channel expression files.aszlig2015-04-011-1/+10
| | | | | | | | This is actually a store path consisting of the vuizvui sources themselves and currently doesn't depend on anything else, so it usually won't fail when mandatory tests or builds fail. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Generalize Qt5 fixups.aszlig2015-03-311-23/+21
| | | | | | | | | | | | The generalization is done by symlinking include dirs and libraries to the corresponding suffixed versions *only* if there isn't a ...5 suffix already. We now no longer need to pass QUAZIP_INCLUDE_DIR and QUAZIP_LIBRARIES as cmakeFlags, because the Tomahawk cmake build is able to find it by itself. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Add include suffix for QuaZip.aszlig2015-03-311-4/+10
| | | | | | Same as with 9ea16e0 and d3bfedd. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Reference quazip library file directly.aszlig2015-03-311-1/+1
| | | | | | | | | | | | It's not a big issue, because due to Nix's stdenv it's going to be able to link anyway, but there still is a nasty warning, we're getting rid by this: WARNING: Target "tomahawklib" requests linking to directory "/nix/store/ybw942c8jw0dyjah0r0pcsgn8q0sv02h-quazip-0.7.1/lib". Targets may link only to libraries. CMake is dropping the item. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Update to latest upstream master.aszlig2015-03-311-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Patch in suffixed version of liblastfm.aszlig2015-03-311-5/+10
| | | | | | Just as with echonest vs. echonest5 we now have lastfm vs. lastfm5. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Link echonest includes to suffixed ones.aszlig2015-03-311-1/+3
| | | | | | | Tomahawk expects the echonest library to have a "5" suffix in its include dir, so let's simply symlink it to the unsuffixed version. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Override QCA sources with Qt5 fork.aszlig2015-03-311-10/+14
| | | | | | | Thanks to @muesli for mentioning this, so we no longer need to patch Tomahawk's CMakeList.txt. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Set liblastfm/echonest include dirs.aszlig2015-03-311-0/+2
| | | | | | | | | The libraries are searched in $KDE4_INCLUDE_DIR or in some other paths but with a prefix. On Nix however we don't need a prefix and our dependencies are strictly separate so searching in KDE4_INCLUDE_DIR won't work either. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Pass QuaZip include/library paths.aszlig2015-03-311-1/+3
| | | | | | | | The upstream cmake script wasn't able to find it by itself, but haven't looked into it whether this is only a Nix specific problem or whether it applies generally. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Rename Qca-qt5 to Qca in CMakeLists.txt.aszlig2015-03-311-0/+4
| | | | | | | | | | The upstream Tomahawk CMakeLists.txt contains a distro-specific name, which doesn't work well when using the name from upstream Qca. So let's rename it accordingly. Cc: @muesli Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Add missing Qt5 dependencies.aszlig2015-03-311-2/+3
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Add Qt5 tools to qtkeychain dependency.aszlig2015-03-311-3/+10
| | | | | | Building qtkeychain with Qt5 requires Qt5LinguistTools. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Remove dependency an qjson.aszlig2015-03-311-3/+3
| | | | | | | | It is included in Qt5 already and the separate one also won't build with newer Qt, so let's null it out for echonest and remove it from Tomahawk's buildInputs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Replace attica by the Qt 5 version.aszlig2015-03-311-8/+2
| | | | | | Using the attica version from the KDE frameworks attribute set. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* conky: Fix argument for weatherMetar support.aszlig2015-03-311-1/+1
| | | | | | This was renomed in NixOS/nixpkgs@8591b7b. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tumahawk: Switch to Qt5 by default.aszlig2015-03-311-10/+32
| | | | | | | This was changed in tomahawk-player/tomahawk@873c35a, so let's adapt accordingly and jump straight to Qt 5.4 instead of plain old 5.3. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* temahawk: Update to latest upstream master.aszlig2015-03-311-2/+2
| | | | | | We're feeling to old, don't we? ;-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tomahawk: Remove dependency on qca2_ossl.aszlig2015-03-311-11/+1
| | | | | | | As of NixOS/nixpkgs@ee7c9bd this is no longer needed, as the new upstream version of QCA2 includes the plugin already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mainlineKernel: Update to version 4.0.0-rc5.aszlig2015-03-291-3/+3
| | | | | | | Stress over the last few days affected my machines being not up-to-date anymore. This has to change! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Rename packagesWithMetaPlatform.aszlig2015-03-291-1/+1
| | | | | | | Since NixOS/nixpkgs@738cf42, the attribute is now simply called "packagePlatforms". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release: Constrain set of packages to build.aszlig2015-03-181-4/+8
| | | | | | | | | We don't want to build non-free stuff on our Hydra and also we want to have builds for all supported systems. In addition, this should get rid of a few evaluation errors that happen because Hydra tries to create jobs out of attributes which are not derivations. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests/heinrich: Fix evaluation error.aszlig2015-03-181-1/+1
| | | | | | Regression is from 903106efb392dc6235dd02523c29b3fbfed37462. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* tests/richi235: Add VM test for multipath VPN.aszlig2015-03-182-0/+192
| | | | | | | | This is where I previously left off and I'm currently not enough "in zone" to remember the details. But even though the tests are failing, I'm adding it here for reference and for picking it up later. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules: Add new multipath-vpn service module.aszlig2015-03-182-0/+247
| | | | | | | | | This is for @richi235 only, but the module is generic enough to be included in the top-level modules. I highly doubt that anyone else would have a use for this, at least until we have replaced the module with a kernel space variant of the same. 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 last machine from labernix to vuizvui.aszlig2015-03-1810-49/+31
| | | | | | | | | | | | I've moved the restrictions config of Postfix into the default module for now and actually fixed it so that it's actually working (the config value wasn't set before). Also, the option type was incorrectly set to types.list, which aliases to types.listOf and expects another function (kind) as its argument. This marks the end of LaberNix and the beginning of a new Vuizvui! Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Incorporate labernix's release.nix into vuizvui's.aszlig2015-03-182-22/+6
| | | | | | The only thing that was missing was the pkgs attribute. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Refactor overrides into my base profile.aszlig2015-03-1811-52/+53
| | | | | | | | | | | | | | | | | Just moving the overrides into the base profile isn't enough here, as we wouldn't be able to refer to packages anymore, because the global nixpkgs.config override is now gone. Instead, we're now putting pkgs.vuizvui.* into the NixOS module system by a new profiles/common.nix, which is used unconditionally for all machines. Of course, the result of this is that we now need to change all references to vuizvui-related packages, which also is a good thing, because we will no longer shadow existing packages from upstream nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move kernel source into the "kernel" NixOS module.aszlig2015-03-182-11/+11
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move mpv override into its own program module.aszlig2015-03-185-10/+27
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Move zsh override into my zsh module.aszlig2015-03-182-6/+8
| | | | | | | | Unfortunately, we can't just explicitely override the zsh package and refer to it in systemPackages, so we need to override it using nixpkgs.config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge labernix packages into vuizvui pkgs.aszlig2015-03-185-13/+4
| | | | | | | | | | | | It's currently only BeeHive, but our goal is to dissolve labernix step by step until nothing is left. Also, we're now no longer namespace the pkgs with vuizvui directly in the package list. Before it wasn't even namespaced correctly (except for inside pkgs/ directly) and we did override the packages using the dirty approach in overrides/. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-10-20 07:50:54 +0000