chore: nix flake update

konradmalik · Aug 26, 2023 · 93b6975 · 93b6975
1 parent be091d3
commit 93b6975
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 54 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,14 +35,13 @@
       };
     };
     sops-nix = {
-      # url = "github:Mic92/sops-nix";
-      url = "github:shyim/sops-nix/shyim-patch-1";
+      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
     nix-colors.url = "github:misterio77/nix-colors";
     hyprland = {
-      url = "github:hyprwm/Hyprland/v0.28.0";
+      url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
   };

diff --git a/home/konrad/common/optional/desktop/common/wayland-wm/waybar.nix b/home/konrad/common/optional/desktop/common/wayland-wm/waybar.nix
@@ -36,7 +36,7 @@ in
 {
   programs.waybar = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.waybar-hyprland;
+    package = pkgs.unstable.waybar;
     settings = {
       secondary = {
         output = builtins.map (m: m.name) (builtins.filter (m: !m.isPrimary) config.monitors);

diff --git a/hosts/common/optional/wayland-wm.nix b/hosts/common/optional/wayland-wm.nix
@@ -29,8 +29,8 @@ in
     wlr.enable = !anyHyprlandEnabled;
     # gtk portal needed to make gtk apps happy
     extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ] ++ lib.optionals anyHyprlandEnabled [ pkgs.xdg-desktop-portal-hyprland ];
+      pkgs.unstable.xdg-desktop-portal-gtk
+    ];
   };
 
   hardware.opengl = {

diff --git a/hosts/m3800/hardware-configuration.nix b/hosts/m3800/hardware-configuration.nix
@@ -17,7 +17,7 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -30,5 +30,10 @@
   # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+  };
 }
diff --git a/hosts/vaio/hardware-configuration.nix b/hosts/vaio/hardware-configuration.nix
@@ -33,5 +33,9 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+  };
 }
diff --git a/hosts/xps12/hardware-configuration.nix b/hosts/xps12/hardware-configuration.nix
@@ -30,5 +30,9 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+  };
 }