From b44f8f0117bdcb2ad0e65497d82de58672182dda Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Sun, 18 Jun 2023 11:18:15 +0200 Subject: [PATCH] nix: update and enable xfce --- nix/configuration.nix | 6 ++++-- nix/flake.lock | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/nix/configuration.nix b/nix/configuration.nix index c962360..c875002 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -68,8 +68,8 @@ xterm.enable = false; xfce = { enable = true; - noDesktop = true; - enableXfwm = false; + # noDesktop = true; + # enableXfwm = false; }; }; services.xserver.displayManager.defaultSession = "xfce+i3"; @@ -268,6 +268,8 @@ dbeaver pavucontrol sqlite + + nomacs ]; nixpkgs.overlays = [ diff --git a/nix/flake.lock b/nix/flake.lock index 050adfe..19281bb 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1686409329, - "narHash": "sha256-anq+tPJ/GyH6TJa9N+ln7klg5e+hmR1Megd0TXIKLEU=", + "lastModified": 1687014065, + "narHash": "sha256-LMjmB6hkwxYzTv/MfOqrXNIP0GCx3p6vSpUv5jgF2cs=", "owner": "doronbehar", "repo": "nix-matlab", - "rev": "7b4a236e3b525f41c53b73013ad05f115a779835", + "rev": "510798c0f09355a02319d608ecf33799466b403b", "type": "gitlab" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686398752, - "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", + "lastModified": 1686979235, + "narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", + "rev": "7cc30fd5372ddafb3373c318507d9932bd74aafe", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1686319658, - "narHash": "sha256-tGWdoUAqKnE866mYFlEfc2a99kxFy31hOQJH5YQKrTQ=", + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae766d59b07c450e0f1de8a1bfd6529089f40849", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686392259, - "narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", + "lastModified": 1686929285, + "narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", + "rev": "93fddcf640ceca0be331210ba3101cee9d91c13d", "type": "github" }, "original": {