Test

README.md

@@ -9,6 +9,7 @@ nixos-rebuild switch --flake '/etc/nixos#<HOSTNAME>'
 ---
 # To Do List
 * [ ] Fix cursor size on hyprland
+* [ ] Find a way to adjust window sizes with a keyboard shortcut in Hyprland
 * [ ] Try disko - [Link](https://github.com/nix-community/disko)
 * [ ] btrfs snapshots
 * [ ] weechat / weechat-matrix

flake.nix

@@ -19,7 +19,7 @@
     libx = import ./lib { inherit inputs outputs stateVersion hmStateVersion; };
   in {
     nixosConfigurations = {
-      nixos-laptop  = libx.mkHost { hostname = "nixos-laptop";  username = "albert"; desktop = "hyprland"; graphics = "intel"; };
+      nixos-laptop  = libx.mkHost { hostname = "nixos-laptop";  username = "albert"; desktop = "hyprland"; graphics = "nvidia"; };
       nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; username = "albert"; desktop = "gnome";    graphics = "nvidia"; };
     };
     homeConfigurations = {

lib/default.nix

@@ -10,9 +10,9 @@
   };
 
   # Helper function for generating host configs
-  mkHost = { hostname, username, desktop ? null, installer ? null, graphics ? "nvidia" }: inputs.nixpkgs.lib.nixosSystem {
+  mkHost = { hostname, username, desktop ? null, installer ? null, graphics ? null }: inputs.nixpkgs.lib.nixosSystem {
     specialArgs = {
-      inherit inputs outputs desktop hostname username stateVersion;
+      inherit inputs outputs desktop hostname username stateVersion graphics;
     };
     modules = [
         ../nixos

nixos/common/desktops/gnome/default.nix

@@ -17,7 +17,7 @@
     xkbVariant = "";
     autorun = true;
     # When you play games, change this to nvidia
-    videoDrivers = [ "${graphics}" ];
+    videoDrivers = [ graphics ];
   };
 
   ##### disable nvidia, very nice battery life.

nixos/common/desktops/hyprland/default.nix

@@ -1,5 +1,5 @@
 {pkgs, graphics, ...}: {
-  services.xserver.videoDrivers = [ "${graphics}" ];
+  services.xserver.videoDrivers = [ graphics ];
 
   # tuigreet
   services.greetd = {

nixos/common/services/powertop.nix

@@ -1,13 +1,5 @@
 {
   powerManagement.powertop.enable = true;
-  systemd.services.powertop.postStart = ''
-    HIDDEVICES=$(ls /sys/bus/usb/drivers/usbhid | grep -oE '^[0-9]+-[0-9\.]+' | sort -u)
-    for i in $HIDDEVICES; do
-      echo -n "Enabling " | cat - /sys/bus/usb/devices/$i/product
-      echo 'on' > /sys/bus/usb/devices/$i/power/control
-    done
-  '';
-  # FIXME always coredumps on boot
   systemd.services.powertop.serviceConfig.Restart = "on-failure";
   systemd.services.powertop.serviceConfig.RestartSec = "2s";
-}
+}

nixos/hosts/nixos-laptop/default.nix

@@ -74,7 +74,7 @@
     };
     nvidia = {
       open = false;
-      nvidiaSettings = false;
+      nvidiaSettings = true;
       dynamicBoost.enable = true;
       package = config.boot.kernelPackages.nvidiaPackages.latest;
       powerManagement.finegrained = true;