From bfaa74cbcf0509b96d3cd891c841f2e4b3fbe25c Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 28 Feb 2024 22:38:27 -0600 Subject: [PATCH] Atuin. --- flake.lock | 76 +++++++++++++++++++++++++++++++++++++- flake.nix | 7 ++++ home-manager/durincore.nix | 2 +- 3 files changed, 82 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8f837ac..ce1e163 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,30 @@ { "nodes": { - "deploy-rs": { + "atuin": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709128875, + "narHash": "sha256-PqCVFg1Pc2RsgSzcEQZSDxWwY9ocaKrF1fy3w1qLw14=", + "owner": "atuinsh", + "repo": "atuin", + "rev": "593dc410eb3d5d7d409b780b9c7bd22ee4aa8654", + "type": "github" + }, + "original": { + "owner": "atuinsh", + "repo": "atuin", + "type": "github" + } + }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -38,6 +60,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -56,6 +94,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -151,6 +207,7 @@ }, "root": { "inputs": { + "atuin": "atuin", "deploy-rs": "deploy-rs", "home-manager": "home-manager", "nix-fast-build": "nix-fast-build", @@ -194,6 +251,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -217,7 +289,7 @@ }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, diff --git a/flake.nix b/flake.nix index 2332518..186ef2a 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,12 @@ url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # atuin + atuin = { + url = "github:atuinsh/atuin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; # The `@` syntax here is used to alias the attribute set of the @@ -68,6 +74,7 @@ # Note: configuration.nix itself is also a Nixpkgs Module, ./nixos/durincore/configuration.nix ./nixos/common.nix + # { nixpkgs.overlays = [ (self: super: { atuin = atuin.packages.${self.pkgs.system}.atuin; }) ]; } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/home-manager/durincore.nix b/home-manager/durincore.nix index 4876b5f..bc2ae28 100644 --- a/home-manager/durincore.nix +++ b/home-manager/durincore.nix @@ -1,4 +1,4 @@ -{ config, pkgs, talhelper, ... }: +{ config, pkgs, ... }: { # TODO please change the username & home direcotry to your own