From dfcd478c0f129eb404546d7cf501f85fd3319523 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Mon, 27 May 2024 23:53:52 -0500 Subject: [PATCH] refactor(nix/hm): remove `sam` from hm configs --- flake.lock | 54 ++-------------------------------------------- flake.nix | 3 --- users/sam/home.nix | 35 ------------------------------ 3 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 users/sam/home.nix diff --git a/flake.lock b/flake.lock index 3694f8ab..3aefeb9b 100644 --- a/flake.lock +++ b/flake.lock @@ -308,21 +308,6 @@ } }, "flake-utils_5": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "inputs": { "systems": "systems_6" }, @@ -487,25 +472,6 @@ "type": "github" } }, - "nixgl": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", - "owner": "guibou", - "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", - "type": "github" - }, - "original": { - "owner": "guibou", - "repo": "nixGL", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1702272962, @@ -555,21 +521,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1660551188, - "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1716509168, "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", @@ -628,8 +579,7 @@ "home-manager": "home-manager_2", "impermanence": "impermanence", "nix": "nix", - "nixgl": "nixgl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "waybar": "waybar", "wezterm": "wezterm" } @@ -815,7 +765,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", diff --git a/flake.nix b/flake.nix index 1a068b41..a9f2d9c4 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,6 @@ url = "github:wez/wezterm?dir=nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixgl.url = "github:guibou/nixGL"; agenix = { url = "github:yaxitech/ragenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -82,7 +81,6 @@ ({ imports = [ inputs.agenix.homeManagerModules.default ]; nixpkgs.overlays = [ - inputs.nixgl.overlay self.overlays.modifications self.overlays.additions ]; @@ -101,7 +99,6 @@ packages = forAllSystems (pkgs: import ./pkgs pkgs); homeConfigurations = builtins.mapAttrs (mkHomeCfg) { "price" = ./users/price/home.nix; - "sam" = ./users/sam/home.nix; }; overlays = import ./overlays { inherit inputs; }; devShells = forAllSystems (pkgs: { diff --git a/users/sam/home.nix b/users/sam/home.nix deleted file mode 100644 index 6f1aa483..00000000 --- a/users/sam/home.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -let - nixGLWrap = - pkg: - pkgs.runCommand "${pkg.name}-nixgl-wrapper" { } '' - mkdir $out - ln -s ${pkg}/* $out - rm $out/bin - mkdir $out/bin - for bin in ${pkg}/bin/*; do - wrapped_bin=$out/bin/$(basename $bin) - echo "exec ${lib.getExe pkgs.nixgl.nixGLIntel} $bin \$@" > $wrapped_bin - chmod +x $wrapped_bin - done - ''; -in -{ - imports = [ ../price/home.nix ]; - xdg.systemDirs.data = [ - "${config.home.homeDirectory}/.nix-profile/share" - "/usr/share" - "/usr/local/share" - ]; - home = { - packages = with pkgs; [ - (lib.hiPrio (nixGLWrap neovide)) - (lib.hiPrio (nixGLWrap wezterm)) - ]; - }; -}