configuration.nix

@@ -51,7 +51,7 @@
   # Enable the X11 windowing system.
   services.xserver.enable = true;
   # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = false;
+  services.xserver.displayManager.sddm.enable = false;
   services.xserver.desktopManager.plasma5.enable = false;
   services.greetd.enable = true;
   programs.regreet.enable = true;
@@ -67,8 +67,8 @@
   
   # Configure keymap in X11
   services.xserver = {
-    xkb.layout = "us";
+    layout = "us";
-    xkb.variant = "";
+    xkbVariant = "";
   };
 
   # Enable CUPS to print documents.
@@ -103,14 +103,13 @@
     dates = "weekly";
     options = "--delete-older-than 10d";
   };
-  
+  #programs.zsh.enable = true;
-  programs.zsh.enable = true;
   services.flatpak.enable = true;
   users.users.insert = {
     isNormalUser = true;
     description = "insert";
     extraGroups = [ "networkmanager" "wheel" "input" "docker" "libvirtd" ];
-    shell = pkgs.zsh;
+    #shell = pkgs.zsh;
   };
 
   programs.waybar = {
@@ -146,8 +145,8 @@
   
   security.polkit.enable = true;
   # Enable automatic login for the user.
-  services.displayManager.autoLogin.enable = false;
+  services.xserver.displayManager.autoLogin.enable = false;
-  services.displayManager.autoLogin.user = "insert";
+  services.xserver.displayManager.autoLogin.user = "insert";
   
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -312,6 +311,7 @@ icon_theme_name = "Breeze Dark"
   #   enableSSHSupport = true;
   # };
   # List services that you want to enable:
+  services.sunshine.enable = true;
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 

flake.nix

@@ -36,7 +36,6 @@
       modules = [
         flatpaks.nixosModules.default
         ./configuration.nix
-        ./special/insertpclinux.nix
         agenix.nixosModules.default
         home-manager.nixosModules.home-manager
           {

home.nix

@@ -20,7 +20,8 @@
     pkgs.libsForQt5.gwenview 
     pkgs.libsForQt5.qtstyleplugins 
     pkgs.libsForQt5.qt5ct 
-    pkgs.oh-my-zsh  
+    pkgs.oh-my-zsh 
+    pkgs.zsh 
     pkgs.kubectl 
     pkgs.kubernetes-helm 
     pkgs.vscodium 
@@ -40,6 +41,16 @@
   ];
   services.syncthing.enable = true;
   
+  # programs.zsh.oh-my-zsh.enable = true;
+  #programs.waybar = {
+   #enable = true;
+   #package = pkgs.waybar.overrideAttrs (oldAttrs: {
+    #mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+   #});
+   #config = {
+   #   modules = [{module =  "wlr/workspace"};];
+   #};
+  #}
   gtk = {
       enable = true;
       iconTheme = {
@@ -136,7 +147,6 @@
       signByDefault = true;
     };
   };
-  programs.thefuck.enable = true;
   programs.git-credential-oauth.enable = true;
   programs.kitty = {
     enable = true;

special/insertpclinux.nix

@@ -41,7 +41,6 @@
   };
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
-  services.sunshine.enable = true;
   security.pki.certificateFiles = [
     /home/insert/Documents/nextcloud/nextcloudinternal.pem
     /home/insert/Documents/personal-vaultwarden/cert.pem