Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs

flake.lock

@@ -143,11 +143,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729027341,
+        "lastModified": 1730837930,
-        "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
+        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
+        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1728729581,
+        "lastModified": 1730919458,
-        "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
+        "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
+        "rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
         "type": "github"
       },
       "original": {
@@ -246,11 +246,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1728900372,
+        "lastModified": 1731002033,
-        "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=",
+        "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d",
+        "rev": "f71c2effed1ce4f9fbeefe402e4e431428ffe93a",
         "type": "github"
       },
       "original": {

hosts/home/hyprland.nix

@@ -0,0 +1,133 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  imports = [ ./waybar.nix ./tile.nix ];
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+    systemd.variables = [ "--all" ];
+    xwayland.enable = true;
+    settings = {
+      exec-once = [ "${pkgs.hyprpaper}/bin/hyprpaper" ];
+      monitor = ",preferred,auto,1";
+      general = {
+        "$mainMod" = "SUPER";
+        layout = "master";
+        "$terminal" = "${pkgs.alacritty}/bin/alacritty";
+        "$menu" = "${pkgs.wofi}/bin/wofi --show drun";
+        gaps_in = 5;
+        gaps_out = 10;
+        border_size = 2;
+      };
+
+      decoration = {
+        rounding = 15;
+        blur = {
+          enabled = true;
+          size = 2;
+          passes = 2;
+          brightness = 1;
+          noise = .3;
+          new_optimizations = true;
+        };
+        drop_shadow = true;
+      };
+
+      misc = {
+        disable_autoreload = true;
+        disable_hyprland_logo = true;
+        always_follow_on_dnd = true;
+        layers_hog_keyboard_focus = true;
+        animate_manual_resizes = false;
+        enable_swallow = true;
+        focus_on_activate = true;
+        new_window_takes_over_fullscreen = 2;
+        middle_click_paste = true;
+        vfr = true;
+      };
+
+      bind = [
+        # keybindings
+        "$mainMod, Return, exec, $terminal"
+        "$mainMod, D, exec, $menu"
+        "$mainMod Shift, C, killactive,"
+        "$mainMod, Space, exec, toggle_float"
+        "$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock"
+
+        # switch focus
+        "$mainMod, left, movefocus, l"
+        "$mainMod, right, movefocus, r"
+        "$mainMod, up, movefocus, u"
+        "$mainMod, down, movefocus, d"
+
+
+        # switch workspace
+        "$mainMod, 1, workspace, 1"
+        "$mainMod, 2, workspace, 2"
+        "$mainMod, 3, workspace, 3"
+        "$mainMod, 4, workspace, 4"
+        "$mainMod, 5, workspace, 5"
+        "$mainMod, 6, workspace, 6"
+        "$mainMod, 7, workspace, 7"
+        "$mainMod, 8, workspace, 8"
+        "$mainMod, 9, workspace, 9"
+        "$mainMod, 0, workspace, 10"
+
+        # same as above, but switch to the workspace
+        "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent
+        "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
+        "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
+        "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
+        "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
+        "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
+        "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
+        "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
+        "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
+        "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
+        "$mainMod CTRL, c, movetoworkspace, empty"
+
+        # window control
+        "$mainMod SHIFT, left, movewindow, l"
+        "$mainMod SHIFT, right, movewindow, r"
+        "$mainMod SHIFT, up, movewindow, u"
+        "$mainMod SHIFT, down, movewindow, d"
+        "$mainMod CTRL, left, resizeactive, -80 0"
+        "$mainMod CTRL, right, resizeactive, 80 0"
+        "$mainMod CTRL, up, resizeactive, 0 -80"
+        "$mainMod CTRL, down, resizeactive, 0 80"
+        "$mainMod ALT, left, moveactive,  -80 0"
+        "$mainMod ALT, right, moveactive, 80 0"
+        "$mainMod ALT, up, moveactive, 0 -80"
+        "$mainMod ALT, down, moveactive, 0 80"
+
+        # media and volume controls
+        # ",XF86AudioMute,exec, pamixer -t"
+        ",XF86AudioPlay,exec, playerctl play-pause"
+        ",XF86AudioNext,exec, playerctl next"
+        ",XF86AudioPrev,exec, playerctl previous"
+        ",XF86AudioStop,exec, playerctl stop"
+      ];
+
+      bindm = [
+        "$mainMod, mouse:272, movewindow"
+        "$mainMod, mouse:273, resizewindow"
+      ];
+
+      windowrule =
+        [ "float,mpv" "center,mpv" "pin,wofi" "idleinhibit focus,mpv" ];
+
+      windowrulev2 = [ ];
+    };
+  };
+
+  home.sessionVariables = {
+    MOZ_ENABLE_WAYLAND = "1";
+    MOZ_USE_XINPUT2 = "1";
+    XDG_SESSION_TYPE = "wayland";
+    SDL_VIDEODRIVER = "wayland";
+    QT_QPA_PLATFORM = "wayland";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    _JAVA_AWT_WM_NONREPARENTING = 1;
+  };
+}
+

hosts/home/sway.nix

@@ -11,7 +11,7 @@
       window.border = 1;
       window.titlebar = false;
       terminal = "${pkgs.alacritty}/bin/alacritty";
-      menu = "${pkgs.wofi}/bin/wofi -show drun -modi drun";
+      menu = "${pkgs.wofi}/bin/wofi --show drun";
       bars = [];
       gaps = {
         inner = 10;

hosts/home/tile.nix

@@ -1,16 +1,14 @@
 { config, pkgs, inputs, ... }:
 
 {
-
   services = {
     mako = { enable = true; };
   };
-
   programs = {
-    mako = { enable = true; };
     alacritty = { enable = true; };
     swaylock = {enable = true;};
     wofi = { enable = true; };
+    zathura = { enable = true; };
+    mpv = { enable = true; };
   };
 }
-

hosts/home/waybar.nix

@@ -7,6 +7,9 @@
         layer = "bottom";
         position = "bottom";
         output = [ "eDP-1" ];
+        margin-left = 45;
+        margin-right = 45;
+        spacing = 15;
 
         modules-left = [ "sway/workspaces" "sway/mode" ];
         modules-center = [ "clock" ];
@@ -66,7 +69,11 @@
           "format-icons" = [ " " " " " " " " " " ];
         };
 
-        clock = { "format-alt" = "{:%a, %d. %b  %H:%M}"; };
+        clock = {
+          format = "{:%I:%M %p}";
+          "format-alt" = "{:%a, %d. %b  %H:%M}";
+          tooltip = false;
+        };
       };
     };
   };

hosts/laptop/configuration.nix

@@ -9,6 +9,7 @@
   security.rtkit.enable = true;
   security.polkit.enable = true;
   security.pam.services.swaylock = {};
+  security.pam.services.hyprlock = {};
   powerManagement.enable = true;
 
   nix = {
@@ -93,6 +94,7 @@
     steam.enable = true;
     steam.gamescopeSession.enable = true;
     gamemode.enable = true;
+    hyprland.enable = true;
   };
 
   users.users.k = {
@@ -130,7 +132,10 @@
       intel-vaapi-driver
       intel-compute-runtime
       intel-media-driver
+      vpl-gpu-rt
       microcodeIntel
+      mkl
+      embree
       neovim
     ];
   };

hosts/laptop/home.nix

@@ -1,7 +1,7 @@
 { config, pkgs, inputs, ... }:
 
 {
-  imports = [ ../home/home_common.nix ../home/gnome.nix ../home/sway.nix ];
+  imports = [ ../home/home_common.nix ../home/gnome.nix ../home/sway.nix ../home/hyprland.nix];
 
   nixpkgs.config.allowUnfree = true;
 
@@ -39,9 +39,15 @@
   services = {
     syncthing.enable = true;
     activitywatch.enable = true;
+
+    mpd = {
+      enable = true;
+      musicDirectory = "/home/k/Music";
+    };
     emacs = {
       enable = true;
       defaultEditor = true;
+      package = pkgs.emacs-gtk;
     };
   };
   stylix = {