Add hyprland

Add unfree

flake.lock

@@ -170,11 +170,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716457508,
-        "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
+        "lastModified": 1717316182,
+        "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
+        "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716509168,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "lastModified": 1717196966,
+        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,7 +16,7 @@
         inherit system;
       };
 
-      utils = import ./utils.nix { inherit pkgs inputs system; };
+      utils = import ./utils.nix { inherit inputs system; };
     in {
       nixosConfigurations = {
         muon = utils.mkHost ./hosts/muon/configuration.nix;

hosts/muon/configuration.nix

@@ -25,12 +25,14 @@ in {
 
   # Modules
   mods.desktop.enable = true;
+  mods.desktop.wayland.enable = true;
   mods.theme.enable = true;
   mods.theme.wallpaper = ./wallpaper.png;
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-  };
+  # programs.hyprland.enable = true;
+
+  mods.unfree.steam.enable = true;
+  mods.unfree.nvidia.enable = true;
+
  
   hardware = {
     opengl.enable = true;

hosts/muon/home.nix

@@ -8,14 +8,6 @@ let cfg = osConfig.mods; in {
   # mods.module.enable = true;
   programs.helix.enable = true;
   programs.qutebrowser.enable = true;
-  wayland.windowManager.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    systemd.enable = true;
-    settings = {
-      debug.disable_logs = false;
-    };
-  };
 
   # Version of first install
   home.stateVersion = "23.05";

modules/home/default.nix

@@ -1,6 +1,7 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, config, osConfig, ... }: {
   imports = [
     ./terminal
+    ./desktop
   ];
 
   # Let Home Manager install and manage itself

modules/home/desktop/default.nix

@@ -0,0 +1,12 @@
+{ pkgs, lib, osConfig, ... }:
+let
+  cfg = osConfig.mods.desktop;
+in {
+  imports = [
+    ./hyprland.nix
+  ];
+
+  config = lib.mkIf cfg.wayland.enable {
+    mods.hyprland.enable = true;
+  };
+}

modules/home/desktop/hyprland.nix

@@ -0,0 +1,45 @@
+{ pkgs, lib, config, ... }: {
+  options.mods.hyprland.enable = lib.mkEnableOption "enables hyprland";
+
+  config = lib.mkIf config.mods.hyprland.enable {
+    programs.waybar.enable = true;
+
+    wayland.windowManager.hyprland = {
+      enable = true;
+      xwayland.enable = true;
+      # systemd.enable = true;
+      settings = {
+        exec-once = "${lib.getExe pkgs.waybar}";
+        input = {
+          kb_options = "caps:escape";
+        };
+        "$mod" = "SUPER";
+        bind = [
+          "$mod, F, exec, qutebrowser"
+          "$mod, Return, exec, alacritty"
+
+          "$mod SHIFT, Q, killactive,"
+          "$mod SHIFT, X, exit,"
+
+          "$mod, H, movefocus, l"
+          "$mod, J, movefocus, d"
+          "$mod, K, movefocus, u"
+          "$mod, L, movefocus, r"
+        ]
+        ++ (builtins.concatLists (builtins.genList (
+          # workspaces
+          # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
+          x: let
+            ws = let
+              c = (x + 1) / 10;
+            in
+              builtins.toString (x + 1 - (c * 10));
+          in [
+            "$mod, ${ws}, workspace, ${toString (x + 1)}"
+            "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+          ]
+        ) 10) );
+      };
+    };
+  };
+}

modules/home/terminal/emulator.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, config, ... }: {
-  options = {
-    mods.terminal.emulator.enable = lib.mkEnableOption "enables terminal emulator";
-  };
+  options.mods.terminal.emulator.enable = lib.mkEnableOption "enables terminal emulator";
 
   config = lib.mkIf config.mods.terminal.emulator.enable {
     programs.alacritty.enable = true;

modules/nixos/core/network.nix

@@ -1,5 +1,3 @@
 { pkgs, lib, ... }: {
-  config = {
   networking.networkmanager.enable = true;
-  };
 }

modules/nixos/core/user.nix

@@ -1,10 +1,8 @@
 { pkgs, lib, config, ... }: {
-  options = {
-    mods.user.name = lib.mkOption {
+  options.mods.user.name = lib.mkOption {
     default = "muon";
     description = "username of the main system user";
   };
-  };
 
   config = {
     users.users.${config.mods.user.name} = {

modules/nixos/default.nix

@@ -4,5 +4,8 @@
     ./system
     ./desktop
     ./theme
+
+    # </3
+    ./unfree
   ];
 }

modules/nixos/desktop/default.nix

@@ -1,15 +1,26 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, config, ... }:
+let
+  cfg = config.mods.desktop;
+in {
   imports = [
     ./xorg.nix
     ./sound.nix
   ];
 
-  options = {
-    mods.desktop.enable = lib.mkEnableOption "enables graphical desktop environment";
+  options.mods.desktop = {
+    enable = lib.mkEnableOption "enables graphical desktop environment";
+    wayland.enable = lib.mkEnableOption "enables hyprland";
   };
 
-  config = lib.mkIf config.mods.desktop.enable {
+  config = lib.mkIf cfg.enable {
     mods.xorg.enable = true;
     mods.sound.enable = true;
+    mods.desktop.wayland.enable = lib.mkDefault false;
+    programs.hyprland = if cfg.wayland.enable then {
+      enable = true;
+      xwayland.enable = true;
+    } else {
+      enable = false;
+    };
   };
 }

modules/nixos/desktop/sound.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, config, ... }: {
-  options = {
-    mods.sound.enable = lib.mkEnableOption "enables sound";
-  };
+  options.mods.sound.enable = lib.mkEnableOption "enables sound";
 
   config = lib.mkIf config.mods.sound.enable {
       services.pipewire = {

modules/nixos/desktop/xorg.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, config, ... }: {
-  options = {
-    mods.xorg.enable = lib.mkEnableOption "enables xorg";
-  };
+  options.mods.xorg.enable = lib.mkEnableOption "enables xorg";
 
   config = lib.mkIf config.mods.xorg.enable {
     services.xserver.enable = true;

modules/nixos/unfree/default.nix

@@ -0,0 +1,19 @@
+{ pkgs, lib, config, ... }:
+let
+  cfg = config.mods.unfree;
+  mkPackages = mod:
+    if cfg.${mod}.enable then
+    cfg.${mod}.packages else [];
+
+in {
+  imports = [
+    ./steam.nix
+    ./nvidia.nix
+  ];
+
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) (
+      (mkPackages "steam") ++
+      (mkPackages "nvidia")
+    );
+}

modules/nixos/unfree/nvidia.nix

@@ -0,0 +1,42 @@
+{ pkgs, lib, config, ... }:
+let
+  cfg = config.mods.unfree.nvidia;
+in {
+  options.mods.unfree.nvidia = {
+    enable = lib.mkEnableOption {
+      default = false;
+      description = "enables proprietary nvidia drivers";
+    };
+    packages = lib.mkOption {
+      default = [ "nvidia-x11" ];
+      description = "unfree packages";
+    };
+    driver = lib.mkOption {
+      default = "stable";
+      description = "nvidiaPackages driver kernel package";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    # nixos.wiki/wiki/Nvidia
+    hardware.opengl = {
+      enable = true;
+      driSupport = true;
+      driSupport32Bit = true;
+    };
+
+    services.xserver.videoDrivers = [ "nvidia" ];
+
+    hardware.nvidia = {
+      modesetting.enable = true;
+
+      powerManagement.enable = false;
+      powerManagement.finegrained = false;
+
+      open = false;
+      nvidiaSettings = false;
+      
+      package = config.boot.kernelPackages.nvidiaPackages."${cfg.driver}";
+    };
+  };
+}

modules/nixos/unfree/steam.nix

@@ -0,0 +1,24 @@
+{ pkgs, lib, config, ... }: {
+  options.mods.unfree.steam = {
+    enable = lib.mkEnableOption {
+      default = false;
+      description = "enables proprietary steam software";
+    };
+    packages = lib.mkOption {
+      default = [
+        "steam"
+        "steam-original"
+        "steam-run"
+      ];
+      description = "unfree packages";
+    };
+  };
+
+  config = lib.mkIf config.mods.unfree.steam.enable {
+    # nixos.wiki/wiki/Steam
+    programs.steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+    };
+  };
+}

utils.nix

@@ -1,6 +1,6 @@
-{ pkgs, inputs, system, ... }: {
+{ inputs, system, ... }: {
   mkHost = host: inputs.nixpkgs.lib.nixosSystem {
-    specialArgs = { inherit inputs system pkgs; };
+    specialArgs = { inherit inputs system; };
 
     modules = [
       host