From 4e07055e40118854e690fa30e9fa545d0501194a Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Wed, 22 Jun 2022 16:49:01 +0300 Subject: [PATCH] guh --- flake.lock | 54 ++++++++++++++++++------------------- pkgs-set/overlays/helix.nix | 3 +++ users/patriot/default.nix | 3 ++- 3 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 pkgs-set/overlays/helix.nix diff --git a/flake.lock b/flake.lock index 68ccc96..f995753 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "devshell": { "flake": false, "locked": { - "lastModified": 1653917170, - "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=", + "lastModified": 1654858401, + "narHash": "sha256-53bw34DtVJ2bnF6WEwy6Tym+qY0pNEiEwARUlvmTZjs=", "owner": "numtide", "repo": "devshell", - "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92", + "rev": "f55e05c6d3bbe9acc7363bc8fc739518b2f02976", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1654451959, - "narHash": "sha256-yWztC96o8Dw65jDbmNUxV1i61T3uLqvqhC3ziwnB/Fk=", + "lastModified": 1655826285, + "narHash": "sha256-dyrNTVBefSZWKdFNnAW+zUkO5bVo1colvLje4l1XXwA=", "owner": "nix-community", "repo": "dream2nix", - "rev": "90b353682ef927bd39b59085e0dc6b7454888de7", + "rev": "f23add2b9c313c63dea5cff71523a850d29ffddb", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1655836942, - "narHash": "sha256-yYfjjeUt9Mkh2BCGLlGvNY2ulUSnoJ6DfQXni9bopcc=", + "lastModified": 1655895714, + "narHash": "sha256-Q9NOnh+4Tqjf1O0fBDWYiJGoxsXG5DUe3GT9BR1JHdk=", "owner": "helix-editor", "repo": "helix", - "rev": "5b3b6ffc9e9b34fbbb39ad33cd29c8dec78ac231", + "rev": "b365f2d6143c7a73de703425e00b32b8184d6a02", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1655594877, - "narHash": "sha256-AQ39Vlb6zhsJqIRz2cN923+ESBxHmeHMHoPqA80xOCE=", + "lastModified": 1655858799, + "narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "5197e5df7d3a148b1ad080235f70800987bc3549", + "rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18", "type": "github" }, "original": { @@ -181,17 +181,17 @@ "helix", "nixpkgs" ], - "rustOverlay": [ + "rust-overlay": [ "helix", "rust-overlay" ] }, "locked": { - "lastModified": 1654531591, - "narHash": "sha256-DtDAwkl2Pn8w1BW1z2OssT/bWjVhMZQBBpr2uDY7tHY=", + "lastModified": 1655826649, + "narHash": "sha256-C4/7CdB/mzuD9ayWvEA3Jcog6INCq+oUJZxUsIP/GvE=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "c935099d6851d0ff94098e9a12f42147524f0c5b", + "rev": "5cf1685c021c47631a2fb16533c00c8d68afd09e", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1654057797, - "narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=", + "lastModified": 1655789751, + "narHash": "sha256-DbL2gn7YwkuX10OdlWfZ/A7zEJztwHh9NMeau1JMTdk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af", + "rev": "f9d8dff4e621f2d7f2b84d9e84bc6359715f971c", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1655567057, - "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", + "lastModified": 1655624069, + "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e0a42267f73ea52adc061a64650fddc59906fc99", + "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa", "type": "github" }, "original": { @@ -250,10 +250,10 @@ "flake": false, "locked": { "lastModified": 1653339422, - "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=", + "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=", "owner": "rycee", "repo": "nmd", - "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd", + "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29", "type": "gitlab" }, "original": { @@ -297,11 +297,11 @@ ] }, "locked": { - "lastModified": 1654483484, - "narHash": "sha256-Ki/sMgrUEj+31P3YMzZZp5Nea7+MQVVTdaRWQVS1PL4=", + "lastModified": 1655779671, + "narHash": "sha256-6feeiGa6fb7ZPVHR71uswkmN1701TAJpwYQA8QffmRk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6bc59b9c4ad1cc1089219e935aa727a96d948c5d", + "rev": "8159585609a772b041cce6019d5c21d240709244", "type": "github" }, "original": { diff --git a/pkgs-set/overlays/helix.nix b/pkgs-set/overlays/helix.nix new file mode 100644 index 0000000..65a76a7 --- /dev/null +++ b/pkgs-set/overlays/helix.nix @@ -0,0 +1,3 @@ +{inputs}: final: prev: { + helix = inputs.helix.defaultPackage.${prev.system}; +} diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 8948dcb..de552ad 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -170,6 +170,7 @@ in { fonts.fontconfig.enable = lib.mkForce true; home = { + stateVersion = nixosConfig.system.stateVersion; homeDirectory = nixosConfig.users.users.patriot.home; packages = with pkgs; [ # Font stuff @@ -283,7 +284,7 @@ in { in [fast-syntax-highlighting per-directory-history]; # xdg compliant dotDir = ".config/zsh"; - history.path = ".local/share/zsh/history"; + history.path = "${config.home.homeDirectory}/.local/share/zsh/history"; initExtra = '' export TERM=alacritty export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)