Compare commits
No commits in common. "5bc38aa909a3b4eadc8399d418858adeaaac863b" and "0e8bf033362ac6f6a208736572b59f564e00f4e2" have entirely different histories.
5bc38aa909
...
0e8bf03336
3 changed files with 20 additions and 153 deletions
143
flake.lock
143
flake.lock
|
|
@ -1,25 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"devshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728330715,
|
||||
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"disko": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -27,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731895210,
|
||||
"narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=",
|
||||
"lastModified": 1731746438,
|
||||
"narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "639d1520df9417ca2761536c3072688569e83c80",
|
||||
"rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -40,38 +20,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"element-web": {
|
||||
"inputs": {
|
||||
"devshell": [
|
||||
"devshell"
|
||||
],
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"matrix-js-sdk": [
|
||||
"matrix-js-sdk"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731922168,
|
||||
"narHash": "sha256-kDHZXas6YvkNWq5Ab038/MMPfobB6rSuJhJTp7V5K1Y=",
|
||||
"owner": "darkkirb",
|
||||
"repo": "element-web",
|
||||
"rev": "c2e3d1415eb376f7c09d0f48c69779936e2e26d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "darkkirb",
|
||||
"repo": "element-web",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -88,26 +36,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
|
|
@ -170,11 +98,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731887066,
|
||||
"narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=",
|
||||
"lastModified": 1731786860,
|
||||
"narHash": "sha256-130gQ5k8kZlxjBEeLpE+SvWFgSOFgQFeZlqIik7KgtQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
|
||||
"rev": "1bd5616e33c0c54d7a5b37db94160635a9b27aeb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -279,35 +207,6 @@
|
|||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||
}
|
||||
},
|
||||
"matrix-js-sdk": {
|
||||
"inputs": {
|
||||
"devshell": [
|
||||
"devshell"
|
||||
],
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731919198,
|
||||
"narHash": "sha256-WOTtlA2pVCh4GmIN2MQiNa0vOs57LLMIwMGKdWxdt1w=",
|
||||
"owner": "darkkirb",
|
||||
"repo": "matrix-js-sdk",
|
||||
"rev": "ff08c2e49038fbd29472d1fe1d13593ecb416136",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "darkkirb",
|
||||
"repo": "matrix-js-sdk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-vscode-extensions": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
|
|
@ -321,11 +220,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731894894,
|
||||
"narHash": "sha256-HB7VHbDE+05HqreoLp9QG4sntsqV0IHo2yB1bpD1tVw=",
|
||||
"lastModified": 1731808759,
|
||||
"narHash": "sha256-WwJqguc/5Q7HEwHlgDzDT8mtd8ZxInxZM2neJKC1oh8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "0982ffd1c37d8ef1a202d920e33b27b59ff30ca7",
|
||||
"rev": "5cf92678e6799ce45442dee4c9cb8094843c7cfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -374,11 +273,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1731912056,
|
||||
"narHash": "sha256-1icSuV0/AtuA3CSFKs3PE2Q/BOMUgITRjQGcZzan3sI=",
|
||||
"lastModified": 1731816655,
|
||||
"narHash": "sha256-55e1JMAuYvHZs9EICprWgJ4RmaWwDuSjzJ5K7S7zb6w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fbc12b07e2ca85b424d6d7877ac711254d2d160b",
|
||||
"rev": "0a14706530dcb90acecb81ce0da219d88baaae75",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -475,11 +374,8 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
"disko": "disko",
|
||||
"element-web": "element-web",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"gitignore": "gitignore",
|
||||
|
|
@ -487,7 +383,6 @@
|
|||
"impermanence": "impermanence",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"matrix-js-sdk": "matrix-js-sdk",
|
||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||
"nix2container": "nix2container",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
|
|
@ -509,11 +404,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731897198,
|
||||
"narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
|
||||
"lastModified": 1731820690,
|
||||
"narHash": "sha256-/hHFMTD+FGURXZ4JtfXoIgpy87zL505pVi6AL76Wc+U=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
|
||||
"rev": "bbab2ab9e1932133b1996baa1dc00fefe924ca81",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -525,11 +420,11 @@
|
|||
"rycee-nur-expressions": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731902594,
|
||||
"narHash": "sha256-uSkuDGR4nPtA2ObotrF2G2fmHDEHVG7bKVb0ZLr4Cew=",
|
||||
"lastModified": 1731816193,
|
||||
"narHash": "sha256-Y/u1O6GpvOYRbGOnwGo0Gofg5jjfaHNGP9G7yGFFfzg=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "41a1d21207361f9369670da9d01c88fcdbfb25c3",
|
||||
"revCount": 3913,
|
||||
"rev": "02c98c9ba4491db49ab759161fcc0ba9830d7aa0",
|
||||
"revCount": 3910,
|
||||
"type": "git",
|
||||
"url": "https://gitlab.com/rycee/nur-expressions"
|
||||
},
|
||||
|
|
|
|||
29
flake.nix
29
flake.nix
|
|
@ -2,30 +2,14 @@
|
|||
description = "Lotte’s nix configuration";
|
||||
|
||||
inputs = {
|
||||
devshell = {
|
||||
url = "github:numtide/devshell";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
disko = {
|
||||
url = "github:nix-community/disko";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
element-web = {
|
||||
url = "github:darkkirb/element-web";
|
||||
inputs.devshell.follows = "devshell";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
inputs.flake-parts.follows = "flake-parts";
|
||||
inputs.matrix-js-sdk.follows = "matrix-js-sdk";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
flake-compat = {
|
||||
url = "github:edolstra/flake-compat";
|
||||
flake = false;
|
||||
};
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||
};
|
||||
flake-utils = {
|
||||
url = "github:numtide/flake-utils";
|
||||
inputs.systems.follows = "systems";
|
||||
|
|
@ -58,13 +42,6 @@
|
|||
inputs.lix.follows = "lix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
matrix-js-sdk = {
|
||||
url = "github:darkkirb/matrix-js-sdk";
|
||||
inputs.devshell.follows = "devshell";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
inputs.flake-parts.follows = "flake-parts";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-vscode-extensions = {
|
||||
url = "github:nix-community/nix-vscode-extensions";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
|
|
@ -252,11 +229,7 @@
|
|||
// (
|
||||
if name != "riscv64-linux" then
|
||||
{
|
||||
inherit (pkgs)
|
||||
element-desktop
|
||||
element-web
|
||||
kodi-joyn
|
||||
;
|
||||
inherit (pkgs) kodi-joyn;
|
||||
}
|
||||
else
|
||||
{ }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ final: prev: {
|
|||
art-lotte = final.callPackage ./art/lotte { };
|
||||
art-lotte-bgs-nsfw = final.callPackage ./art/lotte/bgs-nsfw.nix { };
|
||||
art-lotte-bgs-sfw = final.callPackage ./art/lotte/bgs-sfw.nix { };
|
||||
inherit (prev.inputs.element-web.packages.${prev.system}) element-web;
|
||||
fish = prev.fish.overrideAttrs {
|
||||
postPatch = ''
|
||||
substituteInPlace src/history.cpp --replace-fail 'vacuum = true' 'vacuum = false'
|
||||
|
|
|
|||
Loading…
Reference in a new issue