From 9938a0722625b2aeedd6c4f879d021be69d04b50 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 27 Apr 2024 11:35:20 -0400 Subject: [PATCH] trying flakes --- flake.lock | 17 +++++++++++++++++ flake.nix | 17 ++++++++++++----- hardware-configs/fwbook.nix | 4 +--- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index a1d5b99..ae9e1ce 100644 --- a/flake.lock +++ b/flake.lock @@ -90,6 +90,22 @@ "url": "https://flakehub.com/f/nix-community/naersk/0.1.332.tar.gz" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1714201532, + "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", @@ -139,6 +155,7 @@ "inputs": { "fh": "fh", "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3" } }, diff --git a/flake.nix b/flake.nix index b6818f0..bc04b4c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,16 @@ inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; inputs.home-manager.url = github:nix-community/home-manager; inputs.fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz"; + inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - outputs = { self, nixpkgs, home-manager, fh, ... }@attrs: + outputs = + { self + , nixpkgs + , home-manager + , fh + , nixos-hardware + }@attrs: let user = { name = "ari"; @@ -21,7 +28,7 @@ system = "x86_64-linux"; modules = [ hardware-configs/fwbook.nix - + nixos-hardware.nixosModules.framework-13-7040-amd (import ./modules/os/nix.nix { systemStateVersion = systemStateVersion; }) @@ -52,9 +59,9 @@ hostName = hostName; user = user; }) - /home/ari/nixos-setup/modules/optional/amd-packages.nix - /home/ari/nixos-setup/modules/optional/gnome.nix - (import /home/ari/nixos-setup/modules/optional/hyprland.nix { + ./modules/optional/amd-packages.nix + ./modules/optional/gnome.nix + (import ./modules/optional/hyprland.nix { user = user; }) { diff --git a/hardware-configs/fwbook.nix b/hardware-configs/fwbook.nix index 0956af6..740893c 100644 --- a/hardware-configs/fwbook.nix +++ b/hardware-configs/fwbook.nix @@ -1,6 +1,4 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. +# Generated by ‘nixos-generate-config’ { config, lib, pkgs, modulesPath, ... }: {