From fcf3a2f27566ccb1f6c1b12a0eebf9580188e7c9 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Thu, 24 Aug 2023 17:59:48 +0100 Subject: [PATCH] refactor: switch to unstable & add wine --- flake.lock | 14 +++++++------- flake.nix | 4 +--- home/default.nix | 7 ++++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index c1bf8c7..30a94fc 100644 --- a/flake.lock +++ b/flake.lock @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1683833146, - "narHash": "sha256-ELF0oXgg0NYGyKtU74HW8CeLstFJwwCGbuahnQla67I=", + "lastModified": 1689134369, + "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc9f65d104e5227d103a529a9fc3687ef4ccb117", + "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", "type": "github" }, "original": { @@ -559,16 +559,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1687288566, - "narHash": "sha256-VckkiJ88Gzdc2cstm0z5eFcrHbvkm4VjxavHBGssvZI=", + "lastModified": 1689192006, + "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6c73c5fe53bb3afbf65e870541e0645e9145171", + "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 97a9442..23a6de5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,7 @@ description = "Home Manager configuration of hammy"; inputs = { - # At the time of writing, nixos-unstable doesn't work for home manager - # FIXME: https://github.com/NixOS/nixpkgs/issues/236940#issuecomment-1585223723 - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/default.nix b/home/default.nix index def9f63..a83f79c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -28,8 +28,9 @@ home.username = "hammy"; home.homeDirectory = "/home/hammy"; - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; home.packages = with pkgs; [ + wineWowPackages.stable imagemagick alejandra fd @@ -41,8 +42,8 @@ TERMINAL = "wezterm-gui"; LIBVA_DRIVER_NAME = "iHD"; LS_COLORS = "$(vivid generate catppuccin-mocha)"; - JAVA_HOME = "$SDKMAN_DIR/candidates/java/current"; - GRAALVM_HOME = "$SDKMAN_DIR/candidates/java/22.3.r17-grl"; + JAVA_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/current"; + GRAALVM_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/22.3.r17-grl"; }; home.sessionPath = [ "${config.xdg.dataHome}/JetBrains/Toolbox/scripts"