flake.lock

@@ -176,12 +176,8 @@
     },
     "hyprland": {
       "inputs": {
-        "hyprland-protocols": [
+        "hyprland-protocols": "hyprland-protocols",
-          "hyprland-protocols"
+        "nixpkgs": "nixpkgs_2",
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
@@ -201,7 +197,7 @@
     },
     "hyprland-contrib": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1687033460,
@@ -220,6 +216,7 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
+          "hyprland",
           "nixpkgs"
         ]
       },
@@ -483,6 +480,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1688500189,
+        "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "78419edadf0fabbe5618643bd850b2f2198ed060",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1658161305,
         "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
@@ -498,7 +511,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1688566749,
         "narHash": "sha256-3Og5xbNk1qncLWl2zrrL/k80UqRI/nEGPEbzz306Izk=",
@@ -514,7 +527,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1667292599,
         "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
@@ -530,7 +543,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1667085676,
         "narHash": "sha256-jPHYYoSdrV3ypWG4oi9SUeI2MU6dLjxM88+9io5Rrx0=",
@@ -623,25 +636,23 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-contrib": "hyprland-contrib",
-        "hyprland-protocols": "hyprland-protocols",
         "idris2": "idris2",
         "java": "java",
         "nix-on-droid": "nix-on-droid",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "quilt-server": "quilt-server",
         "scripts": "scripts",
         "sops-nix": "sops-nix",
-        "wsl": "wsl",
+        "wsl": "wsl"
-        "xdph": "xdph_2"
       }
     },
     "scripts": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "swaywm-toggler": "swaywm-toggler"
       },
       "locked": {
@@ -683,7 +694,7 @@
     "swaywm-toggler": {
       "inputs": {
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1667366374,
@@ -824,29 +835,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "xdph_2": {
-      "inputs": {
-        "hyprland-protocols": [
-          "hyprland-protocols"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1685385764,
-        "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -9,20 +9,7 @@
       url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland-protocols = {
+    hyprland.url = "github:hyprwm/Hyprland";
-      url = "github:hyprwm/hyprland-protocols";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.hyprland-protocols.follows = "hyprland-protocols";
-    };
-    xdph = {
-      url = "github:hyprwm/xdg-desktop-portal-hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.hyprland-protocols.follows = "hyprland-protocols";
-    };
     hyprland-contrib.url = "github:hyprwm/contrib";
     nix-on-droid = {
       url = "github:t184256/nix-on-droid";

home-manager/linux/programs/desktop/general.nix

@@ -6,7 +6,12 @@ let
   shortcuts = inputs.self.packages.${pkgs.system}.shortcuts;
 in lib.mkMerge [
   # Hyprland specific configuration
-  (lib.mkIf hyprland { })
+  (lib.mkIf hyprland {
+    wayland.windowManager.hyprland.extraConfig = ''
+      env = QT_QPA_PLATFORMTHEME,qtct
+      env = QT_STYLE_OVERRIDE,kvantum
+    '';
+  })
   # General configuration
   (lib.mkIf hyprland {
     home.packages = with pkgs; [

home-manager/linux/programs/hyprland.nix

@@ -1,13 +1,5 @@
 { config, lib, pkgs, inputs, ... }@args:
-let
+let nathan = config.nathan;
-  nathan = config.nathan;
-  portal =
-    inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland.override {
-      hyprland-share-picker =
-        inputs.xdph.packages.${pkgs.stdenv.hostPlatform.system}.hyprland-share-picker.override {
-          hyprland = config.wayland.windowManager.hyprland.package;
-        };
-    };
 in with lib; {
   imports = [
     ./desktop/waybar.nix
@@ -42,24 +34,12 @@ in with lib; {
       recommendedEnvironment = true;
       systemdIntegration = false;
       extraConfig = ''
-        # import home manager session variables
+                # Set environment variables to force wayland
-        ${lib.concatStringsSep "\n" (builtins.attrValues
+                env = XCURSOR_SIZE,24
-          (builtins.mapAttrs (name: value: "env = ${name},${value}")
+                # env = GDK_BACKEND,wayland,x11
-            config.home.sessionVariables))}
+                # env = QT_QPA_PLATFORM,wayland;xcb
-
+                # env = SDL_VIDEODRIVER,wayland
-        # Setup missing XDG variables
+                # env = CLUTTER_BACKEND,wayland
-        # env = XDG_SESSION_TYPE,wayland
-        # env = XDG_SESSION_DESKTOP,Hyprland
-
-        # Make applications respect wayland
-        env = GDK_BACKEND,wayland,x11
-        env = QT_QPA_PLATFORM,wayland;xcb
-        env = SDL_VIDEODRIVER,wayland
-        env = CLUTTER_BACKEND,wayland
-
-        # Make sure only the hyprland desktop portal is available
-        env = XDG_DESKTOP_PORTAL_DIR,${portal}/share/xdg-desktop-portal/portals
-
                 input {
                   kb_layout = us
                   kb_variant =
@@ -203,22 +183,8 @@ in with lib; {
                 bindr = CAPS, caps_lock, exec, swayosd --caps-lock
 
                 # systemd integration
-        exec-once=dbus-update-activation-environment --systemd ${
+                exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && sleep 2 && systemctl --user start hyprland-session.target
-          lib.concatStringsSep " " ([
+
-            "DISPLAY"
-            "WAYLAND_DISPLAY"
-            "HYPRLAND_INSTANCE_SIGNATURE"
-            "XDG_CURRENT_DESKTOP"
-            "XDG_SESSION_TYPE"
-            "XDG_SESSION_DESKTOP"
-            "XDG_DESKTOP_PORTAL_DIR"
-            "XDG_BACKEND"
-            "GDK_BACKEND"
-            "QT_QPA_PLATFORM"
-            "SDL_VIDEODRIVER"
-            "CLUTTER_BACKEND"
-          ] ++ builtins.attrNames config.home.sessionVariables)
-        } && sleep 2 && systemctl --user start hyprland-session.target
 
                 ## Window rules
 
@@ -268,8 +234,6 @@ in with lib; {
                 # Emacs streaming
                 windowrulev2 = float,title:^(emacs-streaming)$
 
-        # Looking Glass
-
                 ## Scratchpads
 
                 # Alacritty

machines/levitation/configuration.nix

@@ -98,7 +98,6 @@ in {
   # ZFS
   boot.supportedFilesystems = [ "zfs" ];
   boot.zfs.forceImportRoot = false;
-  boot.zfs.extraPools = [ "bigssd" ];
   # Generated with head -c4 /dev/urandom | od -A none -t x4
   networking.hostId = "bc94e9d3";
 }

machines/levitation/home.nix

@@ -90,18 +90,4 @@
     };
   };
 
-  # Looking glass
-  xdg.configFile."looking-glass/client.ini" = {
-    text = ''
-      [input]
-      rawMouse=yes
-      [audio]
-      periodSize=512
-      bufferLatency=7
-      micDefault=allow
-      [egl]
-      scale = 1
-    '';
-  };
-
 }

machines/levitation/passthrough.nix

@@ -8,15 +8,6 @@ let
     "10de:1ad9" # Usb ????
   ];
 in {
-  ##
-  ## Packages
-  ##
-  environment.systemPackages = with pkgs; [
-    # Looking glass, avoids the need for another monitor
-    looking-glass-client
-    # For samba
-    cifs-utils
-  ];
   ##
   ## Kernel configuration
   ##
@@ -34,6 +25,7 @@ in {
   ##
   ## Virtualization setup
   ##
+  environment.systemPackages = with pkgs; [ looking-glass-client ];
   virtualisation.spiceUSBRedirection.enable = true;
   virtualisation.libvirtd = {
     qemu = {
@@ -63,25 +55,4 @@ in {
   };
   networking.defaultGateway = "10.0.4.1";
   networking.nameservers = [ "10.0.0.10" ];
-
-  ##
-  ## Samba share
-  ##
-  services.samba = {
-    enable = true;
-    openFirewall = true;
-    extraConfig = ''
-      browseable = yes
-      smb encrypt = required
-    '';
-    shares = {
-      # You will still need to set up the user accounts to begin with:
-      # $ sudo smbpasswd -a yourusername
-      homes = {
-        browseable = "no";
-        "read only" = "no";
-        "guest ok" = "no";
-      };
-    };
-  };
 }

shortcuts/vmware/fullscreen

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-gamescope --scaler integer \
+hyprctl dispatch exec -- "[float;size 1829 1029] gamescope --scaler integer \
-    --force-windows-fullscreen -f --rt -- vmware
+    --force-windows-fullscreen -f --rt -- vmware"
 
 wait