mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2025-12-06 06:36:15 +00:00
Nix: remove quickshell flake input & add overlays & ...
This commit is contained in:
22
flake.lock
generated
22
flake.lock
generated
@@ -16,31 +16,9 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"quickshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760228179,
|
||||
"narHash": "sha256-4Z6k7lv3Zcgk3K+4h60LpqB9wCkR+utkYERU735U068=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "c9d3ffb6043c5bf3f3009202bad7e0e5132c4a25",
|
||||
"revCount": 693,
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
},
|
||||
"original": {
|
||||
"rev": "c9d3ffb6043c5bf3f3009202bad7e0e5132c4a25",
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"quickshell": "quickshell",
|
||||
"systems": "systems"
|
||||
}
|
||||
},
|
||||
|
||||
32
flake.nix
32
flake.nix
@@ -4,18 +4,12 @@
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
systems.url = "github:nix-systems/default";
|
||||
|
||||
quickshell = {
|
||||
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell?rev=c9d3ffb6043c5bf3f3009202bad7e0e5132c4a25";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
systems,
|
||||
quickshell,
|
||||
...
|
||||
}: let
|
||||
eachSystem = nixpkgs.lib.genAttrs (import systems);
|
||||
@@ -24,18 +18,28 @@
|
||||
|
||||
packages = eachSystem (
|
||||
system: let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
pkgs = nixpkgs.legacyPackages.${system}.appendOverlays [self.overlays.default];
|
||||
in {
|
||||
default = pkgs.callPackage ./nix/package.nix {
|
||||
version = self.rev or self.dirtyRev or "dirty";
|
||||
};
|
||||
quickshell = quickshell.packages.${system}.default.override {
|
||||
withX11 = false;
|
||||
};
|
||||
default = pkgs.noctalia-shell;
|
||||
}
|
||||
);
|
||||
|
||||
defaultPackage = eachSystem (system: self.packages.${system}.default);
|
||||
overlays = {
|
||||
default = final: prev: {
|
||||
noctalia-shell = final.callPackage ./nix/package.nix {
|
||||
version = let
|
||||
mkDate = longDate: final.lib.concatStringsSep "-" [
|
||||
(builtins.substring 0 4 longDate)
|
||||
(builtins.substring 4 2 longDate)
|
||||
(builtins.substring 6 2 longDate)
|
||||
];
|
||||
in
|
||||
mkDate (self.lastModifiedDate or "19700101")
|
||||
+ "_"
|
||||
+ (self.shortRev or "dirty");
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
devShells = eachSystem (
|
||||
system: let
|
||||
|
||||
Reference in New Issue
Block a user