Update ginaz to new flake layout

5 files changed, 40 insertions, 38 deletions

diff --git a/flake.lock b/flake.lock
index 21edfe3..1350028 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712798444,
-        "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=",
+        "lastModified": 1712947906,
+        "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d",
+        "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5",
         "type": "github"
       },
       "original": {
@@ -20,21 +20,6 @@
         "type": "github"
       }
     },
-    "hardware": {
-      "locked": {
-        "lastModified": 1711352745,
-        "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "home-manager-stable": {
       "inputs": {
         "nixpkgs": [
@@ -63,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712759992,
-        "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
+        "lastModified": 1712989663,
+        "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
+        "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
         "type": "github"
       },
       "original": {
@@ -76,13 +61,28 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1712909959,
+        "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1712806230,
-        "narHash": "sha256-L5Y0jrTeoIlDjKxZTWUolElXA3fkEwOm7Tp1w3Zna08=",
+        "lastModified": 1712939125,
+        "narHash": "sha256-G3wznglfDwSYF8obg+zVqJqA/fPmJnzgaELq4kTCopI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4e26a9254caa61f6599357cbaba9df7ff6ee0b0e",
+        "rev": "ec877443d62ed5268c741656657d1319554a55f4",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1712608508,
-        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
+        "lastModified": 1712791164,
+        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
+        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
         "type": "github"
       },
       "original": {
@@ -111,9 +111,9 @@
     "root": {
       "inputs": {
         "disko": "disko",
-        "hardware": "hardware",
         "home-manager-stable": "home-manager-stable",
         "home-manager-unstable": "home-manager-unstable",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index ba3005f..31916d3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,8 +5,6 @@
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs-unstable";
 
-    hardware.url = "github:nixos/nixos-hardware";
-
     home-manager-stable = {
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs-stable";
@@ -17,17 +15,20 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
+    nixos-hardware.url = "github:nixos/nixos-hardware";
+
     nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs = inputs@{ home-manager-stable, home-manager-unstable, nixpkgs-stable, nixpkgs-unstable, ... }: rec {
+  outputs = inputs@{ home-manager-stable, home-manager-unstable, nixos-hardware, nixpkgs-stable, nixpkgs-unstable, ... }: rec {
     nixosConfigurations = {
       ginaz = nixpkgs-unstable.lib.nixosSystem {
         pkgs = pkgs-unstable;
         system = "x86_64-linux";
         modules = [
           ./hosts/ginaz
+          nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7.amdgpu
           home-manager-unstable.nixosModules.home-manager {
             home-manager.users.nipsy = import ./home/nipsy/ginaz.nix;
           }
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index ebca5ea..e513c74 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -1,6 +1,6 @@
 {
+  services.displayManager.defaultSession = "xsession";
   services.xserver = {
-    displayManager.defaultSession = "xsession";
     displayManager.lightdm = {
       enable = true;
       extraSeatDefaults = ''greeter-hide-users=true'';
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index 998ca5d..9b306d1 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -1,4 +1,4 @@
-{ config, inputs, pkgs, ... }: {
+{ config, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "amdgpu" "zfs" ];
     kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
@@ -17,13 +17,15 @@
   environment.systemPackages = with pkgs; [
     bc
     bespokesynth
-    bintools
+    binutils
     cardinal
     cargo
     conntrack-tools
+    coreutils
     curl
     dmenu
     dict
+    diffutils
     dig
     dmidecode
     easyeffects
@@ -33,12 +35,14 @@
     feh
     ffmpeg
     file
+    findutils
     flac
     fldigi
     fluidsynth
     foot
     fortune
     fping
+    gcc
     gcr
     geeqie
     geonkick
@@ -59,6 +63,7 @@
     iotop
     ipcalc
     iperf
+    iputils
     jq
     lame
     libreoffice
@@ -157,8 +162,6 @@
   ];
 
   imports = [
-    inputs.hardware.nixosModules.lenovo-yoga-7-14ARH7.amdgpu
-
     ./hardware-configuration.nix
     ../common/core
     ../common/optional/google-authenticator.nix
diff --git a/hosts/ginaz/hardware-configuration.nix b/hosts/ginaz/hardware-configuration.nix
index a5ae455..f8a58f8 100644
--- a/hosts/ginaz/hardware-configuration.nix
+++ b/hosts/ginaz/hardware-configuration.nix
@@ -44,6 +44,4 @@
 
   hardware.bluetooth.enable = true;
   #hardware.bluetooth.powerOnBoot = true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }