From e161742bb911b5db7082c0e390dafff0e030d0cc Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 27 Apr 2024 11:40:44 -0400 Subject: [PATCH] trying flakes --- flake.lock | 8 ++++---- flake.nix | 43 ++----------------------------------------- 2 files changed, 6 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index ae9e1ce..e7337fa 100644 --- a/flake.lock +++ b/flake.lock @@ -137,16 +137,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1713995372, + "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 62d0f4b..97df42c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; + inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11; 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"; @@ -20,7 +20,7 @@ }; dataDir = "/mnt/Data"; systemStateVersion = "23.11"; - homeMangerVersion = "24.04"; + homeMangerVersion = "23.11"; hostName = "fwbook"; in { @@ -37,45 +37,6 @@ hostName = hostName; firewall = { enable = true; }; }) - (import ./modules/os/hardware.nix { - enableFingerPrint = true; - }) - (import ./modules/os/ssh.nix { - user = user; - enableSSHServer = false; - }) - ./modules/os/services.nix - ./modules/docker/core.nix - (import ./modules/user.nix { - user = user; - }) - (import ./modules/rootUser.nix { - hostName = hostName; - }) - home-manager.nixosModules.default - fh.packages.x86_64-linux.default - (import ./modules/optional/home-manager-config.nix { - homeMangerVersion = homeMangerVersion; - hostName = hostName; - user = user; - }) - ./modules/optional/amd-packages.nix - ./modules/optional/gnome.nix - (import ./modules/optional/hyprland.nix { - user = user; - }) - { - hardware.framework.amd-7040.preventWakeOnAC = true; - services.fwupd.enable = true; - fileSystems."${dataDir}" = { - device = "/dev/sda1"; - fsType = "ext4"; - options = [ - "users" - "nofail" - ]; - }; - } ]; }; };