finally fixed hypr

flake.lock

@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719923187,
+        "lastModified": 1720009717,
-        "narHash": "sha256-833SF50YnN1Hj3qdUmadt9A7XtFWG3BnwQMyxcXIex4=",
+        "narHash": "sha256-HICfiksmANfwC0UaoFJ3L6mLV/mObx6Ad4OtT0w22Zw=",
         "owner": "nix-community",
         "repo": "flake-firefox-nightly",
-        "rev": "9e77774f2eeab583dbff4127a11287061a947538",
+        "rev": "a78c64a4dabce5e65361bafc6c1508981c385d71",
         "type": "github"
       },
       "original": {
@@ -358,11 +358,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827439,
+        "lastModified": 1719992360,
-        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
+        "narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
+        "rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b",
         "type": "github"
       },
       "original": {
@@ -443,11 +443,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719913883,
+        "lastModified": 1719971132,
-        "narHash": "sha256-GHB5lizmXGlglKYAKIvY9bkPcXvbrmEzh4d264omYYo=",
+        "narHash": "sha256-/u/dRd43l8WHW8WIEAtMf4KnayefCLpB3VpLF2FBEno=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "0289cf03e294270c84f20bc09cd527fd7f3d4b72",
+        "rev": "97bbe0cc1dc3d8962a9d15404a3c41da0ad2a3b3",
         "type": "github"
       },
       "original": {
@@ -459,11 +459,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1719827289,
+        "lastModified": 1719963642,
-        "narHash": "sha256-0IcxmkzmNY4el9yx7wGjZ+VDLGV+3XlI6AW9WfCbzAM=",
+        "narHash": "sha256-2+K/i8t4FkGCHEanISE8Q/SbLmWKp1dtpGlf44/x4m0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "8f5e90811025bcc652146168d5116f8d73fe8f81",
+        "rev": "d413038b4fd71b7a335b6653aa64d2cb6daeac7b",
         "type": "github"
       },
       "original": {
@@ -521,11 +521,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1719838683,
+        "lastModified": 1719956923,
-        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
+        "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
+        "rev": "706eef542dec88cc0ed25b9075d3037564b2d164",
         "type": "github"
       },
       "original": {

home/core/gui/default.nix

@@ -9,13 +9,6 @@
     ./rofi.nix
   ];
 
-  xdg.portal = let
-    hyprland = config.wayland.windowManager.hyprland.package;
-    xdph = pkgs.xdg-desktop-portal-hyprland.override {inherit hyprland;};
-  in {
-    extraPortals = [xdph];
-    configPackages = [hyprland];
-  };
   home.packages = with pkgs; [
     grimblast
     slurp
@@ -24,19 +17,4 @@
     tofi
     gnome.gnome-calculator
   ];
-  wayland.windowManager.hyprland = {
-    enable = true;
-    package = pkgs.hyprland;
-    xwayland.enable = true;
-    extraConfig = ''
-      ${builtins.readFile ./hyprland.conf}
-    '';
-    systemd = {
-      enable = true;
-      extraCommands = [
-        "systemctl --user stop graphical-session.target"
-        "systemctl --user start hyprland-session.target"
-      ];
-    };
-  };
 }

home/core/gui/hyprland.conf

@@ -1,7 +0,0 @@
-# HYPRLAND CONFIGURATION
-
-source=./land/appearance.conf
-source=./land/inputs.conf
-source=./land/keybinds.conf
-source=./land/rules.conf
-source=./land/startup.conf

home/core/gui/rofi.nix

@@ -2,7 +2,7 @@
   programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland-unwrapped;
-    configPath = "$XDG_CONFIG_HOME/rofi/config.rasi";
+    configPath = "home/cnst/.config/rofi/config.rasi";
     font = "Rec Mono Linear 11";
   };
 }

home/core/shell/cnst.nix

@@ -9,10 +9,10 @@
     shellAliases = {
       nixconfig = "cd /home/cnst/.nix-config/";
       ll = "ls -l";
-      nixupdate = "sudo nixos-rebuild switch -v --show-trace --flake .#cnix";
+      nixupdate = "nh os switch -v -H cnix";
-      nixup = "sudo nixos-rebuild switch --flake .#cnix";
+      nixup = "nh os switch -H cnix";
-      flakeupdate = "nix flake update";
+      flakeupdate = "nh os switch -u -v -H cnix";
-      flakeup = "nix flake update";
+      flakeup = "nh os switch -u -H cnix";
     };
     history = {
       size = 1000;

home/extra/cnst.nix

@@ -7,7 +7,6 @@
     ./kitty
     ./firefox
     ./neovim
-    ./lutris
     ./mako
   ];
   home.packages = with pkgs; [

hosts/cnix/default.nix

@@ -31,6 +31,7 @@ in {
     inputs.home-manager.nixosModules.home-manager
     ../core
     ../extra/steam
+    ../extra/lutris
     ../extra/nix-ld
     ../extra/workstation
     ../extra/gamemode
@@ -83,6 +84,10 @@ in {
     hostName = "cnix";
   };
 
+  environment.sessionVariables = {
+    FLAKE = "/home/cnst/.nix-config";
+  };
+
   # Garbage collector / Nix helper
   programs = {
     nh = {

hosts/cnix/xkb/symbols/hhkbse

@@ -5,20 +5,20 @@ xkb_symbols "hhkbse" {
 
 	name[Group1]="Sweden - HHKBse";
 
-	key <AE01> {[         1,     exclam,    paragraph,      onehalf ]};
+	key <AE01> {[         1,     exclam,      section,      onehalf ]};
-	key <AE02> {[         2,   quotedbl,           at               ]};
+	key <AE02> {[         2,   quotedbl,           at,    paragraph ]};
 	key <AE03> {[         3, numbersign,     sterling               ]};
 	key <AE04> {[         4,     dollar,     currency               ]};
-	key <AE05> {[         5,    percent,     EuroSign               ]};
+	key <AE05> {[         5,    percent,     EuroSign,     permille ]};
 	key <AE06> {[         6,  ampersand,          yen,      radical ]};
 	key <AE07> {[         7,      slash,    braceleft               ]};
 	key <AE08> {[         8,  parenleft,  bracketleft               ]};
 	key <AE09> {[         9, parenright, bracketright               ]};
 	key <AE10> {[         0,      equal,   braceright               ]};
-	key <AE11> {[      plus,   question,    backslash, questiondown ]};
+	key <AE11> {[      plus,   question,    backslash,    plusminus ]};
 	key <AE12> {[      Next,  braceleft,         Home               ]};
 	key <BKSL> {[     Prior, braceright,          End               ]};
-	key <TLDE> {[    Delete,   asterisk,  asciicircum               ]};
+	key <TLDE> {[    Delete,asciicircum,     asterisk               ]};
 
 	key <AD01> {[         q,          Q                             ]};
 	key <AD02> {[         w,          W                             ]};
@@ -50,8 +50,8 @@ xkb_symbols "hhkbse" {
 	key <AB04> {[         v,          V                             ]};
 	key <AB05> {[         b,          B                             ]};
 	key <AB06> {[         n,          N                             ]};
-	key <AB07> {[         m,          M,           mu               ]};
+	key <AB07> {[         m,          M                             ]};
 	key <AB08> {[     comma,  semicolon                             ]};
-	key <AB09> {[    period,      colon                             ]};
+	key <AB09> {[    period,      colon,     ellipsis               ]};
 	key <AB10> {[     minus, underscore,       endash               ]};
 };

hosts/core/cnix-pkgs.nix

@@ -1,17 +1,34 @@
 {pkgs, ...}: {
   environment = {
-    systemPackages = [
+    systemPackages = with pkgs; [
       # Dev
-      pkgs.fd
+      fd
-      pkgs.python3
+      python3
-      pkgs.hyprlang
+      hyprlang
 
       # Util
-      pkgs.tmux
+      tmux
-      pkgs.tmuxifier
+      tmuxifier
 
       # Misc
-      pkgs.protonup
+      protonup
+
+      # Lutris dependencies
+      (lutris.override {
+        extraLibraries = pkgs: [
+          SDL2
+          SDL2_image
+          glib
+          egl-wayland
+          wineWowPackages.stable
+          wineWowPackages.staging
+          wineWowPackages.waylandFull
+          winetricks
+          python312Packages.pygame-sdl2
+          libGL
+          ffmpeg
+        ];
+      })
     ];
     sessionVariables = {
       STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d";

hosts/extra/lutris/default.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    lutris
+  ];
+}