flake.lock: update

- modules: remove overlays, use `.package` options - home: exa -> eza
fufexan · Sep 10, 2023 · a9c2907 · a9c2907
1 parent 9ff6159
commit a9c2907
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 89 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/shell/cli.nix b/home/shell/cli.nix
@@ -32,15 +32,15 @@
     };
 
     btop.enable = true;
-    exa.enable = true;
+    eza.enable = true;
     ssh.enable = true;
 
     skim = {
       enable = true;
       enableZshIntegration = true;
       defaultCommand = "rg --files --hidden";
       changeDirWidgetOptions = [
-        "--preview 'exa --icons --git --color always -T -L 3 {} | head -200'"
+        "--preview 'eza --icons --git --color always -T -L 3 {} | head -200'"
         "--exact"
       ];
     };

diff --git a/home/shell/zsh.nix b/home/shell/zsh.nix
@@ -64,14 +64,14 @@
     shellAliases = {
       grep = "grep --color";
       ip = "ip --color";
-      l = "exa -l";
-      la = "exa -la";
+      l = "eza -l";
+      la = "eza -la";
       md = "mkdir -p";
       pf = "powerprofilesctl launch -p performance";
 
       us = "systemctl --user";
       rs = "sudo systemctl";
     };
-    shellGlobalAliases = {exa = "exa --icons --git";};
+    shellGlobalAliases = {eza = "eza --icons --git";};
   };
 }
diff --git a/hosts/io/default.nix b/hosts/io/default.nix
@@ -2,7 +2,6 @@
   config,
   pkgs,
   self,
-  lib,
   ...
 }: {
   imports = [./hardware-configuration.nix];
@@ -30,14 +29,33 @@
 
   environment.systemPackages = [config.boot.kernelPackages.cpupower];
 
-  hardware.pulseaudio.enable = lib.mkForce false;
-
   networking.hostName = "io";
 
   programs = {
     # enable hyprland and required options
     hyprland.enable = true;
-    steam.enable = true;
+
+    steam = {
+      enable = true;
+      # fix gamescope inside steam
+      package = pkgs.steam.override {
+        extraPkgs = pkgs:
+          with pkgs; [
+            keyutils
+            libkrb5
+            libpng
+            libpulseaudio
+            libvorbis
+            stdenv.cc.cc.lib
+            xorg.libXcursor
+            xorg.libXi
+            xorg.libXinerama
+            xorg.libXScrnSaver
+          ];
+        # set correct scaling
+        extraProfile = "export GDK_SCALE=2";
+      };
+    };
   };
 
   security.tpm2.enable = true;

diff --git a/modules/desktop.nix b/modules/desktop.nix
@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   self,
   inputs,
   ...
@@ -61,6 +62,8 @@
 
     opentabletdriver.enable = true;
 
+    pulseaudio.enable = lib.mkForce false;
+
     xpadneo.enable = true;
   };
 

diff --git a/modules/greetd.nix b/modules/greetd.nix
@@ -37,6 +37,23 @@ in {
 
   programs.regreet = {
     enable = true;
+    package = pkgs.greetd.regreet.overrideAttrs (self: super: rec {
+      version = "0.1.1-patched";
+      src = pkgs.fetchFromGitHub {
+        owner = "rharish101";
+        repo = "ReGreet";
+        rev = "61d871a0ee5c74230dfef8100d0c9bc75b309203";
+        hash = "sha256-PkQTubSm/FN3FXs9vBB3FI4dXbQhv/7fS1rXkVsTAAs=";
+      };
+      cargoDeps = super.cargoDeps.overrideAttrs (_: {
+        inherit src;
+        outputHash = "sha256-dR6veXCGVMr5TbCvP0EqyQKTG2XM65VHF9U2nRWyzfA=";
+      });
+
+      # temp fix until https://github.com/rharish101/ReGreet/issues/32 is solved
+      patches = [../pkgs/regreet.patch];
+    });
+
     settings = {
       background = {
         path = default.wallpaper;

diff --git a/modules/nix.nix b/modules/nix.nix
@@ -64,60 +64,5 @@
     };
   };
 
-  nixpkgs = {
-    config.allowUnfree = true;
-    overlays = [
-      (
-        _: prev: {
-          steam = prev.steam.override {
-            extraPkgs = pkgs:
-              with pkgs; [
-                keyutils
-                libkrb5
-                libpng
-                libpulseaudio
-                libvorbis
-                stdenv.cc.cc.lib
-                xorg.libXcursor
-                xorg.libXi
-                xorg.libXinerama
-                xorg.libXScrnSaver
-              ];
-            extraProfile = "export GDK_SCALE=2";
-          };
-
-          greetd =
-            prev.greetd
-            // {
-              regreet = prev.greetd.regreet.overrideAttrs (self: super: rec {
-                version = "0.1.1-patched";
-                src = prev.fetchFromGitHub {
-                  owner = "rharish101";
-                  repo = "ReGreet";
-                  rev = "61d871a0ee5c74230dfef8100d0c9bc75b309203";
-                  hash = "sha256-PkQTubSm/FN3FXs9vBB3FI4dXbQhv/7fS1rXkVsTAAs=";
-                };
-                cargoDeps = super.cargoDeps.overrideAttrs (_: {
-                  inherit src;
-                  outputHash = "sha256-dR6veXCGVMr5TbCvP0EqyQKTG2XM65VHF9U2nRWyzfA=";
-                });
-
-                # temp fix until https://github.com/NixOS/nixpkgs/pull/249384 is merged
-                nativeBuildInputs = super.nativeBuildInputs ++ [prev.wrapGAppsHook];
-                buildInputs = super.buildInputs ++ [prev.librsvg];
-
-                # temp fix until https://github.com/rharish101/ReGreet/issues/32 is solved
-                patches = [../pkgs/regreet.patch];
-              });
-            };
-
-          # temp fix until https://github.com/NixOS/nixpkgs/pull/249382 is merged
-          gtklock = prev.gtklock.overrideAttrs (self: super: {
-            nativeBuildInputs = super.nativeBuildInputs ++ [prev.wrapGAppsHook];
-            buildInputs = super.buildInputs ++ [prev.librsvg];
-          });
-        }
-      )
-    ];
-  };
+  nixpkgs.config.allowUnfree = true;
 }