From 0bec3dbe63067fe0776906b4e1374cc5d4c1aa70 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 10 Feb 2025 01:17:58 -0500 Subject: [PATCH] Switch to home-manager. --- nix/steam_deck/configuration/flake.lock | 52 ++++++++++++++++++++++++- nix/steam_deck/configuration/flake.nix | 34 ++++++++-------- 2 files changed, 69 insertions(+), 17 deletions(-) diff --git a/nix/steam_deck/configuration/flake.lock b/nix/steam_deck/configuration/flake.lock index bcf4c6b..c67dbab 100644 --- a/nix/steam_deck/configuration/flake.lock +++ b/nix/steam_deck/configuration/flake.lock @@ -1,6 +1,55 @@ { "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1713543440, + "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", + "owner": "nix-community", + "repo": "nixGL", + "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixGL", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1660551188, + "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1739019272, "narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=", @@ -18,7 +67,8 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixgl": "nixgl", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/nix/steam_deck/configuration/flake.nix b/nix/steam_deck/configuration/flake.nix index 1b41f40..f4f8fe9 100644 --- a/nix/steam_deck/configuration/flake.nix +++ b/nix/steam_deck/configuration/flake.nix @@ -3,10 +3,17 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + # nixgl.url = "github:nix-community/nixGL"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { nixpkgs, + # nixgl, + home-manager, ... }: let @@ -14,23 +21,18 @@ pkgs = nixpkgs.legacyPackages.${system}; in { - packages.${system}.default = pkgs.buildEnv { - name = "default"; - paths = [ - pkgs.emacs - pkgs.mg - pkgs.steam-rom-manager - ]; - }; + defaultPackage.${system} = home-manager.defaultPackage.${system}; + homeConfigurations."deck" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; - formatter.${system} = pkgs.nixfmt-rfc-style; - # formatter.${system} = pkgs.alejandra; + modules = [ ./home.nix ]; + }; }; - # nixConfig = { - # experimental-features = [ - # "nix-command" - # "flakes" - # ]; - # }; + nixConfig = { + experimental-features = [ + "nix-command" + "flakes" + ]; + }; }