From d134adb40f1c3ac601fb8a96c60a4063866ca88d Mon Sep 17 00:00:00 2001 From: John Ogle Date: Sat, 7 Sep 2024 14:10:24 -0700 Subject: [PATCH] Import home-manager config --- flake.lock | 56 ++++++++++++++-------------- flake.nix | 49 ++++++++++-------------- home | 1 + machines/nix-book/configuration.nix | 1 + machines/z790prors/configuration.nix | 3 +- 5 files changed, 52 insertions(+), 58 deletions(-) create mode 160000 home diff --git a/flake.lock b/flake.lock index 9fe6476..bcdf334 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1722347739, - "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=", + "lastModified": 1725199881, + "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a", + "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", "type": "github" }, "original": { @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1725694918, + "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda", "type": "github" }, "original": { @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1724185071, - "narHash": "sha256-5ykCHWCX0P+cN2mZsJpPh1rW83tqDQ7KgeAimeh+kQo=", + "lastModified": 1725573970, + "narHash": "sha256-KJKO4b5Gl+7t3hF+X56Y0W/Lxf2OxWl/aLgzbiN3+hI=", "owner": "outfoxxed", "repo": "hy3", - "rev": "23682f7707e7f051618c1c35ce09708b80164c62", + "rev": "e91460d63627cdad417cac2c09897be58094e2e0", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "lastModified": 1722623071, + "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724517953, - "narHash": "sha256-EjlyG4Q2cJZOJ7iuCSu/EfY1Jb5dMJOpggN9+WcLxg0=", + "lastModified": 1725738873, + "narHash": "sha256-8OT3XRoPoAhiYHMT/hQ6uKE4o7Z99a1Y+711oEPV+dg=", "ref": "refs/heads/main", - "rev": "66586c38f53f16bcf762f019359a3c9042546a72", - "revCount": 5134, + "rev": "70add904c40924a761059e4009a8c0f1e43d76a3", + "revCount": 5194, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1725188252, + "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1722098849, - "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1722365976, - "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", + "lastModified": 1725203932, + "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", + "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 924b3ff..8ec9565 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A very basic flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; @@ -25,39 +25,30 @@ nixosConfigurations.z790prors-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; - modules = [ ./machines/z790prors/configuration.nix ]; + modules = [ + ./machines/z790prors/configuration.nix + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; + } + ]; }; nixosConfigurations.nix-book = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; - modules = [ ./machines/nix-book/configuration.nix ]; - }; - - homeConfigurations = let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - "johno@nix-book" = inputs.home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - extraSpecialArgs = { inherit inputs; }; - modules = [ - inputs.hyprland.homeManagerModules.default - /home/johno/.config/home-manager/home-nix-book.nix - ]; - }; - - "johno@z790prors-nix" = inputs.home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - extraSpecialArgs = { inherit inputs; }; - modules = [ - inputs.hyprland.homeManagerModules.default - /home/johno/.config/home-manager/home-z790prors.nix - ]; - }; - + modules = [ + ./machines/nix-book/configuration.nix + inputs.hyprland.homeManagerModules.default + inputs.home-manager.nixosModules.home-manager + { + inputs.home-manager.useGlobalPkgs = true; + inputs.home-manager.useUserPackages = true; + inputs.home-manager.extraSpecialArgs = { inherit inputs; }; + } + ]; }; }; } diff --git a/home b/home new file mode 160000 index 0000000..e758eae --- /dev/null +++ b/home @@ -0,0 +1 @@ +Subproject commit e758eaef20ee534c2610cadd72fd4fd28306a4ad diff --git a/machines/nix-book/configuration.nix b/machines/nix-book/configuration.nix index ffd885d..3c31382 100644 --- a/machines/nix-book/configuration.nix +++ b/machines/nix-book/configuration.nix @@ -101,6 +101,7 @@ extraGroups = [ "networkmanager" "wheel" "audio" ]; packages = with pkgs; []; }; + inputs.home-manager.users.johno = import ./home/home-nix-book.nix; # Enable automatic login for the user. services.getty.autologinUser = "johno"; diff --git a/machines/z790prors/configuration.nix b/machines/z790prors/configuration.nix index b90367a..11eca34 100644 --- a/machines/z790prors/configuration.nix +++ b/machines/z790prors/configuration.nix @@ -95,7 +95,8 @@ in # services.printing.enable = true; # Enable sound. - hardware.pulseaudio.enable = true; + # TODO: Something is enabling pipewire (sunshine/moonlight maybe?) which is incompatible with pulseaudio + hardware.pulseaudio.enable = false; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true;