tim.mccarthy/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable Xonsh and clean up flake

Browse Source
This commit is contained in:
Tim McCarthy
2022-09-04 10:52:40 -07:00
parent 7309257981
commit 68370421b8
3 changed files with 21 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
nix/flake.lock generated
View File

@@ -1,40 +1,13 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
"utils": [
"utils"
]
},
"locked": {
"lastModified": 1661824092,
@@ -50,35 +23,13 @@
"type": "github"
}
},
"mach-nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
],
"pypi-deps-db": "pypi-deps-db"
},
"locked": {
"lastModified": 1654084003,
"narHash": "sha256-j/XrVVistvM+Ua+0tNFvO5z83isL+LBgmBi9XppxuKA=",
"owner": "DavHau",
"repo": "mach-nix",
"rev": "7e14360bde07dcae32e5e24f366c83272f52923f",
"type": "github"
},
"original": {
"id": "mach-nix",
"ref": "3.5.0",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1661353537,
"narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=",
"lastModified": 1662096612,
"narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0e304ff0d9db453a4b230e9386418fd974d5804a",
"rev": "21de2b973f9fee595a7a1ac4693efff791245c34",
"type": "github"
},
"original": {
@@ -88,47 +39,14 @@
"type": "github"
}
},
"pypi-deps-db": {
"flake": false,
"locked": {
"lastModified": 1661979378,
"narHash": "sha256-j0q9m1b03V6lRF8M3Mr01uJYat45LOZMqC+xdM4u8M8=",
"owner": "DavHau",
"repo": "pypi-deps-db",
"rev": "c1c1684ceb2a2db22d76111922e6e81ff7b3111b",
"type": "github"
},
"original": {
"owner": "DavHau",
"repo": "pypi-deps-db",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"mach-nix": "mach-nix",
"nixpkgs": "nixpkgs",
"utils": "utils_2"
"utils": "utils"
}
},
"utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",

19
nix/flake.nix
View File

@@ -5,16 +5,23 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.utils.follows = "utils";
mach-nix.url = "mach-nix/3.5.0";
mach-nix.inputs.nixpkgs.follows = "nixpkgs";
# mach-nix.url = "mach-nix/3.5.0";
# mach-nix.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = {self, nixpkgs, flake-utils, home-manager, mach-nix, ...}: let
outputs = {
self,
nixpkgs,
utils,
home-manager,
# mach-nix,
...}: let
pkgsForSystem = (system: import nixpkgs {
inherit system;
overlays = [
self.overlays."${system}".xonsh_with_plugins
# self.overlays."${system}".xonsh_with_plugins
];
config.allowUnfree = true;
});
@@ -34,8 +41,8 @@
];
});
in
flake-utils.lib.eachDefaultSystem (system: {
overlays.xonsh_with_plugins = import ./overlays/xonsh.nix { mach-nix = mach-nix.lib."${system}"; };
utils.lib.eachDefaultSystem (system: {
# overlays.xonsh_with_plugins = import ./overlays/xonsh.nix { mach-nix = mach-nix.lib."${system}"; };
legacyPackages.homeConfigurations.std = mkHomeConfig { inherit system; };
});
}

2
nix/home.nix
View File

@@ -11,7 +11,7 @@
targets.genericLinux.enable = pkgs.stdenv.isLinux;
home.packages = with pkgs; [
xonsh_with_plugins
# xonsh_with_plugins
# Better cat
bat
# Better find