Odin: add Hyprland

flake.nix

@@ -162,6 +162,13 @@
 
               ./modules/nixos/pro_audio.nix
               ./modules/nixos/kdeconnect.nix
+
+              ./modules/nixos/hyprland.nix
+              {
+                home-manager.users.bertof.imports = [
+                  ./modules/hm/hyprland.nix
+                ];
+              }
             ] ++ homeManagerModules ++ [
               { home-manager.users.bertof = import ./instances/odin/hm.nix; }
             ];

instances/odin/common_configuration.nix

@@ -113,12 +113,13 @@ with lib; {
     xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
     libinput.enable = true;
 
-    displayManager.sddm = {
-      enable = true;
-      autoNumlock = true;
-      theme =
-        "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
-    };
+    displayManager.gdm.enable = true;
+    # displayManager.sddm = {
+    #   enable = true;
+    #   autoNumlock = true;
+    #   theme =
+    #     "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
+    # };
   };
 
   # Enable CUPS to print documents.

instances/odin/hm.nix

@@ -46,6 +46,7 @@
         retroarchFull
         spotify
         tdesktop
+        teams-for-linux
         thunderbird
         transmission-gtk
         virt-manager

instances/thor/hm.nix

@@ -49,6 +49,7 @@
         retroarchFull
         spotify
         tdesktop
+        teams-for-linux
         thunderbird
         transmission-gtk
         virt-manager

modules/hm/hyprland.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ nixosConfig, pkgs, ... }: {
 
   imports = [
     ./kitty.nix
@@ -36,13 +36,21 @@
       # For a full list, see the wiki
       #
 
-      autogenerated = 0 # remove this line to remove the warning
-
       # See https://wiki.hyprland.org/Configuring/Monitors/
       # monitor=name,resolution,position,scale
       monitor,preferred,auto,auto
-      monitor=DP-2,preferred,1080x420,1
+      ${ 
+      if nixosConfig.networking.hostName == "thor" then
+      ''
+        monitor=DP-2,preferred,1080x420,auto
         monitor=HDMI-A-1,preferred,auto,auto,transform,3
+      '' 
+      else if nixosConfig.networking.hostName == "odin" then
+      ''
+        monitor=eDP-1,preferred,320x1440,1
+        monitor=DP-1,preferred,0x0,1
+      '' else ""
+      }
 
 
       # See https://wiki.hyprland.org/Configuring/Keywords/ for more
@@ -58,7 +66,7 @@
 
       # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
       input {
-          kb_layout = us
+          kb_layout = ${if nixosConfig.networking.hostName == "thor" then "us" else "it" }
           kb_variant =
           kb_model =
           kb_options =
@@ -67,7 +75,7 @@
           follow_mouse = 1
 
           touchpad {
-              natural_scroll = no
+              natural_scroll = yes
           }
 
           sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
@@ -148,16 +156,16 @@
       # $mainMod = SUPER
 
       # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-      bind = SUPER, Q, exec, kitty
       bind = SUPER, RETURN, exec, kitty
-      bind = SUPER, C, killactive,
+      bind = SUPER, Q, killactive,
       bind = SUPER, M, exec, way-lockscreen
       bind = SUPER_ALT_L, Q, exit, 
       bind = SUPER, E, exec, kitty -e bash ${ya}
       bind = SUPER_SHIFT, E, exec, nemo
       bind = SUPER, V, togglefloating, 
-      bind = SUPER_SHIFT, R, exec, wofi --show drun --allow-images -D key_expand=Tab -M=fuzzy -i
+      bind = SUPER_SHIFT, SPACE, exec, wofi --show run --allow-images -D key_expand=Tab -M=fuzzy -i
       bind = SUPER, SPACE, exec, wofi --show drun --allow-images -D key_expand=Tab -M=fuzzy -i
+      bind = SUPER, F, fullscreen,
       bind = SUPER, P, pseudo, # dwindle
       bind = SUPER, J, togglesplit, # dwindle
 

modules/hm/webapp.nix

@@ -17,11 +17,11 @@ let
       exec = cmd link;
     };
   links = [
-    {
-      desktopName = "Microsoft Teams";
-      link = "https://teams.microsoft.com";
-      categories = [ "Office" ];
-    }
+    # {
+    #   desktopName = "Microsoft Teams";
+    #   link = "https://teams.microsoft.com";
+    #   categories = [ "Office" ];
+    # }
     {
       desktopName = "Chess.com";
       link = "https://chess.com";