From bfcc1c74e13928efccdae9802f58e59e1b43e66b Mon Sep 17 00:00:00 2001 From: kat witch Date: Mon, 30 Nov 2020 04:01:45 +0000 Subject: [PATCH] Fixes to the XFCE profile that actually make it work properly. --- configuration/hosts/yule/configuration.nix | 1 + configuration/profiles/common/default.nix | 3 +-- configuration/profiles/gnome/default.nix | 1 + configuration/profiles/xfce/default.nix | 6 ++---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configuration/hosts/yule/configuration.nix b/configuration/hosts/yule/configuration.nix index 9504796e..ef7cd8f1 100644 --- a/configuration/hosts/yule/configuration.nix +++ b/configuration/hosts/yule/configuration.nix @@ -14,6 +14,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + boot.supportedFilesystems = [ "zfs" ]; networking.hostId = "dddbb888"; networking.hostName = "yule"; diff --git a/configuration/profiles/common/default.nix b/configuration/profiles/common/default.nix index 32d3fc96..48401235 100644 --- a/configuration/profiles/common/default.nix +++ b/configuration/profiles/common/default.nix @@ -25,8 +25,7 @@ in { nix.gc.options = lib.mkDefault "--delete-older-than 1w"; nix.trustedUsers = [ "root" "@wheel" ]; environment.variables.EDITOR = "kak"; - boot.supportedFilesystems = [ "zfs" ]; - + services.openssh.enable = true; services.openssh.ports = lib.mkDefault [ 62954 ]; services.openssh.passwordAuthentication = false; diff --git a/configuration/profiles/gnome/default.nix b/configuration/profiles/gnome/default.nix index 1cf4713a..9a02c5d6 100644 --- a/configuration/profiles/gnome/default.nix +++ b/configuration/profiles/gnome/default.nix @@ -13,6 +13,7 @@ pkgs.gnomeExtensions.appindicator pkgs.gnomeExtensions.dash-to-dock pkgs.gnomeExtensions.arc-menu + pkgs.xfce.thunar ]; }; diff --git a/configuration/profiles/xfce/default.nix b/configuration/profiles/xfce/default.nix index 24250080..55be1c63 100644 --- a/configuration/profiles/xfce/default.nix +++ b/configuration/profiles/xfce/default.nix @@ -7,8 +7,7 @@ package = lib.mkForce pkgs.gnome3.gvfs; }; - home-manager.users.kat = { - home.packages = [ + environment.systemPackages = [ pkgs.xfce.xfce4-terminal pkgs.xfce.thunar pkgs.xfce.orage @@ -17,6 +16,5 @@ pkgs.xfce.xfce4-pulseaudio-plugin pkgs.xfce.xfce4-whiskermenu-plugin pkgs.xfce.xfce4-screenshooter - ]; - }; + ]; }