feat: switch to plasma because gnome bad

flake.lock

@@ -90,11 +90,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1611544074,
+        "lastModified": 1611611233,
-        "narHash": "sha256-wa+TRNehoT187YFOejXqHMZMhVjBbYZGF0EWYfGqbJI=",
+        "narHash": "sha256-xDAvVVvHbQ3Sf+Q5GVNbiYFZ2PDwtCoeAFRytCZNq30=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa8868c7cca8d30706a68a876d048968c83e1cf1",
+        "rev": "fa0eac3dff5757f6ca106d7325db6c75d22f7e5e",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1611605212,
+        "lastModified": 1611666253,
-        "narHash": "sha256-JZGt4FgYcH/iXtn4jepRjX8CzZaGa1RZkCj6l5C9/ZE=",
+        "narHash": "sha256-YdDc66rBJ62u3oZTdZWxtFcppfC50B36/g3+tSwKxgM=",
         "owner": "colemickens",
         "repo": "nixpkgs-wayland",
-        "rev": "74afaa2b0886d2d40f5f21dc06a58c44ec1add57",
+        "rev": "e492f1af4e7c7550a1454feaec59a296dcce35be",
         "type": "github"
       },
       "original": {

hosts/lungmen.nix

@@ -166,7 +166,7 @@ in
   services.xserver = {
     videoDrivers = [ "amdgpu" ];
   };
-  virtualisation.docker.enable = true;
+  virtualisation.podman.enable = true;
   services.postgresql = {
     enable = false;
     enableTCPIP = true;

profiles/network/default.nix

@@ -1,10 +1,24 @@
 {
   imports = [ ./dns ];
 
+  networking.networkmanager.enable = false;
+  networking.dhcpcd.enable = true;
   networking.useDHCP = false;
-
   networking.dhcpcd.extraConfig = ''
     noarp
     nodelay
   '';
+
+  /*systemd.network = {
+    enable = true;
+    networks = {
+      internet0 = {
+        matchConfig = { Name = "enp6s0"; };
+        networkConfig = {
+          Address = "192.168.1.33";
+          Gateway = "192.168.1.255";
+        };
+      };
+    };
+  };*/
 }

profiles/network/nginx.nix

@@ -31,5 +31,5 @@
   #   };
   # };
 
-  networking.firewall.allowedTCPPorts = [ 8000 8448 ];
+  # networking.firewall.allowedTCPPorts = [ 8000 8448 ];
 }

users/patriot/default.nix

@@ -5,7 +5,7 @@
     isNormalUser = true;
     createHome = true;
     home = "/home/patriot";
-    extraGroups = [ "wheel" "adbusers" "dialout" "docker" ];
+    extraGroups = [ "wheel" "adbusers" "dialout" ];
     shell = pkgs.zsh;
     hashedPassword =
       "$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";
@@ -30,15 +30,47 @@
     };
   };
 
-  security.pam.services.patriot.enableGnomeKeyring = true;
+  security.pam.services.patriot = {
+    enableGnomeKeyring = true;
+    enableKwallet = false;
+  };
   services = {
     gnome3 = {
       gnome-keyring.enable = true;
     };
     xserver = {
       enable = true;
-      desktopManager.gnome3.enable = true;
+      desktopManager = {
-      displayManager.gdm.enable = true;
+        plasma5.enable = true;
+        gnome3.enable = false;
+        xterm.enable = false;
+      };
+      displayManager = {
+        autoLogin = {
+          enable = true;
+          user = "patriot";
+        };
+        lightdm.enable = false;
+        gdm = {
+          enable = false;
+          wayland = true;
+        };
+        sddm.enable = true;
+        startx.enable = false;
+      };
+    };
+  };
+
+  systemd.user.services.gnome-session-restart-dbus.serviceConfig = {
+    Slice = "-.slice";
+  };
+  systemd = {
+    targets = {
+      network-online.enable = false;
+    };
+    services = {
+      systemd-networkd-wait-online.enable = false;
+      NetworkManager-wait-online.enable = false;
     };
   };
 }

users/patriot/home.nix

@@ -213,7 +213,7 @@ in
           font-awesome
           (nerdfonts.override { fonts = [ "Iosevka" ]; })
           # Programs
-          gnome3.gnome-tweaks
+          latte-dock
           gnome3.seahorse
           wine-staging
           cachix
@@ -228,7 +228,7 @@ in
           youtube-dl
           ffmpeg
           mupdf
-          transmission-gtk
+          transmission-qt
           gitAndTools.gh
           steam-run
           lutris
@@ -464,23 +464,23 @@ in
         dotDir = ".config/zsh";
         history.path = ".local/share/zsh/history";
         envExtra = ''
-          export SDL_VIDEODRIVER=wayland
+          #export SDL_VIDEODRIVER=wayland
           # needs qt5.qtwayland in systemPackages
-          export QT_QPA_PLATFORM=wayland
+          #export QT_QPA_PLATFORM=wayland
-          export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+          #export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
           # Fix for some Java AWT applications (e.g. Android Studio),
           # use this if they aren't displayed properly:
-          export _JAVA_AWT_WM_NONREPARENTING=1
+          #export _JAVA_AWT_WM_NONREPARENTING=1
         '';
-        # loginExtra =
+        /*loginExtra =
-        #   let
+          let
-        #     deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
+            #deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
-        #   in
+          in
-        #   ''
+          ''
-        #     if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
+            if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
-        #         exec ${pkgBin deCmd}
+                exec startplasma-x11
-        #     fi
+            fi
-        #   '';
+          '';*/
         initExtra = ''
           bindkey "$terminfo[kRIT5]" forward-word
           bindkey "$terminfo[kLFT5]" backward-word
@@ -748,7 +748,7 @@ in
         maxCacheTtl = 3600 * 24;
         maxCacheTtlSsh = maxCacheTtl;
         grabKeyboardAndMouse = false;
-        pinentryFlavor = "gnome3";
+        pinentryFlavor = "qt";
       };
     };