move unstable to config

This commit is contained in:
Daniel Løvbrøtte Olsen 2019-11-01 07:18:12 +01:00
parent 879de6fb07
commit cfcc1f88bd
2 changed files with 52 additions and 54 deletions

View File

@ -3,6 +3,7 @@
oraclejdk.accept_license = true; oraclejdk.accept_license = true;
packageOverrides = pkgs: { packageOverrides = pkgs: {
unstable = import <nixos-unstable> { };
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
inherit pkgs; inherit pkgs;
}; };

101
home.nix
View File

@ -1,8 +1,5 @@
{ pkgs, config, lib, ...}: { pkgs, config, lib, ...}:
let
unstable = import <nixos-unstable> {};
in
{ {
#home.file.nixoverlays = { #home.file.nixoverlays = {
# source = ./overlays; # source = ./overlays;
@ -11,66 +8,66 @@ in
imports = [ ./config/xsession/xsession.nix ./config/computer/laptop.nix]; imports = [ ./config/xsession/xsession.nix ./config/computer/laptop.nix];
home.packages = [ home.packages = with pkgs; [
pkgs.libguestfs libguestfs
pkgs.virtmanager virtmanager
pkgs.virt-viewer virt-viewer
pkgs.ansible ansible
pkgs.nixops nixops
pkgs.ldns ldns
pkgs.steam steam
pkgs.dolphinEmuMaster dolphinEmuMaster
pkgs.dwarf-fortress-packages.dwarf-fortress-full dwarf-fortress-packages.dwarf-fortress-full
pkgs.multimc multimc
pkgs.superTuxKart superTuxKart
# pkgs.warsow # warsow
pkgs.minetest minetest
pkgs.mpv mpv
pkgs.sxiv sxiv
pkgs.spotify spotify
pkgs.mumble mumble
pkgs.dolphin dolphin
pkgs.krename krename
pkgs.kdeApplications.dolphin-plugins kdeApplications.dolphin-plugins
pkgs.ffmpegthumbs ffmpegthumbs
pkgs.kdeApplications.kdegraphics-thumbnailers kdeApplications.kdegraphics-thumbnailers
pkgs.kdeFrameworks.kded kdeFrameworks.kded
pkgs.kdeFrameworks.kio kdeFrameworks.kio
pkgs.kdeApplications.kio-extras kdeApplications.kio-extras
pkgs.unzip unzip
pkgs.p7zip p7zip
pkgs.parallel parallel
pkgs.sshfs sshfs
pkgs.jq jq
pkgs.gnome3.gedit gnome3.gedit
unstable.vscode unstable.vscode
pkgs.texlive.combined.scheme-full texlive.combined.scheme-full
pkgs.kile kile
pkgs.libreoffice-unwrapped libreoffice-unwrapped
pkgs.gimp gimp
pkgs.krita krita
pkgs.inkscape inkscape
pkgs.digikam digikam
pkgs.godot godot
pkgs.blender blender
pkgs.audacity audacity
pkgs.mixxx mixxx
pkgs.ardour ardour
pkgs.kdenlive kdenlive
pkgs.frei0r frei0r
pkgs.mkvtoolnix mkvtoolnix
unstable.youtubeDL unstable.youtubeDL
pkgs.ffmpeg-full ffmpeg-full
pkgs.geogebra geogebra
]; ];
programs.firefox = { programs.firefox = {