Merge branch 'main' of ssh://gitea.xeovalyte.dev:2222/xeovalyte/nix

Merge Laptop with Desktop

flake.lock

@@ -25,11 +25,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1709904588,
+        "lastModified": 1710404542,
-        "narHash": "sha256-8JsZyeV8NY8LfSn39SQ9Vn4Sp8DzLLBi0MwA/RGoB6k=",
+        "narHash": "sha256-eHtM7/2AVx0Ggc/kDjPP3UKVh93WGeE8rxEffr1mn1A=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "d1ca09b4bdb38be343b5b0a7556c2c5007f523d2",
+        "rev": "4c5fb09b2f070beefb5cf2d6133cd0acf316bf45",
         "type": "gitlab"
       },
       "original": {
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709590065,
+        "lastModified": 1710124615,
-        "narHash": "sha256-dyB0W+xKL+9Inj+SM0WnmJwQeimiMpH5YNvDXNwFDk4=",
+        "narHash": "sha256-VFF4l95pXSzkz/U5WxORWhWvK4f+x8PY9VQRgEn9qb0=",
         "owner": "getchoo",
         "repo": "nix-exprs",
-        "rev": "c0720f0dc9b8b5da10fca4949734703531961d20",
+        "rev": "ca5b1d79dafeef4258dc4cec4d4c04281d27e0d1",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1709223573,
+        "lastModified": 1710180874,
-        "narHash": "sha256-xi7yscjt7t8tFcJDgHzxgW15Obcp7dEghG41f6tUmRc=",
+        "narHash": "sha256-ZSn3wXQuRz36Ta/L+UCFKuUVG6QpwK2QmRkPjpQprU4=",
         "owner": "hyprwm",
         "repo": "hypridle",
-        "rev": "029f08805a2297966d295a52a6e62c3801926a52",
+        "rev": "4395339a2dc410bcf49f3e24f9ed3024fdb25b0a",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1709847152,
+        "lastModified": 1710365106,
-        "narHash": "sha256-CRhe53TZ8MvfrIQojbTevoe2OpiCrS7ZxovtR94VYs0=",
+        "narHash": "sha256-BAt07JNgMEXDuzR3pHX+ROBY63SaMe/6yxI7Z6OFxqg=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "e9a57f0dae1dfa02240040f5975d048175440c2c",
+        "rev": "988d5b3957fceb23e59716eebaf5f6bd16d566f0",
         "type": "github"
       },
       "original": {
@@ -202,11 +202,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709677081,
+        "lastModified": 1710283656,
-        "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
+        "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
+        "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b",
         "type": "github"
       },
       "original": {
@@ -232,11 +232,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1709703039,
+        "lastModified": 1710272261,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
         "type": "github"
       },
       "original": {

hosts/laptop/default.nix

@@ -3,9 +3,11 @@
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
+    ../../modules/system/desktop/amd.nix
     ../../modules/system/desktop/hyprland.nix
     ../../modules/system/programs/syncthing.nix
     ../../modules/system/programs/thunar.nix
+    ../../modules/system/programs/virtualization.nix
     ../../modules/system/utils/common.nix
     ../../modules/system/utils/fprint.nix
     ../../modules/system/utils/garbage-collection.nix

hosts/laptop/home.nix

@@ -2,12 +2,13 @@
 
 {
   imports = [
-    #../../modules/home/desktop/hyprland
+    ../../modules/home/desktop/hyprland
     ../../modules/home/programs/common.nix
     ../../modules/home/programs/firefox.nix
-    ../../modules/home/programs/kitty.nix
-    ../../modules/home/programs/neovim
     ../../modules/home/programs/git.nix
+    ../../modules/home/programs/kitty.nix
+    ../../modules/home/programs/modrinth.nix
+    ../../modules/home/programs/neovim
     ../../modules/home/programs/ssh.nix
     ../../modules/home/theme
     ../../modules/home/theme/blueish.nix

modules/home/desktop/hyprland/default.nix

@@ -19,11 +19,12 @@
     grimblast
     nwg-bar
     powertop
+    lxqt.lxqt-policykit
   ];
 
   wayland.windowManager.hyprland = {
     enable = true;
-    package = pkgs.unstable.hyprland;
+    # package = pkgs.unstable.hyprland;
     settings = {
       monitor = ",preferred,auto,1.566667";
 
@@ -84,7 +85,7 @@
         "$mod, V, togglefloating"
         "$mod, F, fullscreen, 0"
         "$mod, M, fullscreen, 1"
-        "$mod, L, exec, hyprlock" 
+        "$mod SHIFT, L, exec, hyprlock" 
         "$mod, S, exec, systemctl suspend" 
 
         "$mod, h, movefocus, l"

modules/home/programs/common.nix

@@ -9,5 +9,6 @@
     logseq
     webcord
     unstable.localsend
+    bitwarden
   ];
 }

modules/system/desktop/amd.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  boot.initrd.kernelModules = [ "amdgpu" ];
+
+  hardware.opengl.driSupport32Bit = true;
+
+  hardware.opengl.extraPackages = with pkgs; [
+    amdvlk
+  ];
+
+  hardware.opengl.extraPackages32 = with pkgs; [
+    driversi686Linux.amdvlk
+  ];
+}

modules/system/programs/virtualization.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  virtualisation.libvirtd.enable = true;
+  programs.virt-manager.enable = true;
+
+  users.users.xeovalyte.extraGroups = [ "libvirtd" ];
+
+  environment.systemPackages = with pkgs; [
+    quickemu
+    quickgui
+  ];
+}