Flake update. Quickshell on Desktop

hosts/desktop/configuration.nix

@@ -171,8 +171,8 @@
 
     hyprland = {
       enable = true;
-      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-      portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+      package = pkgs.hyprland;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
       xwayland.enable = true;
       withUWSM = true;
       plugins = [ ];
@@ -195,7 +195,7 @@
     useGlobalPkgs = true;
     extraSpecialArgs = { inherit inputs; inherit cfg; };
     users = {
-      "liamm" = import ./home.nix;
+      "${cfg.username}" = import ./home.nix;
     };
     backupFileExtension = ".bak";
   };
@@ -204,15 +204,16 @@
     alacritty
     bat
     discord
-    discord-canary
     fd
     file
+    ghostty
     glib
     gnome-keyring
     libdrm
     libnotify
     mesa
     neovim
+    quickshell
     ripgrep
     spotify
     unzip
@@ -237,7 +238,6 @@
       extraPortals = with pkgs;[ 
         xdg-desktop-portal-gtk 
         xdg-desktop-portal-wlr
-        xdg-desktop-portal-hyprland
       ];
       config = {
         common = {

hosts/desktop/file.nix

@@ -22,7 +22,7 @@ in
 
     # Configs
     ".config/hypr" = {
-      source = ../../configs/hypr;
+      source = ../../configs/hypr-desktop;
       outOfStoreSymlink = true;
       recursive = true;
     };

hosts/desktop/home.nix

@@ -9,9 +9,6 @@
 }:
 
 {
-  home.username = "liamm";
-  home.homeDirectory = "/home/liamm";
-
   home.username = cfg.username;
   home.homeDirectory = cfg.homeDirectory;
 
@@ -73,11 +70,11 @@
   xdg.configFile = {
     "emacs" = {
       recursive = true;
-      source = ../../modules/non-nix_configs/emacs;
+      source = ../../configs/emacs;
     };
 
-    "user-dirs.dirs".source = ../../modules/non-nix_configs/user-dirs.dirs;
-    "user-dirs.locale".source = ../../modules/non-nix_configs/user-dirs.locale;
+    "user-dirs.dirs".source = ../../configs/user-dirs.dirs;
+    "user-dirs.locale".source = ../../configs/user-dirs.locale;
   };
 
   # Let Home Manager install and manage itself.

hosts/desktop/pkgs.nix

@@ -7,7 +7,6 @@
   # BEGIN PACKAGES
   home.packages = with pkgs; [
     audacity
-    android-studio
     bat
     brave
     brightnessctl
@@ -20,7 +19,7 @@
     floorp
     fzf
     genymotion
-    gimp
+    # gimp
     gtk4
     gvfs
     grimblast
@@ -42,14 +41,19 @@
     pamixer
     pavucontrol
     powertop
-    prismlauncher
+    # prismlauncher
     protonvpn-cli
     pywal
     qbittorrent
     signal-desktop
     swaynotificationcenter
     swww
-    texliveFull
+
+    # Temporarily removing texliveFull as it currently has a dependency (xindy)
+    # with a dependency (clisp) with a broken drv
+
+    # texliveFull
+
     xfce.thunar
     xfce.thunar-volman
     tree