Desktop changes, build script changes

5 files changed, 26 insertions, 14 deletions

diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 654b245..db6615d 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -39,13 +39,13 @@ args@{
         efiInstallAsRemovable = true;
       };
     };
-    kernelPatches = [
-      {
-        # FIXME: https://gitlab.freedesktop.org/drm/amd/-/issues/3437
-        name = "drm-amd-3437-hack";
-        patch = ./hacks/drm-amd-3437.patch;
-      }
-    ];
+    #kernelPatches = [
+    #  {
+    #    # FIXME: https://gitlab.freedesktop.org/drm/amd/-/issues/3437
+    #    name = "drm-amd-3437-hack";
+    #    patch = ./hacks/drm-amd-3437.patch;
+    #  }
+    #];
 
     #readOnlyNixStore = false;
   };
@@ -86,7 +86,7 @@ args@{
     ];
 
     defaultGateway = "192.168.0.1";
-    # useDHCP = true;
+    #useDHCP = true; # Doesn't work with NetworkManager, investigate
   };
 
   time.timeZone = "Europe/Brussels";
@@ -120,6 +120,7 @@ args@{
     };
   };
 
+  services.xserver.desktopManager.gnome.enable = false;
   environment.systemPackages = with pkgs; [
     eog
     mpv
@@ -194,12 +195,11 @@ args@{
 
   xdg = {
     portal = {
-
       enable = true;
       extraPortals = with pkgs; [
         #xdg-desktop-portal-gtk
         xdg-desktop-portal-xapp
-        (callPackage ../../modules/packages/xdg-desktop-portal-gtk.nix { })
+#        (callPackage ../../modules/packages/xdg-desktop-portal-gtk.nix { })
       ];
       config = {
         common = {
@@ -207,8 +207,6 @@ args@{
         };
       };
       xdgOpenUsePortal = true;
-      #gtkUsePortal = true; # deprecated
-
     };
     #sounds.enable = true;
     #mime.enable = true;
diff --git a/host/Rory-desktop/hooks/post-rebuild.sh b/host/Rory-desktop/hooks/post-rebuild.sh
new file mode 100755
index 0000000..30733ad
--- /dev/null
+++ b/host/Rory-desktop/hooks/post-rebuild.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+set -x
+
+git restore --staged hardware-configuration.nix
+git restore --staged Ran.ca
+git restore --staged modules/opensuse/
+git restore --staged opensuse/
\ No newline at end of file
diff --git a/host/Rory-desktop/hooks/pre-rebuild.sh b/host/Rory-desktop/hooks/pre-rebuild.sh
new file mode 100755
index 0000000..d4ec9d3
--- /dev/null
+++ b/host/Rory-desktop/hooks/pre-rebuild.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+set -x
+
+git add -f hardware-configuration.nix
+git add -f Ran.ca
+git add -f modules/opensuse/
+git add -f opensuse/
\ No newline at end of file
diff --git a/host/Rory-desktop/printing.nix b/host/Rory-desktop/printing.nix
index f25580f..351b59f 100644
--- a/host/Rory-desktop/printing.nix
+++ b/host/Rory-desktop/printing.nix
@@ -14,7 +14,7 @@
 
   environment.systemPackages = with pkgs; [
     xsane
-    gnome.simple-scan
+    simple-scan
   ];
 
   hardware = {
@@ -39,7 +39,7 @@
     };
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       reflector = true;
       publish = {
         workstation = true;
diff --git a/host/Rory-nginx/post-rebuild.sh b/host/Rory-nginx/hooks/post-rebuild.sh
index 9b0c17c..9b0c17c 100755
--- a/host/Rory-nginx/post-rebuild.sh
+++ b/host/Rory-nginx/hooks/post-rebuild.sh