From ca20745d1237f8026ccffcc9b7d4835286447ad3 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 3 Nov 2023 10:06:32 -0500 Subject: [PATCH] Updated for IVR needs --- flake.lock | 159 ++++++++++++++++++++++++------------- flake.nix | 7 ++ home/default.nix | 4 +- home/hosts/ivr/default.nix | 4 +- home/vim.nix | 6 -- 5 files changed, 114 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 38f3c73..738be04 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -133,21 +133,22 @@ "type": "github" } }, - "flake-utils_4": { + "haumea": { "inputs": { - "systems": "systems_4" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", "type": "github" } }, @@ -158,11 +159,11 @@ ] }, "locked": { - "lastModified": 1693208669, - "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=", + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c", + "rev": "07682fff75d41f18327a871088d20af2710d4744", "type": "github" }, "original": { @@ -172,6 +173,27 @@ "type": "github" } }, + "hmunstable": { + "inputs": { + "nixpkgs": [ + "nixstable" + ] + }, + "locked": { + "lastModified": 1698896213, + "narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "831b4fa31749208e576050c563e9773aafd04941", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -201,11 +223,11 @@ ] }, "locked": { - "lastModified": 1693108765, - "narHash": "sha256-U1btmyF7SMX+y80EXYva5Xj6lpn20xPbHbuoe/2bSIw=", + "lastModified": 1698873617, + "narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "9706fb8e441a7c56c68bb079480938ed505e8102", + "rev": "48b0a30202516e25d9885525fbb200a045f23f26", "type": "github" }, "original": { @@ -255,19 +277,20 @@ "nixneovim": { "inputs": { "flake-utils": "flake-utils_2", + "haumea": "haumea", "home-manager": "home-manager_2", "nix-flake-tests": "nix-flake-tests", "nixneovimplugins": "nixneovimplugins", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nmd": "nmd", "nmt": "nmt" }, "locked": { - "lastModified": 1693145871, - "narHash": "sha256-4ukNPl1wS8KVXDgGvzHdOVna2SmoMNEvSRG1+vJB4/0=", + "lastModified": 1698934863, + "narHash": "sha256-eKw9zCMAzypdijWc75MraJHZhEIi2yFre1wbpsRNdqI=", "owner": "NixNeovim", "repo": "NixNeovim", - "rev": "56bd12a614c6b4d58804eea617caa98040f4609b", + "rev": "d723943a86703293fdaa69534d8ccc2f7aa29d88", "type": "github" }, "original": { @@ -289,11 +312,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1692886753, - "narHash": "sha256-8trl3fqUXHSaRBj9db4dy8hDfS6dGEpeYlgKdScA1Zo=", + "lastModified": 1698934839, + "narHash": "sha256-bKchHdgkYOl+6g9VHyPDueHa25pJfNX5HOOhy0IcRgU=", "owner": "nixneovim", "repo": "nixneovimplugins", - "rev": "bae2f935ea46475c9360edaca313a5cd5720e2d9", + "rev": "89ef1bd2cc97607875c01c6a369989d4f1f278c6", "type": "github" }, "original": { @@ -320,11 +343,26 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1693003285, - "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=", + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -334,6 +372,22 @@ "type": "github" } }, + "nixpy311": { + "locked": { + "lastModified": 1698696950, + "narHash": "sha256-FHFL58t6lMumvWqwundC8fDDDLOIvc+JJBNIAlPjrDY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "017ef2132a5bda50bd713aeabce8f918502d4ec1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixstable": { "locked": { "lastModified": 1694048570, @@ -352,11 +406,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1693663421, - "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e56990880811a451abd32515698c712788be5720", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -385,11 +439,11 @@ "nmt": { "flake": false, "locked": { - "lastModified": 1683843030, - "narHash": "sha256-2K9tFpypgSORyUTRAL7MFRKCXU4GykmhIDrrIydtPdI=", + "lastModified": 1694274695, + "narHash": "sha256-PufoLMSuBYkga8hTqYf/cIQzSuy2lfFj+cdKcp2nLEI=", "owner": "jooooscha", "repo": "nmt", - "rev": "f30b96093eb056f1bcc60199545344b4e4a72c5a", + "rev": "29595267923b4a6ce766ff0d85afaa930842b88d", "type": "github" }, "original": { @@ -400,11 +454,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1693319998, - "narHash": "sha256-GjdunTxfEcvWn7N6RrDLE+X35M/nJfmZdK2Cq2Lvk/0=", + "lastModified": 1699022487, + "narHash": "sha256-YgBYhtv4mH/vY19ez/KK+NE931ziZqFKTp+hB6fAqxo=", "owner": "nix-community", "repo": "NUR", - "rev": "f944f5befe39d7cf27cd0b41960ace172f9241b3", + "rev": "cbfae2db1a6fc777c4bcbf4de7b1c02f404b28a8", "type": "github" }, "original": { @@ -415,7 +469,11 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": [ + "nixneovim", + "nixneovimplugins", + "flake-utils" + ], "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixneovim", @@ -443,7 +501,9 @@ "darwin": "darwin_2", "flake-utils": "flake-utils", "hm": "hm", + "hmunstable": "hmunstable", "nixneovim": "nixneovim", + "nixpy311": "nixpy311", "nixstable": "nixstable", "nixunstable": "nixunstable", "nurpkgs": "nurpkgs", @@ -495,25 +555,10 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "wsl": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixunstable" ] diff --git a/flake.nix b/flake.nix index 0ec122c..581bd95 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,12 @@ url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixstable"; }; + hmunstable = { + url = "github:nix-community/home-manager/master"; + inputs.nixpkgs.follows = "nixstable"; + }; nixneovim.url = "github:NixNeovim/NixNeovim"; + nixpy311.url = "github:NixOS/nixpkgs/nixos-23.05"; nixstable.url = "github:nixos/nixpkgs/nixos-23.05"; nixunstable.url = "github:nixos/nixpkgs/nixos-unstable"; nurpkgs.url = "github:nix-community/NUR"; @@ -30,7 +35,9 @@ darwin, flake-utils, hm, + hmunstable, nixneovim, + nixpy311, nixstable, nixunstable, nurpkgs, diff --git a/home/default.nix b/home/default.nix index b73ecbc..0e50814 100644 --- a/home/default.nix +++ b/home/default.nix @@ -9,13 +9,13 @@ let system = "x86_64-linux"; pkgs = (import inputs.nixunstable { inherit system overlays; }); - in inputs.hm.lib.homeManagerConfiguration { + in inputs.hmunstable.lib.homeManagerConfiguration { inherit pkgs; modules = [ ./home.nix ]; extraSpecialArgs = { inherit inputs; gui = false; - gnome = true; + gnome = false; host = "ivr"; username = "gregory.hellings"; }; diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index 35f91f6..7966a59 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ...}: +{ pkgs, lib, inputs, ...}: { imports = [ @@ -8,8 +8,10 @@ home = { packages = with pkgs; [ aacs + bruno direnv home-manager + pipenv ]; file.".pip/pip.conf".text = (lib.strings.concatStringsSep "\n" [ "[global]" diff --git a/home/vim.nix b/home/vim.nix index 4d4c685..7fda838 100644 --- a/home/vim.nix +++ b/home/vim.nix @@ -82,14 +82,8 @@ in plugins = { airline.enable = true; gitgutter.enable = true; - gruvbox.enable = true; fugitive.enable = true; notify.enable = true; - packer = { - enable = true; - plugins = [ - ]; - }; }; extraConfigLua = builtins.readFile ./vim/extra.lua; extraConfigVim = builtins.readFile ./vim/extra.vimrc;