a mix of everything again (oops)

- removed hyprland inputs
- updated inputs and fixed some warnings
- redid a lot of my config, mostly removing old stuff that i don't use and configuring plasma with plasma-manager

flake.nix

@@ -26,19 +26,19 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Hyprland stuff
-    hyprland = {
-      url = "github:hyprwm/Hyprland?ref=v0.36.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hypr-smw = {
-      url = "github:Duckonaut/split-monitor-workspaces/d0012b8b0f764e32dd7b82f7a94b8c30197d7dc8";
-      inputs.hyprland.follows = "hyprland";
-    };
-    hypr-hy3 = {
-      url = "github:outfoxxed/hy3?ref=hl0.36.0";
-      inputs.hyprland.follows = "hyprland";
-    };
+    ## Hyprland stuff
+    #hyprland = {
+    #  url = "github:hyprwm/Hyprland?ref=v0.36.0";
+    #  inputs.nixpkgs.follows = "nixpkgs";
+    #};
+    #hypr-smw = {
+    #  url = "github:Duckonaut/split-monitor-workspaces/d0012b8b0f764e32dd7b82f7a94b8c30197d7dc8";
+    #  inputs.hyprland.follows = "hyprland";
+    #};
+    #hypr-hy3 = {
+    #  url = "github:outfoxxed/hy3?ref=hl0.36.0";
+    #  inputs.hyprland.follows = "hyprland";
+    #};
 
     # Flake for testing COSMIC on NixOS
     nixos-cosmic = {

hosts/ocean-t460/configuration.nix

@@ -13,7 +13,7 @@
       };
       sway.enable = true;
       qtile.enable = true;
-      hyprland.enable = true;
+      hyprland.enable = false;
     };
     hardware.laptop.enable = true;
     system = {

hosts/ocean-t460/hardware-configuration.nix

@@ -40,9 +40,5 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "conservative";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault true;
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
+  hardware.graphics.enable = true;
 }

hosts/twinkpad/configuration.nix

@@ -1,30 +1,30 @@
 { config, pkgs, ... }: {
 
-	virtualisation.docker.enable = true;
+  virtualisation.docker.enable = true;
 
-	modules = {
-		desktop = {
-			gaming = {
-				steam.enable 		= true;
-				#itch.enable 		= true;
-				olympus.enable 		= true;
-				minecraft.enable 	= true;
-			};
-			awesome = {
-				enable = true;
-				package = pkgs.awesome-git;
-			};
-			hyprland.enable = true;
-			# sway.enable = true;
-			river.enable = true;
-		};
-		hardware.laptop.enable = true;
-		system = {
-			sound.enable = true;
-			xorg = {
-				enable = true;
-				#layout = "fck";
-			};
-		};
-	};
+  modules = {
+    desktop = {
+      gaming = {
+        steam.enable = true;
+        #itch.enable 		= true;
+        olympus.enable = true;
+        minecraft.enable = true;
+      };
+      awesome = {
+        enable = true;
+        package = pkgs.awesome-git;
+      };
+      hyprland.enable = false;
+      # sway.enable = true;
+      river.enable = true;
+    };
+    hardware.laptop.enable = true;
+    system = {
+      sound.enable = true;
+      xorg = {
+        enable = true;
+        #layout = "fck";
+      };
+    };
+  };
 }

modules/desktop/qtile.nix

@@ -11,7 +11,11 @@ in {
   config = mkIf cfg.enable {
     services.xserver.windowManager.qtile = {
       enable = true;
-      backend = "wayland";
+
+      # NOTE: no longer has any effect
+      # The qtile package now provides
+      # separate display sessions for both X11 and Wayland.
+      # backend = "wayland";
     };
   };
 }

modules/users.nix

@@ -128,7 +128,7 @@ in
     extraSpecialArgs = { inherit inputs system; };
     sharedModules = [
       inputs.anyrun.homeManagerModules.default
-      inputs.hyprland.homeManagerModules.default
+      #inputs.hyprland.homeManagerModules.default
       inputs.plasma-manager.homeManagerModules.plasma-manager
     ];
     users = homeCfg;

users/apro/programs/apps/vscodium.nix

@@ -1,91 +1,91 @@
 { config, pkgs, lib, ... }: {
 
-	programs.vscode = {
-		enable = true;
-		package = pkgs.vscodium;
+  programs.vscode = {
+    enable = true;
+    package = pkgs.vscodium;
 
-		userSettings = {
-			editor = {
-				fontFamily = "'Iosevka NF'";
-				fontLigatures = "'ss14'";
-				cursorBlinking = "smooth";
-				cursorSmoothCaretAnimation = "on";
-				insertSpaces = false;
-				detectIndentation = false;
-				tabSize = 4;
-				minimap.enabled = false;
-				renderWhitespace = "none";
-				formatOnSave = true;
-			};
+    userSettings = {
+      editor = {
+        fontFamily = "'Iosevka NF'";
+        fontLigatures = "'ss14'";
+        cursorBlinking = "smooth";
+        cursorSmoothCaretAnimation = "on";
+        insertSpaces = false;
+        detectIndentation = false;
+        tabSize = 4;
+        minimap.enabled = false;
+        renderWhitespace = "none";
+        formatOnSave = true;
+      };
 
-			terminal.integrated = {
-				cursorStyle = "underline";
-				cursorWidth = 2;
-				fontFamily = "Iosevka NF";
-				tabs.defaultIcon = "heart-filled";
-			};
+      terminal.integrated = {
+        cursorStyle = "underline";
+        cursorWidth = 2;
+        fontFamily = "Iosevka NF";
+        tabs.defaultIcon = "heart-filled";
+      };
 
-			workbench = {
-				colorTheme = "Everblush";
-				productIconTheme = "material-product-icons";
-				iconTheme = "file-icons";
-			};
+      workbench = {
+        colorTheme = "Everblush";
+        productIconTheme = "material-product-icons";
+        iconTheme = "file-icons";
+      };
 
-			window = {
-				menuBarVisibility = "compact";
-				zoomLevel = 1;
-			};
+      window = {
+        menuBarVisibility = "compact";
+        zoomLevel = 1;
+      };
 
-			nix.serverPath = "nil";
-			git.confirmSync = false;
-			extensions.autoCheckUpdates = true;
-		};
+      nix.serverPath = "nil";
+      git.confirmSync = false;
+      extensions.autoCheckUpdates = true;
+    };
 
-		extensions = (with pkgs.open-vsx; [
-			# vim motions (requirement ‼️)
-			vscodevim.vim
+    extensions = (with pkgs.open-vsx; [
+      # vim motions (requirement ‼️)
+      vscodevim.vim
 
-			# themes
-			catppuccin.catppuccin-vsc
-			mangeshrex.everblush
+      # themes
+      catppuccin.catppuccin-vsc
+      #mangeshrex.everblush
 
-			# icons
-			pkief.material-product-icons
-			file-icons.file-icons
+      # icons
+      pkief.material-product-icons
+      file-icons.file-icons
 
-			# languages and formatting
-			editorconfig.editorconfig
-			ziglang.vscode-zig
-			rust-lang.rust
-			rust-lang.rust-analyzer
-			llvm-vs-code-extensions.vscode-clangd
-			sumneko.lua
-			ms-python.python
-			ms-pyright.pyright
-			bbenoist.nix
-			arrterian.nix-env-selector
-			pinage404.nix-extension-pack
-			jnoortheen.nix-ide
-			bungcip.better-toml
-			svelte.svelte-vscode
+      # languages and formatting
+      editorconfig.editorconfig
+      ziglang.vscode-zig
+      rust-lang.rust
+      rust-lang.rust-analyzer
+      llvm-vs-code-extensions.vscode-clangd
+      sumneko.lua
+      ms-python.python
+      ms-pyright.pyright
+      bbenoist.nix
+      arrterian.nix-env-selector
+      pinage404.nix-extension-pack
+      jnoortheen.nix-ide
+      bungcip.better-toml
+      svelte.svelte-vscode
 
-			# git
-			eamodio.gitlens
-			github.vscode-pull-request-github
+      # git
+      eamodio.gitlens
+      github.vscode-pull-request-github
 
-			# extra features
-			mkhl.direnv
-			oderwat.indent-rainbow
-			manuel-underscore.figura
-		])
-		++ (with pkgs.vscode-marketplace; [
+      # extra features
+      mkhl.direnv
+      oderwat.indent-rainbow
+      manuel-underscore.figura
+    ])
+    ++ (with pkgs.vscode-marketplace; [
 
-			# leftover language support
-			vgalaktionov.moonscript
-			tnze.snbt
+      # leftover language support
+      vgalaktionov.moonscript
+      tnze.snbt
 
-			# github
-			github.remotehub
-		]);
-	};
+      # github
+      github.remotehub
+    ]);
+  };
 }