about summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Add a default.nix which servers as vuizvui root.aszlig2015-04-152-3/+17
| | | | | | | | | In the end we want to have something like (import <vuizvui> {}), which exports all stuff we need for building machines, packages, providing custom helper functions and much more. And all that by using a channel instead of setting NIX_PATH directly :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs: Add helper function for creating channels.aszlig2015-04-152-0/+31
| | | | | | | | | We're going to create several channels and we don't want to code duplicates across vuizvui. This essentially not only creates a channel but also ties it to constituents, which make sure that channels are only updated whenever all constituent builds are successful. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Rename upstream pkgs to pkgsUpstream.aszlig2015-04-151-4/+4
| | | | | | | | Mainly to make it a bit easier to distinguish, but also because we want to make the release attribute set recursive, so we don't run into weird evaluation errors. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Remove unnecessary double slash.aszlig2015-04-131-1/+1
| | | | | | | Forgot to remove the slash from the end of the replacement of the transformation expression in tar. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Fix Hydra product file name.aszlig2015-04-131-1/+1
| | | | | | | DUH! Finger fart, as I was writing a tar.bz2 in the first place and later changed it to tar.xz. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* release.nix: Put channel exprs into a tarball.aszlig2015-04-131-1/+10
| | | | | | | | | | With my previous implementation (NixOS/hydra#203) the tarball was created by Hydra itself on the fly. Our new implementation actually generates the tarball via Nix and Hydra only picks up the build product. And exactly that's what we're doing here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mainlineKernel: Update to latest upstream master.aszlig2015-04-111-2/+2
| | | | | | | Fast-forward for 23 commits, which include fixes for sound, pci, pm-sleep and nios2. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-04-111-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mainlineKernel: Update to version 4.0.0-rc7.aszlig2015-04-091-3/+3
| | | | | | Plus 30 commits more (akpm, drm-fixes, media-fixes). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* pkgs/tomahawk: Update to latest upstream master.aszlig2015-04-091-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge pull request #2 from waaaaargh/master.aszlig2015-04-081-1/+1
|\ | | | | | | | | | | | | | | | | Adds the openlab user to the dialout group to allow access to 3D printers and other USB serial devices. This might be just temporary and in the long term we might want to use a udev rule after all to allow access to *all* USB devices to the openlab user.
| * Add `openlab` user to group dialoutJohannes Fürmann2015-04-071-1/+1
| | | | | | by default usb <-> rs232 interfaces which are used to connect to 3d printers are owned by the group `dialout`.
* | services/i3: Fix override of default workspaces.aszlig2015-04-081-8/+9
| | | | | | | | | | | | | | | | | | | | By default, there are 10 workspaces defined and since the module system changes, we need to assign default priorities to all values instead of the full attribute set, because whenever there is an override of the default, the whole attrset is replaced by the override instead of just the values. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | tests/i3: Define a "first" test workspace.aszlig2015-04-081-1/+9
|/ | | | | | | | It's mainly to test whether the workspace assignment is done correctly and if not, the screenshot on the test will be showing one of the default workspaces instead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* nixops: Add patch to fix circular lib reference.aszlig2015-04-041-0/+4
| | | | | | | Patch is from pull request NixOS/nixops#280 and can hopefully be dropped in favour of the latest master version. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Remove references to pkgs.lib within modules.aszlig2015-04-044-7/+7
| | | | | | | | 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>
* 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>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-30 20:15:23 +0000