Compare commits

..

No commits in common. "585dceef77cfe7c7c20bd24f17d7a6984d3bc10d" and "ddade0edd05d6bf0860a6685523bcba24a32e59d" have entirely different histories.

3 changed files with 79 additions and 40 deletions

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723942355, "lastModified": 1723229233,
"narHash": "sha256-eUr4aNumc9OZd4Ur2mN3loL4PlC1MK/hST/FEal1hRo=", "narHash": "sha256-jBUgKpZT7vO6cBFs+tK8Ozy67zKBkSh3R7ZsK6XBykQ=",
"ref": "refs/heads/canon", "ref": "refs/heads/canon",
"rev": "e33ec241432f1605cacd1e078c41a41bf99295be", "rev": "38f2f51d684b207344b9065ab6fde4a167179536",
"revCount": 63, "revCount": 61,
"type": "git", "type": "git",
"url": "https://git.mildlyfunctional.gay/artemist/packages.git" "url": "https://git.mildlyfunctional.gay/artemist/packages.git"
}, },
@ -60,11 +60,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724299755, "lastModified": 1723859949,
"narHash": "sha256-P5zMA17kD9tqiqMuNXwupkM7buM3gMNtoZ1VuJTRDE4=", "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a8968d88e5a537b0491f68ce910749cd870bdbef", "rev": "076b9a905af8a52b866c8db068d6da475839d97b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724227338, "lastModified": 1723202784,
"narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=", "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d", "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,11 +303,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723986931, "lastModified": 1723399884,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724304322, "lastModified": 1723743257,
"narHash": "sha256-/nrlMDubg9oG2VNANRBxsas5RbcJtB6IIDPZC3yHLW8=", "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=",
"owner": "jovian-experiments", "owner": "jovian-experiments",
"repo": "jovian-nixos", "repo": "jovian-nixos",
"rev": "924a18ea8df89a39166dd202f3e73cd022825768", "rev": "e4e0ca14918919300e04e80c34036028b4370640",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +369,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724311200, "lastModified": 1723818243,
"narHash": "sha256-z5RuyNFPrVZkbSlEbMhFgfR+5AAG/3WCMjJTktaGsR0=", "narHash": "sha256-X3Tm82sqTIRW8r/2452l/Tc00vJ4XJvsZcsoL+lgrOk=",
"rev": "f2e7f8bab875809e8b489e1e5a7aa8572bb4bc13", "rev": "41a0b08e646b54b27ae49fb4c23e0c45c60369ca",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f2e7f8bab875809e8b489e1e5a7aa8572bb4bc13.tar.gz?rev=f2e7f8bab875809e8b489e1e5a7aa8572bb4bc13" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/41a0b08e646b54b27ae49fb4c23e0c45c60369ca.tar.gz?rev=41a0b08e646b54b27ae49fb4c23e0c45c60369ca"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -412,11 +412,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723950649, "lastModified": 1723352546,
"narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "392828aafbed62a6ea6ccab13728df2e67481805", "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,11 +427,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1724067415, "lastModified": 1723310128,
"narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,11 +442,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1724306539, "lastModified": 1723808726,
"narHash": "sha256-9jF5qr44cnvWoXhE0cr114GHT5Adav3q/DKJ6n9tor8=", "narHash": "sha256-dEpDgYhKVy3r3NN57YN0xQUqC0Fmquhz+WJgmE4tmmA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c31eb9b990446880000e3297f69f4fdee5b69d7", "rev": "b764d780d8af360061540651c3adf84895b5ff90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -491,11 +491,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1724340365, "lastModified": 1723816538,
"narHash": "sha256-SFJuLI6FpuLHI0PdZAIOAJoeR6Z+cRkbTUQ5TuqJw5s=", "narHash": "sha256-h37ltjdifkd7iLtMtBXSBBeYSTuBEKMW6ClFoC7nReQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "1854d591cb0e5be6ad97f5091766cdf28e948265", "rev": "00f32f0430f82c74919c72af84bc95bf5ae434e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +513,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723969429, "lastModified": 1723367906,
"narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=", "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0", "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -678,11 +678,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723808491, "lastModified": 1723454642,
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "rev": "349de7bc435bdff37785c2466f054ed1766173be",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -10,6 +10,7 @@
inputs.lix-module.nixosModules.default inputs.lix-module.nixosModules.default
inputs.private.nixosModules.base inputs.private.nixosModules.base
inputs.private.nixosModules.substituter inputs.private.nixosModules.substituter
./xonsh.nix
]; ];
nix = { nix = {
@ -50,8 +51,6 @@
"uhk-udev-rules" "uhk-udev-rules"
"unrar" "unrar"
]); ]);
# oh god, i guess i only use matrix for public stuff though
config.permittedInsecurePackages = [ "olm-3.2.16" ];
}; };
console = { console = {

40
sets/xonsh.nix Normal file
View file

@ -0,0 +1,40 @@
{ pkgs, ... }:
let
xonsh-direnv =
ps:
ps.buildPythonPackage rec {
pname = "xonsh-direnv";
version = "1.6.1";
src = pkgs.fetchPypi {
inherit pname version;
hash = "sha256-Nt8Da1EtMVWZ9mbBDjys7HDutLYifwoQ1HVmI5CN2Ww=";
};
};
xontrib-fish-completer =
ps:
ps.buildPythonPackage rec {
pname = "xontrib-fish-completer";
version = "0.0.1";
src = pkgs.fetchPypi {
inherit pname version;
hash = "sha256-Kr1iolx6DxqgxVNtXwwfggkLrbH9BlilGAYZahvR+3Y=";
};
patchPhase = "sed -i -e 's/^dependencies.*$/dependencies = []/' pyproject.toml";
};
in
{
programs.xonsh = {
enable = true;
config = ''
$UPDATE_OS_ENVIRON = True
xontrib load direnv fish_completer
'';
package = pkgs.xonsh.wrapper.override {
extraPackages = ps: [
(xonsh-direnv ps)
(xontrib-fish-completer ps)
];
};
};
}