Bump inputs

jeremystucki · Jun 1, 2024 · 008c642 · 008c642
1 parent 2657d59
commit 008c642
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 74 deletions.
diff --git a/common/nixos.nix b/common/nixos.nix
@@ -52,7 +52,6 @@
       alacritty
       chromium
       ddcutil
-      etcher
       firefox
       killall
       nvd
@@ -88,8 +87,10 @@
   services.xserver = {
     enable = true;
 
-    layout = "us";
-    xkbVariant = "";
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
 
     displayManager = {
       gdm.enable = true;

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,13 +6,13 @@
       url = "github:numtide/flake-utils";
     };
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-23.11";
+      url = "github:nixos/nixpkgs/nixos-24.05";
     };
     nixpkgs-unstable = {
       url = "github:nixos/nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     color-scheme-sync = {
@@ -23,64 +23,63 @@
 
   outputs =
     inputs:
-    inputs.flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        config = {
-          allowUnfree = true;
-          input-fonts.acceptLicense = true;
-          permittedInsecurePackages = [
-            "electron-12.2.3"
-            "electron-19.1.9"
-            "electron-24.8.6"
-            "electron-25.9.0"
-          ];
-        };
-        pkgs = import inputs.nixpkgs {
-          inherit system config;
-          overlays = [
-            (final: prev: { obsidian = prev.obsidian.override { electron = final.electron_24; }; })
-          ];
-        };
-        pkgs-unstable = import inputs.nixpkgs-unstable { inherit system config; };
-        nixosConfig =
-          {
-            nixosModule,
-            homeManagerModule ? { },
-          }:
-          inputs.nixpkgs.lib.nixosSystem {
-            specialArgs = {
-              inherit pkgs pkgs-unstable;
-            };
-            modules = [
-              ./common/nixos.nix
-              nixosModule
-              inputs.color-scheme-sync.nixosModules.default
-              inputs.home-manager.nixosModules.home-manager
-              {
-                home-manager.users.jeremy.imports = [
-                  ./common/home-manager.nix
-                  ./common/nixos-home-manager.nix
-                  homeManagerModule
-                ];
-                home-manager.useGlobalPkgs = true;
-                home-manager.extraSpecialArgs = {
-                  inherit pkgs-unstable;
-                };
-              }
-            ];
+    let
+      system = "x86_64-linux";
+      config = {
+        allowUnfree = true;
+        input-fonts.acceptLicense = true;
+        permittedInsecurePackages = [
+          "electron-12.2.3"
+          "electron-19.1.9"
+          "electron-24.8.6"
+          "electron-25.9.0"
+        ];
+      };
+      pkgs = import inputs.nixpkgs {
+        inherit system config;
+        overlays = [
+          (final: prev: { obsidian = prev.obsidian.override { electron = final.electron_24; }; })
+        ];
+      };
+      pkgs-unstable = import inputs.nixpkgs-unstable { inherit system config; };
+      nixosConfig =
+        {
+          nixosModule,
+          homeManagerModule ? { },
+        }:
+        inputs.nixpkgs.lib.nixosSystem {
+          specialArgs = {
+            inherit pkgs pkgs-unstable;
           };
-      in
-      {
-        nixosConfigurations."volt-nixos" = nixosConfig {
-          nixosModule = ./volt/nixos-configuration.nix;
-          homeManagerModule = ./volt/home-manager.nix;
-        };
-        nixosConfigurations."zephyr-nixos" = nixosConfig {
-          nixosModule = ./zephyr/nixos-configuration.nix;
+          modules = [
+            ./common/nixos.nix
+            nixosModule
+            inputs.color-scheme-sync.nixosModules.default
+            inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager.users.jeremy.imports = [
+                ./common/home-manager.nix
+                ./common/nixos-home-manager.nix
+                homeManagerModule
+              ];
+              home-manager.useGlobalPkgs = true;
+              home-manager.extraSpecialArgs = {
+                inherit pkgs-unstable;
+              };
+            }
+          ];
         };
+    in
+    {
+      nixosConfigurations."volt-nixos" = nixosConfig {
+        nixosModule = ./volt/nixos-configuration.nix;
+        homeManagerModule = ./volt/home-manager.nix;
+      };
 
-        formatter = pkgs-unstable.nixfmt-rfc-style;
-      }
-    );
+      nixosConfigurations."zephyr-nixos" = nixosConfig {
+        nixosModule = ./zephyr/nixos-configuration.nix;
+      };
+
+      formatter.${system} = pkgs-unstable.nixfmt-rfc-style;
+    };
 }
diff --git a/volt/nixos-configuration.nix b/volt/nixos-configuration.nix
@@ -41,7 +41,7 @@
     package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
-  services.xserver.displayManager.autoLogin = {
+  services.displayManager.autoLogin = {
     enable = true;
     user = "jeremy";
   };