Commit b86944825c0c
Changed files (6)
profiles/default.nix
@@ -47,7 +47,6 @@
};
# if hydra is down, don't wait forever
extraOptions = ''
- gc-keep-output = true
connect-timeout = 20
build-cores = 0
'';
@@ -63,7 +62,7 @@
};
system = {
- stateVersion = "17.09";
+ stateVersion = "18.03";
};
systemd.services.nixos-update = {
description = "NixOS Upgrade";
profiles/desktop.nix
@@ -17,23 +17,23 @@
nixpkgs.config = {
packageOverrides = self: with self; let
fetchNixPkgs = { rev, sha256, owner, repo }:
- fetchFromGitHub {
- inherit sha256 rev owner repo;
- };
- unstablePkgs = import (fetchNixPkgs {
- owner = "NixOS";
- repo = "nixpkgs-channels";
- rev = "9c048f4fb66adc33c6b379f2edefcb615fd53de6";
- sha256 = "18xbnfzj753bphzmgp74rn9is4n5ir4mvb4gp9lgpqrbfyy5dl2j";
- }) {};
- sbrPkgs = import (fetchNixPkgs {
- owner = "vdemeester";
- repo = "sbrpkgs";
- rev = "df281994c5e438c25af6c054ebfbd19333f3e132";
- sha256 = "0636k102vw1pmbcch75xvhjlkfk9553bcf6rba5i69m7b5bdsfd0";
- }) {};
- in {
- inherit (unstablePkgs) keybase mpv emacs ledger-cli youtube-dl i3lock-color pipenv syncthing iosevka fira-code;
+ fetchFromGitHub {
+ inherit sha256 rev owner repo;
+ };
+ unstablePkgs = import (fetchNixPkgs {
+ owner = "NixOS";
+ repo = "nixpkgs-channels";
+ rev = "9c048f4fb66adc33c6b379f2edefcb615fd53de6";
+ sha256 = "18xbnfzj753bphzmgp74rn9is4n5ir4mvb4gp9lgpqrbfyy5dl2j";
+ }) {};
+ sbrPkgs = import (fetchNixPkgs {
+ owner = "vdemeester";
+ repo = "sbrpkgs";
+ rev = "df281994c5e438c25af6c054ebfbd19333f3e132";
+ sha256 = "0636k102vw1pmbcch75xvhjlkfk9553bcf6rba5i69m7b5bdsfd0";
+ }) {};
+ in {
+ inherit (unstablePkgs) iosevka fira-code;
inherit (sbrPkgs) ape tuck clasp;
};
allowUnfree = true;
@@ -89,34 +89,34 @@
xkbVariant = "oss";
xkbOptions = "grp:menu_toggle,grp_led:caps,compose:caps";
inputClassSections = [
- ''
-Identifier "TypeMatrix"
-MatchIsKeyboard "on"
-MatchVendor "TypeMatrix.com"
-MatchProduct "USB Keyboard"
-Driver "evdev"
-Option "XbkModel" "tm2030USB"
-Option "XkbLayout" "fr"
-Option "XkbVariant" "bepo"
- ''
- ''
-Identifier "ErgoDox"
-MatchIsKeyboard "on"
-#MatchVendor "ErgoDox_EZ"
-#MatchProduct "ErgoDox_EZ"
-MatchUSBID "feed:1307"
-Driver "evdev"
-Option "XkbLayout" "fr"
-Option "XkbVariant" "bepo"
- ''
-# ''
-#Identifier "evdev touchpad off"
-#MatchIsTouchpad "on"
-#MatchDevicePath "/dev/input/event*"
-#Driver "evdev"
-#Option "Ignore" "true"
-# ''
- ];
+ ''
+ Identifier "TypeMatrix"
+ MatchIsKeyboard "on"
+ MatchVendor "TypeMatrix.com"
+ MatchProduct "USB Keyboard"
+ Driver "evdev"
+ Option "XbkModel" "tm2030USB"
+ Option "XkbLayout" "fr"
+ Option "XkbVariant" "bepo"
+ ''
+ ''
+ Identifier "ErgoDox"
+ MatchIsKeyboard "on"
+ #MatchVendor "ErgoDox_EZ"
+ #MatchProduct "ErgoDox_EZ"
+ MatchUSBID "feed:1307"
+ Driver "evdev"
+ Option "XkbLayout" "fr"
+ Option "XkbVariant" "bepo"
+ ''
+ # ''
+ #Identifier "evdev touchpad off"
+ #MatchIsTouchpad "on"
+ #MatchDevicePath "/dev/input/event*"
+ #Driver "evdev"
+ #Option "Ignore" "true"
+ # ''
+ ];
windowManager = {
i3 = {
enable = true;
@@ -130,10 +130,10 @@ Option "XkbVariant" "bepo"
defaultUser = "vincent";
};
sessionCommands = ''
-${pkgs.networkmanagerapplet}/bin/nm-applet &
-${pkgs.xlibs.xmodmap}/bin/xmodmap ~/.Xmodmap &
-${pkgs.pythonPackages.udiskie}/bin/udiskie -a -t -n -F &
-${pkgs.xss-lock}/bin/xss-lock --ignore-sleep i3lock-color -- --clock -i $HOME/.background-lock --tiling &
+ ${pkgs.networkmanagerapplet}/bin/nm-applet &
+ ${pkgs.xlibs.xmodmap}/bin/xmodmap ~/.Xmodmap &
+ ${pkgs.pythonPackages.udiskie}/bin/udiskie -a -t -n -F &
+ ${pkgs.xss-lock}/bin/xss-lock --ignore-sleep i3lock-color -- --clock -i $HOME/.background-lock --tiling &
'';
};
};
@@ -149,6 +149,7 @@ ${pkgs.xss-lock}/bin/xss-lock --ignore-sleep i3lock-color -- --clock -i $HOME/.b
unifont
emojione
symbola
+ feh
fira
fira-code
fira-mono
@@ -160,36 +161,36 @@ ${pkgs.xss-lock}/bin/xss-lock --ignore-sleep i3lock-color -- --clock -i $HOME/.b
# Polkit.
security.polkit.extraConfig = ''
- polkit.addRule(function(action, subject) {
+ polkit.addRule(function(action, subject) {
if ((action.id == "org.freedesktop.udisks2.filesystem-mount-system" ||
action.id == "org.freedesktop.udisks2.encrypted-unlock-system"
) &&
subject.local && subject.active && subject.isInGroup("users")) {
- return polkit.Result.YES;
+ return polkit.Result.YES;
}
var YES = polkit.Result.YES;
var permission = {
- // required for udisks1:
- "org.freedesktop.udisks.filesystem-mount": YES,
- "org.freedesktop.udisks.luks-unlock": YES,
- "org.freedesktop.udisks.drive-eject": YES,
- "org.freedesktop.udisks.drive-detach": YES,
- // required for udisks2:
- "org.freedesktop.udisks2.filesystem-mount": YES,
- "org.freedesktop.udisks2.encrypted-unlock": YES,
- "org.freedesktop.udisks2.eject-media": YES,
- "org.freedesktop.udisks2.power-off-drive": YES,
- // required for udisks2 if using udiskie from another seat (e.g. systemd):
- "org.freedesktop.udisks2.filesystem-mount-other-seat": YES,
- "org.freedesktop.udisks2.filesystem-unmount-others": YES,
- "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES,
- "org.freedesktop.udisks2.eject-media-other-seat": YES,
- "org.freedesktop.udisks2.power-off-drive-other-seat": YES
+ // required for udisks1:
+ "org.freedesktop.udisks.filesystem-mount": YES,
+ "org.freedesktop.udisks.luks-unlock": YES,
+ "org.freedesktop.udisks.drive-eject": YES,
+ "org.freedesktop.udisks.drive-detach": YES,
+ // required for udisks2:
+ "org.freedesktop.udisks2.filesystem-mount": YES,
+ "org.freedesktop.udisks2.encrypted-unlock": YES,
+ "org.freedesktop.udisks2.eject-media": YES,
+ "org.freedesktop.udisks2.power-off-drive": YES,
+ // required for udisks2 if using udiskie from another seat (e.g. systemd):
+ "org.freedesktop.udisks2.filesystem-mount-other-seat": YES,
+ "org.freedesktop.udisks2.filesystem-unmount-others": YES,
+ "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES,
+ "org.freedesktop.udisks2.eject-media-other-seat": YES,
+ "org.freedesktop.udisks2.power-off-drive-other-seat": YES
};
if (subject.isInGroup("wheel")) {
- return permission[action.id];
+ return permission[action.id];
}
- });
+ });
'';
# Auto refresh nix-channel each day
systemd.user.services.channel-update = {
profiles/dev.go.nix
@@ -6,22 +6,6 @@
[
./dev.nix
];
- nixpkgs.config = {
- packageOverrides = self: with self; let
- fetchNixPkgs = { rev, sha256, owner, repo }:
- fetchFromGitHub {
- inherit sha256 rev owner repo;
- };
- goPkgs = import (fetchNixPkgs {
- owner = "NixOS";
- repo = "nixpkgs-channels";
- rev = "0e7c9b32817e5cbe61212d47a6cf9bcd71789322";
- sha256 = "1dm777cmlhqcwlrq8zl9q2d87h3p70rclpvq36y43kp378f3pd0y";
- }) {};
- in {
- inherit (goPkgs) go gotools golint godef gocode gotests gopkgs gomodifytags go-outline go-symbols goconvey delve vndr dep;
- };
- };
environment.systemPackages = with pkgs; [
go
gcc
@@ -41,6 +25,6 @@
vndr
dep
# misc
- protobuf3_3
+ protobuf
];
}
profiles/dockerization.nix
@@ -7,22 +7,6 @@
# Remove once containerd module is upstream
../service/containerd.nix
];
- nixpkgs.config = {
- packageOverrides = self: with self; let
- fetchNixPkgs = { rev, sha256, owner, repo }:
- fetchFromGitHub {
- inherit sha256 rev owner repo;
- };
- dockerUnstablePkgs = import (fetchNixPkgs {
- owner = "NixOS";
- repo = "nixpkgs-channels";
- rev = "8ecadc12502d59fc8117ca0ed41ede010448fca4";
- sha256 = "102wvwixvnbkr547ay6psvv1x31001mb5y17ibkplyikb91xi2ak";
- }) {};
- in {
- inherit (dockerUnstablePkgs) docker docker-edge docker-proxy containerd runc tini docker-compose docker-machine;
- };
- };
environment.systemPackages = with pkgs; [
python27Packages.docker_compose
docker-machine
@@ -31,7 +15,7 @@
containerd = {
enable = true;
};
- docker-edge = {
+ docker = {
enable = true;
package = pkgs.docker-edge;
liveRestore = false;
profiles/syncthing.nix
@@ -3,9 +3,8 @@
{
services.syncthing = {
enable = true;
- useInotify = true;
user = "vincent";
dataDir = "/home/vincent/.syncthing";
openDefaultPorts = true;
};
-}
\ No newline at end of file
+}
profiles/virtualization.nix
@@ -6,7 +6,6 @@
virtualbox.host.enable = true;
libvirtd = {
enable = true;
- enableKVM = true;
qemuVerbatimConfig = ''
namespaces = []
dynamic_ownership = 0