From 8734707ab673a93ac8b4942cc5f397fa8d9890ba Mon Sep 17 00:00:00 2001 From: Pegasust Date: Sun, 15 Jan 2023 00:45:51 -0800 Subject: [PATCH] hungtran: another darwin that's more open to hardware mods --- flake.lock | 12 +++--- nix-conf/home-manager/flake.lock | 66 ++++++++++++++++++++------------ nix-conf/home-manager/flake.nix | 24 +++++++++++- 3 files changed, 71 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 2a3ea53..277ba5c 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1673343300, - "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=", + "lastModified": 1673737886, + "narHash": "sha256-hNTqD0uIgpbtTI2Nuj/Q1lEFOOdZqqXpxoc8rMno2F0=", "owner": "nix-community", "repo": "home-manager", - "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e", + "rev": "2827b5306462d91edec16a3d069b2d6e54c3079f", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1673631141, + "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "befc83905c965adfd33e5cae49acb0351f6e0404", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index 5a63f17..9f1aa9f 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -3,17 +3,14 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" + "lastModified": 1, + "narHash": "sha256-d6CilJXP+UPv3nF00zBBRhMgRklTCjSCMrjbYtYDuOI=", + "path": "../../out-of-tree/flake-compat", + "type": "path" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "path": "../../out-of-tree/flake-compat", + "type": "path" } }, "flake-compat_2": { @@ -100,11 +97,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1673343300, - "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=", + "lastModified": 1673737886, + "narHash": "sha256-hNTqD0uIgpbtTI2Nuj/Q1lEFOOdZqqXpxoc8rMno2F0=", "owner": "nix-community", "repo": "home-manager", - "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e", + "rev": "2827b5306462d91edec16a3d069b2d6e54c3079f", "type": "github" }, "original": { @@ -139,11 +136,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1673504032, - "narHash": "sha256-x4nv7g8+bQXg5PfkFw3vCcr3pYI0Hco0VoSbAy60xek=", + "lastModified": 1673683108, + "narHash": "sha256-zg1W14wyrOCKiTkXU+nGHf/EfqX6wtcUWcMo4O/Q6nY=", "owner": "neovim", "repo": "neovim", - "rev": "143d3f1f3224bca02bfef7df0932b9d7524a3ff2", + "rev": "e89c39d6f016a4140293755250e968e839009617", "type": "github" }, "original": { @@ -160,11 +157,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1673511313, - "narHash": "sha256-QGUT3w1bHclVRqX958EPOd3OxR/R10MoV97N5jx/qbw=", + "lastModified": 1673684013, + "narHash": "sha256-ljfG17g9K5sl7DGounCwOIfQLOGzXF0ffuDGxo3UN1E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5af6fe31f9906e70a1e8985dbbdcc4ae66c7f82d", + "rev": "85b0900729bffa5e0d1817bbc6f024916dc1f38e", "type": "github" }, "original": { @@ -173,6 +170,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673365945, + "narHash": "sha256-/duo8kCEbo62D5gn46m//jfvRtT56KS5dy+j6+Rl+4Y=", + "owner": "mic92", + "repo": "nix-index-database", + "rev": "0e51ff44d6bef0b6b2bbf9e34fdc029fc24820fc", + "type": "github" + }, + "original": { + "owner": "mic92", + "repo": "nix-index-database", + "type": "github" + } + }, "nixgl": { "inputs": { "flake-utils": "flake-utils_3", @@ -222,11 +239,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1673450908, - "narHash": "sha256-b8em+kwrNtnB7gR8SyVf6WuTyQ+6tHS6dzt9D9wgKF0=", + "lastModified": 1673631141, + "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e", + "rev": "befc83905c965adfd33e5cae49acb0351f6e0404", "type": "github" }, "original": { @@ -259,6 +276,7 @@ "home-manager": "home-manager", "kpcli-py": "kpcli-py", "neovim-nightly-overlay": "neovim-nightly-overlay", + "nix-index-database": "nix-index-database", "nixgl": "nixgl", "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" @@ -270,11 +288,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1673576998, - "narHash": "sha256-I6vYVejEWTao+Ze/F6VFSTFxu6/X2OPT3Eu4AM/zzec=", + "lastModified": 1673662873, + "narHash": "sha256-/YOtiDKPUXKKpIhsAds11llfC42ScGW27bbHnNZebco=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca474ccdd5f81ed742328e15dae38bb57a1006e3", + "rev": "90163bbbadce526f8b248a5fe545b06c59597108", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 50b196f..e461ad6 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -11,7 +11,7 @@ rust-overlay.url = "github:oxalica/rust-overlay"; # Allows default.nix to call onto flake.nix. Useful for nix eval and automations flake-compat = { - url = "github:edolstra/flake-compat"; + url = "path:../../out-of-tree/flake-compat"; flake = false; }; kpcli-py = { @@ -127,6 +127,28 @@ }; }; }; + "hungtran" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = base.modules ++ [ + ./home.nix + { + base.graphics.enable = false; + # don't want to deal with GL stuffs on mac yet :/ + base.graphics.useNixGL.defaultPackage = null; + # NOTE: this actually does not exist + base.keepass.path = "/Users/htran/keepass.kdbx"; + base.alacritty.font.size = 11.0; + } + nerd_font_module + ]; + extraSpecialArgs = mkModuleArgs { + inherit pkgs; + myHome = { + username = "hungtran"; + homeDirectory = "/Users/hungtran"; + }; + }; + }; "htran" = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = base.modules ++ [