wayland fixes

4 files changed, 74 insertions, 32 deletions

diff --git a/home-manager/modules/apps/default.nix b/home-manager/modules/apps/default.nix
index afb7ea3..b4ba1f0 100644
--- a/home-manager/modules/apps/default.nix
+++ b/home-manager/modules/apps/default.nix
@@ -9,8 +9,7 @@ with lib;
 
    # Stuff that is to be sorted to its appropriate files
    # If no appropriate category is found or thought of, put it in misc.nix
-   home.packages = with pkgs; [
-	speedcrunch
+  home.packages = with pkgs; [
 	htop
 	btop 
 	nmap 
@@ -19,36 +18,10 @@ with lib;
 	unzip 
 	unrar
 	xdg-user-dirs
-	thunderbird
-	element-desktop 
-	filelight
-	libreoffice 
-	evince
-	obsidian
-	krita 
-	hugo
-	qalculate-qt
-	
-	spotify
-	prismlauncher
-	ani-cli
-	vlc
-	mpv
-	openttd
-	anki-bin
-
-	#Theme  
-	qt6Packages.qt6ct
-	kdePackages.qtstyleplugin-kvantum
-	(catppuccin-kvantum.override {
-	   accent = "pink";
-	   variant = "mocha";
-	})
-
 
 	# Do i need this? 
 	php 
 	php83Packages.composer
 
-   ]; 
+  ]; 
 }
diff --git a/home-manager/modules/apps/desktop/default.nix b/home-manager/modules/apps/desktop/default.nix
index 4bc7478..b070444 100644
--- a/home-manager/modules/apps/desktop/default.nix
+++ b/home-manager/modules/apps/desktop/default.nix
@@ -1,3 +1,37 @@
-{lib, ...}: with lib; {
+{lib, pkgs, ...}: with lib; {
   imports = [ ./hyprland.nix ];
+
+  home.packages = with pkgs; [	
+    speedcrunch
+    thunderbird
+    element-desktop 
+    filelight
+    libreoffice 
+    evince
+    obsidian
+    krita 
+    hugo
+    qalculate-qt
+    libsForQt5.kdeconnect-kde
+    libreoffice-qt6-fresh
+    obsidian
+    krita
+    kitty
+    
+    spotify
+    prismlauncher
+    ani-cli
+    vlc
+    mpv
+    openttd
+    anki-bin
+
+    #Theme  
+    qt6Packages.qt6ct
+    kdePackages.qtstyleplugin-kvantum
+    (catppuccin-kvantum.override {
+       accent = "pink";
+       variant = "mocha";
+    })
+  ];
 }
diff --git a/home-manager/modules/apps/desktop/hyprland.nix b/home-manager/modules/apps/desktop/hyprland.nix
index 5142f40..c2a794e 100644
--- a/home-manager/modules/apps/desktop/hyprland.nix
+++ b/home-manager/modules/apps/desktop/hyprland.nix
@@ -1,5 +1,31 @@
-{cfg, lib, ...}: 
+{cfg, lib, pkgs, ...}: 
+with lib;
 {
+
+
+  home.packages = with pkgs; [
+    mako
+    wofi
+    hyprshot
+    networkmanagerapplet
+    xdg-desktop-portal-gnome 
+    xdg-desktop-portal-hyprland
+    wl-clipboard
+  ];
+
+  # TODO: Place environment variables in  ./config/uwsm
+  home.file.".config/uwsm/env-hyprland".text = ''
+     export XDG_SESSION_TYPE=wayland
+     export GDK_BACKEND=wayland
+     export GTK_USE_PORTAL=1
+     export QT_QPA_PLATFORM=wayland;xcb
+     export QT_STYLE_OVERRIDE=kvantum
+     export QT_QPA_PLATFORM_THEME=kvantum
+     export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+     export QT_AUTO_SCREEN_SCALE_FACTOR=1
+     export MOZ_ENABLE_WAYLAND=1
+  '';
+
   # Hyprland 
   wayland.windowManager.hyprland = {
       systemd.enable = false;
@@ -104,7 +130,7 @@
         
         # Programs 
         "$terminal" = "kitty";
-        "$fileManager" = "pcmanfm";
+        "$fileManager" = "thunar";
         "$menu" = "wofi --show run";
         "$screenshot" = "hyprshot -m region -f screenshots/screenshot_$(date +'%d-%m-%y_%H-%M-%S').png";
         
diff --git a/nixos/hosts/icetea-dispenser/default.nix b/nixos/hosts/icetea-dispenser/default.nix
index 802cd5b..a8d4630 100644
--- a/nixos/hosts/icetea-dispenser/default.nix
+++ b/nixos/hosts/icetea-dispenser/default.nix
@@ -33,7 +33,16 @@
 
   networking.hostName = "icetea-dispenser"; # Define your hostname.
   networking.firewall.enable = false;
+  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
   
+  hardware.bluetooth.enable = true; 
+  hardware.bluetooth.settings = {
+	General = {Enable = "Source,Sink,Media,Socket";};  
+  };
+
+  hardware.bluetooth.powerOnBoot = true;
+  services.blueman.enable = true;
+
   programs.nix-ld.enable = true;
   services.printing.enable = true;
   nixpkgs.config.allowUnfree = true;