about summary refs log tree commit diff
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* programs/vim: Update vim-nix to latest master.aszlig2015-12-081-2/+2
| | | | | | | | | This contains both (LnL7/vim-nix#1 and LnL7/vim-nix#3) of my syntax-related pull requests. Thanks to @LnL7 for merging. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Add DiffOrig command.aszlig2015-12-081-0/+3
| | | | | | | | Especially useful if you get a kernel panic and have swapfiles laying around. This command is actually from the Vim example config file and is documented in the diff-original-file help of Vim. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* services/vlock: Fix evaluation error.aszlig2015-12-081-1/+1
| | | | | | | | Regression introduced by 5e1ad35657c05f409a29ddc7a29501fc611111b0. Geesh, that's what happens if you're already tired out. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* services/vlock: Only include socket when enabled.aszlig2015-12-081-21/+23
| | | | | | | | Just stumbled over this... even systems that do not define vuizvui.user.aszlig.services.vlock.enable accidentally got the socket file, which now is no longer the case. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/packages: Add mumble.aszlig2015-12-081-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to version 4.4.0-rc4.aszlig2015-12-081-3/+3
| | | | | | This is -rc4 plus 16 commits ahead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Fix ftdetect support for plugins.aszlig2015-12-071-0/+1
| | | | | | | | Because I'm not using plugin managers and do things manually, I have missed to source all ftdetect files in order to correctly recognize the filetypes that are coming with plugins by its suffix. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Add vader plugin.aszlig2015-12-071-0/+7
| | | | | | | For tests I'm using a separate Nix expression, but it's quite useful to have syntax highlighting for .vader files. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Combine vim-addon-nix with vim-nix.aszlig2015-12-071-5/+33
| | | | | | | | | | | | I want to have the syntax highlighting and indentation rules of @LnL7's vim-nix (https://github.com/LnL7/vim-nix) - or more exactly my pull request overhauling the syntax highlighting file (LnL7/vim-nix#1) - while having everything else from @MarcWeber's vim-addon-nix (https://github.com/MarcWeber/vim-addon-nix). At least until both projects hopefully merge :-D Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* packages: Remove miro and add gpodder.aszlig2015-12-051-1/+1
| | | | | | | | Finally finished switching to gpodder, because it's less buggy than Miro (for example it's without that whole gconf mess) and also it's maintained. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Add NIXPKGS_CONFIG env variable.aszlig2015-12-051-0/+8
| | | | | | | | | | | | | Having <nixpkgs-config> in PATH doesn't help in anything if we actually forget to add the right environment variable where we import the <nixpkgs-config> from NIX_PATH. The reason why I choose to use <nixpkgs-config> instead of directly specifying the config in NIXPKGS_CONFIG is that we now have _one_ environment variable (NIX_PATH) to override everything from the <nixpkgs> version to its config. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Update Nix addon to latest upstream.aszlig2015-12-031-2/+2
| | | | | | | Among other fixes, this contains a small fix for multiline statements by @domenkozar, thanks a lot :-) Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* programs/vim: Fix execution of flake8 command.aszlig2015-12-031-0/+1
| | | | | | | Got a bit annoying over time to constantly get command-not-found errors, so it's time to fix it. 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>
* common: Add option for global nixpkgs config.aszlig2015-12-011-7/+26
| | | | | | | | | | | | This should make creating ~/.nixpkgs/config.nix obsolete and we can solely decide whether we actually want these overrides by modifying NIX_PATH alone. The option isn't enabled by default, because this doesn't work if for example /etc/nixos/configuration.nix is not readable by the user using nix-env or importing <nixpkgs> by other means. 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>
* mmrnmhrm/dnyarri: Update kernel src/cfg to 4.4rc3.aszlig2015-12-011-3/+3
| | | | | | | | | | | | | Version 4.3-rc5 is from the stone age and we really want to have the latest and greatest :-) The kernel is actually not -rc3 directly but 5 commits ahead (current upstream master). I've cleaned up the config for mmrnmhrm a bit, though it is still quite messy and I might do it fully from scratch very soon[TM]. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* services/i3/conky: Use new config file format.aszlig2015-12-011-14/+17
| | | | | | | | | Since Conky 1.10.x there is a new LUA-based configuration file format. The old config file format is still supported and converted on-the-fly, but it might be removed in future versions, so let's move ahead. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Drop obsolete refernces to haskellngPackages.aszlig2015-11-161-4/+4
| | | | | | | | | The haskellPackages attribute is already using the Haskell NG infrastructure for quite a long time (NixOS/nixpkgs@c0c82ea) and since NixOS/nixpkgs@8c344bd it has finally been removed from <nixpkgs>, so let's remove the references we still have left on our side. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/taskwarrior: Rebase patch for v2.5.0.aszlig2015-10-241-7/+7
| | | | | | It got bumped to version 2.5.0 in NixOS/nixpkgs@f0d1766. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to version 4.3.0-rc5.aszlig2015-10-131-3/+3
| | | | | | | | Using -rc4 really feels rather old, so let's get it to latest upstream master, which is exactly -rc5 without any additional commits at the moment. 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>
* mmrnmhrm/dnyarri: Update kernel src/cfg to 4.3rc4.aszlig2015-10-071-3/+3
| | | | | | | | | | | | | It's actually v4.3-rc4 plus 34 commits ahead. Also I'm being a bit lazy if it comes to the configuration here, adding modules I probably won't need. That's because I currently don't have the time to read more into the details. Anyway, in the future I'd like to unify kernel configuration anyway, so the laziness hopefully won't stay around for very long. :-) 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>
* profiles/base: Patch VirtualBox for kernel 4.3.aszlig2015-09-251-0/+11
| | | | | | | | | | I could have added this to the upstream <nixpkgs>, but we only include and support release versions. This fixes the following failed build for VirtualBox: https://headcounter.org/hydra/build/748430 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Force rebuilding GHC+packages.aszlig2015-09-101-0/+8
| | | | | | | | | | | | | | | | | | | | | I was glad that the issues because of the longstanding GHC determinism bug (https://ghc.haskell.org/trac/ghc/ticket/4012) happened less frequently with GHC 7.10. Unfortunately, they still happen, as reported by @Profpatsch at headcounter/deployment#19 so we're going to override the GHC derivation with an additional attribute that is exported into the environment of the builder. This attribute causes GHC and all dependant packages to be rebuilt on the Headcounter Hydra. The original issue was because we're using the official NixOS binary cache as well as building everything from source. It's helpful for not needing to rebuild the entire world, but for Haskell packages it's harmful until the mentioned GHC bug has been fixed. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Use nix.nixPath to set NIX_PATH.aszlig2015-08-221-9/+7
| | | | | | | | | | | | | | | We were using environment.sessionVariables before, but NixOS/nixpkgs@3f1354a added an option exclusively for this. It internally still sets environment.sessionVariables, so it doesn't change anything for us because we're overriding the full list anyway. But should we switch from overriding to appending/prepending someday, we could get unexpected behaviour, so that's why I'm switching to nix.nixPath here. Thanks to @devhell for bringing this to my attention. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Fix option for virtualbox.aszlig2015-08-201-2/+2
| | | | | | | | The option is no longer called services.virtualboxHost but now virtualisation.virtualbox.host. See NixOS/nixpkgs@6440e9b for more details. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/system: Add an option to build an ISO.aszlig2015-08-132-0/+13
| | | | | | | | | | | | | | Building ISO images for all machines really doesn't make sense if we only have _one_ machine at the moment, where we really use it (kzerza). So we now have an option which can be defined for a particular machine configuration, which is then going te be excempted from the ISO building process. The latter isn't yet implemented however, only the option is here right now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/packages: Add abook to systemPackages.aszlig2015-08-111-0/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Revert disabling hinotify tests.aszlig2015-08-081-7/+0
| | | | | | | | | | | | This reverts the following commits: b0a2a69: profiles/base: Temporarily disable hinotify tests. fc35a3d: profiles/base: Properly disable hinotify tests. These are no longer needed as it has been quickly fixed upstream at NixOS/nixpkgs@e75e0d9, thanks to @peti. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Properly disable hinotify tests.aszlig2015-08-081-5/+6
| | | | | | | | Using nixpkgs.config.haskellPackageOverrides isn't going to work for NixOS configurations, because the other packageOverrides will override the haskellPackageOverrides with a new instantiation of <nixpkgs>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Temporarily disable hinotify tests.aszlig2015-08-081-0/+6
| | | | | | | | | | | | | Build failure is here: https://headcounter.org/hydra/build/722122/nixlog/1/raw I'm overriding this in the base profile for now to get my main workstations up to date ASAP. Cc: @peti Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* dnyarri/mmrnmhrm: Update kernel+conf to v4.2-rc5.aszlig2015-08-081-3/+3
| | | | | | | It has been a long time (~2 months) since I've been back to my workstations, so there was a new kernel release in-between. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Add headcounter.org signing key.aszlig2015-07-291-0/+4
| | | | | | | Since NixOS/nixpkgs@e3a5bca, signed binary caches are mandatory, so let's set it in our default profile for vuizvui. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/base: Always set CP437ish console font.aszlig2015-06-291-0/+1
| | | | | | | | | The default font changed to Terminus in NixOS/nixpkgs@0b68b92. I personally hate Terminus with a passion, so I simply don't want it to cause eye cancer on any of my machines. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Fix override of sessionVariables.aszlig2015-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | Ugh... I must have been quite distracted while writing this. Of course, doing a mkOverride on environment.sessionVariables instead of environment.sessionVariables.NIX_PATH is going to clear *all* sessionVariables instead of just replacing NIX_PATH. This time however, I did a short test with: nix-instantiate --eval --strict -E ' (import <nixpkgs/nixos/lib/eval-config.nix> { modules = [ ./modules/profiles/common.nix ]; }).config.environment.sessionVariables ' ... to make sure I just didn't break it *again*. Also, I'm going to immediately test this after the next evaluation, as my current system is lacking quite a lot of necessary sessionVariables. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/common: Modify NIX_PATH for the channel.aszlig2015-06-111-7/+44
| | | | | | | | | | | That way we no longer need to rewrite anything from <nixpkgs> anymore, because we only need to build one generation of the system and have the right system-wide NIX_PATH for vuizvui. For now however, let's test this properly before we can drop the rewrite of nixos-rebuild and friends. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Fix references to pulseaudio.aszlig2015-05-301-1/+1
| | | | | | | | In NixOS/nixpkgs@be5f408, the "pulseaudio" attribute has been removed to prevent accidentally using it if we just want to have the library, so let's fix this on our side. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* README.md: Fix typosdevhell2015-05-151-4/+4
| | | | | We have a seriously good looking `README.md` here. Let's try to make it sound good too. ;-)
* modules/README: Fix "also is" vs. "is also".aszlig2015-05-151-1/+1
| | | | | | It's my not day for spulling and gremmar. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Fix typo for "listed".aszlig2015-05-151-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Add URL for the option reference.aszlig2015-05-151-0/+7
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* modules/README: Fix typos for module-list.nix.aszlig2015-05-151-2/+2
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/kernel: Update to v4.1-rc3-165-g110bc76.aszlig2015-05-151-2/+2
| | | | | | | Oh noes... we're too old, no particular reason for updating the kernel rather than the consistent urge to stay on mainline master. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* mmrnmhrm/dnyarri: Update kernel/config to 4.1-rc3.aszlig2015-05-121-3/+3
| | | | | | | | | It's about time I update these machines to the latest and greatest kernel. Not much to say about the config as it's mostly catching up with new options, although I'm still not happy to do configuration manually without generalizing common options. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* aszlig/zsh: Add bell character at reset-title.aszlig2015-05-121-1/+1
| | | | | | | | This is useful to get an urgency hint as soon as for example a long running command completes while we're on another terminal and/or workspace. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* profiles/workstation: Use new taskwarrior module.aszlig2015-05-092-1/+1
| | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-09 15:56:10 +0000