commit 10f9ee53012be901e5d0b5dc52a3cf35fa07f896
parent 0163b6557ba087924ef5711936f8ef88faabbb07
Author: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 1 Oct 2020 14:12:24 +0200
systems: update hokkaido
- enable docker and podman
- add initial dconf setup
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/systems/hokkaido.nix b/systems/hokkaido.nix
@@ -20,18 +20,19 @@ in
(import ../users).root
];
fileSystems."/" =
- { device = "/dev/disk/by-uuid/3e86d004-5554-4a90-b436-fcca63775f9d";
+ {
+ device = "/dev/disk/by-uuid/3e86d004-5554-4a90-b436-fcca63775f9d";
fsType = "ext4";
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/D91F-14E8";
+ {
+ device = "/dev/disk/by-uuid/D91F-14E8";
fsType = "vfat";
};
swapDevices =
- [ { device = "/dev/disk/by-uuid/f065180d-8889-45ba-81d1-a67ac746dfeb"; }
- ];
+ [{ device = "/dev/disk/by-uuid/f065180d-8889-45ba-81d1-a67ac746dfeb"; }];
networking = {
hostName = hostname;
@@ -79,6 +80,8 @@ in
services.gnome3.core-shell.enable = true;
services.gnome3.core-os-services.enable = true;
services.gnome3.core-utilities.enable = true;
+ virtualisation.docker.enable = true;
+ virtualisation.podman.enable = true;
fonts = {
enableFontDir = true;
diff --git a/users/vincent/desktop/dconf.nix b/users/vincent/desktop/dconf.nix
@@ -0,0 +1,20 @@
+{ lib, ... }:
+let
+ mkTuple = lib.hm.gvariant.mkTuple;
+in
+{
+ dconf.settings = {
+ "org/gnome/desktop/input-sources" = {
+ "current" = "uint32 0";
+ "sources" = [ (mkTuple [ "xkb" "fr+bepo" ]) (mkTuple [ "xkb" "us" ]) ];
+ "xkb-options" = [ "lv3:ralt_switch" "caps:ctrl_modifier" ];
+ };
+
+ "org/gnome/desktop/background" = {
+ "picture-uri" = "file:///home/vincent/desktop/pictures/wallpapers/dynamics/firewatch/firewatch.xml";
+ };
+ "org/gnome/desktop/screensaver" = {
+ "picture-uri" = "file:///home/vincent/desktop/pictures/wallpapers/dynamics/firewatch/firewatch.xml";
+ };
+ };
+}
diff --git a/users/vincent/desktop/gnome.nix b/users/vincent/desktop/gnome.nix
@@ -11,6 +11,7 @@
./mpv.nix
./redshift.nix
./spotify.nix
+ ./dconf.nix
];
home.sessionVariables = { WEBKIT_DISABLE_COMPOSITING_MODE = 1; };
home.packages = with pkgs; [