diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 01:10:57 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-06-22 01:22:49 +0200 |
commit | 3cc287e2683537722bdc15694b92c5985f9a1c4f (patch) | |
tree | 42fabc46c315bb80aab6a2b5530122a52270778d /devhell/machines/machine_common.nix | |
parent | 3e94e96826f522c31e054bae1b5fd1af2cbfb309 (diff) |
Move devhell's machines into machines/
In his configuration he had machine_common.nix which was imported from the other machine_*.nix files. However in order to start modularizing I've converted machine_common.nix into a proper NixOS module which now resides in modules/user/devhell/profiles/base.nix and can be simply activated via: vuizvui.user.devhell.profiles.base.enable = true; Apart from that I've removed the following configuration definitiens from machine_common.nix: nix.binaryCaches = [ "https://headcounter.org/hydra/" "https://cache.nixos.org/" ]; nix.requireSignedBinaryCaches = true; nix.binaryCachePublicKeys = [ "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.nixPath = lib.mkOptionDefault [ "nixpkgs=/home/dev/git/remote/other_github/nixpkgs" ]; The reason for removing them is because we already handle that via the vuizvui core modules (modules/core/common.nix). I've tested this by evaluating the machines by temporarily setting "allowUnfree = true" (which is part of another module I didn't migrate yet) and it succeeds. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
Diffstat (limited to 'devhell/machines/machine_common.nix')
-rw-r--r-- | devhell/machines/machine_common.nix | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/devhell/machines/machine_common.nix b/devhell/machines/machine_common.nix deleted file mode 100644 index b7fb5215..00000000 --- a/devhell/machines/machine_common.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - boot = { - kernelPackages = pkgs.linuxPackages_latest; - cleanTmpDir = true; - }; - - nix = { - buildCores = 0; - useSandbox = true; - binaryCaches = [ - "https://headcounter.org/hydra/" - "https://cache.nixos.org/" - ]; - requireSignedBinaryCaches = true; - binaryCachePublicKeys = [ - "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg=" - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - ]; - nixPath = lib.mkOptionDefault [ "nixpkgs=/home/dev/git/remote/other_github/nixpkgs" ]; - }; - - time = { - timeZone = "Europe/London"; - }; - - system = { - fsPackages = with pkgs; [ - sshfsFuse - fuse - cryptsetup - ]; - }; - - hardware = { - enableAllFirmware = true; - cpu.intel.updateMicrocode = true; - opengl = { - s3tcSupport = true; - driSupport32Bit = true; - }; - pulseaudio = { - enable = true; - systemWide = false; - }; - }; - - programs = { - ssh = { - startAgent = false; - }; - zsh = { - enable = true; - enableCompletion = true; - }; - bash = { - enableCompletion = true; - promptInit = '' - # Provide a nice prompt. - PROMPT_COLOR="1;31m" - let $UID && PROMPT_COLOR="1;32m" - PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " - if test "$TERM" = "xterm"; then - PS1="\[\033]2;\h:\u:\w\007\]$PS1" - fi - eval `dircolors ~/.dir_colors` - ''; - }; - }; - - environment = { - shells = [ "/run/current-system/sw/bin/zsh" ]; - sessionVariables.TERM = "xterm-256color"; - }; - - fonts = { - fontconfig = { - enable = true; - ultimate = { - enable = true; - }; - }; - enableGhostscriptFonts = true; - enableCoreFonts = true; - fonts = with pkgs; [ - clearlyU - cm_unicode - dejavu_fonts - dosemu_fonts - font-awesome-ttf - freefont_ttf - hack-font - inconsolata - powerline-fonts - proggyfonts - source-code-pro - source-sans-pro - source-serif-pro - terminus_font - tewi-font - ttf_bitstream_vera - ubuntu_font_family - unifont - vistafonts - wqy_microhei - ] ++ lib.filter lib.isDerivation (lib.attrValues lohit-fonts); - }; -} |