Merge branch 'main' of https://github.com/b-ran/nixos-config

b-ran · Jul 27, 2023 · fca740c · fca740c
2 parents 5577937 + e3691b7
commit fca740c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 29 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/hosts/default.nix b/hosts/default.nix
@@ -9,15 +9,14 @@ in
   desktop = nixpkgs.lib.nixosSystem {
     inherit system;
     specialArgs = {
-      inherit pkgs old-nixpkgs home-manager hyprland hyprland-contrib user system;
+      inherit pkgs old-nixpkgs  home-manager hyprland-contrib user system;
       host = {
         name = "desktop";
         fristMonitor = "DP-1";
         secondMonitor = "HDMI-A-1";
       };
     };
     modules = [
-      hyprland.nixosModules.default
       ./configuration.nix
       ./desktop
 
@@ -35,7 +34,6 @@ in
         };
         home-manager.users.${user} = {
           imports = [
-            hyprland.homeManagerModules.default
             ./home.nix
             desktop/home.nix
           ];
@@ -47,7 +45,7 @@ in
   work = nixpkgs.lib.nixosSystem {
     inherit system;
     specialArgs = {
-      inherit pkgs old-nixpkgs home-manager hyprland hyprland-contrib user system;
+      inherit pkgs old-nixpkgs home-manager hyprland-contrib user system;
       host = {
         name = "work";
         fristMonitor = "DVI-I-1";
@@ -56,7 +54,6 @@ in
       };
     };
     modules = [
-      hyprland.nixosModules.default
       ./configuration.nix
       ./work
 
@@ -75,7 +72,6 @@ in
         };
         home-manager.users.${user} = {
           imports = [
-            hyprland.homeManagerModules.default
             ./home.nix
             work/home.nix
           ];

diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, home-manager, hyprland, user, host, ... }:
+{ lib, pkgs, home-manager, user, host, ... }:
 
 {
   imports =

diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyprland, ... }:
+{ pkgs, ... }:
 
 {
   imports =

diff --git a/hosts/work/default.nix b/hosts/work/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, home-manager, hyprland, user, host, ... }:
+{ lib, pkgs, home-manager, user, host, ... }:
 
 {
   imports =

diff --git a/hosts/work/home.nix b/hosts/work/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, hyprland, ... }:
+{ pkgs, ... }:
 
 {
   imports =

diff --git a/modules/hyprland.nix b/modules/hyprland.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, hyprland, hyprland-contrib, user, host, ... }:
+{ pkgs, home-manager, hyprland-contrib, user, host, ... }:
 
 let
   catppuccinHyprland = pkgs.fetchFromGitHub {
@@ -43,9 +43,8 @@ in
     home.file.".config/hypr/catppuccin.conf".source = "${catppuccinHyprland}/themes/mocha.conf";
     wayland.windowManager.hyprland = {
       enable = true;
-      nvidiaPatches = true;
+      enableNvidiaPatches = true;
       systemdIntegration = true;
-      recommendedEnvironment = true;
 
       extraConfig = ''
         ${monitors}