Shell works, also different thing, but cannot rebuild.
This commit is contained in:
Generated
+6
-6
@@ -75,11 +75,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762267440,
|
"lastModified": 1762847253,
|
||||||
"narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=",
|
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15",
|
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -107,11 +107,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762111121,
|
"lastModified": 1763283776,
|
||||||
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
|
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
|
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -62,6 +62,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
#TODO this is probably unsupported
|
#TODO this is probably unsupported
|
||||||
shells = forAllSystems (system: ((import ./shells) {pkgs = nixpkgs.legacyPackages.${system} // outputs.packages.${system} // outputs.azos-packages.${system};}));
|
#TODO the devshells do not know of the new packages.
|
||||||
|
devShells = forAllSystems (system: ((import ./shells) {pkgs = nixpkgs.legacyPackages.${system}; }));
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,5 +13,6 @@
|
|||||||
./discord.nix
|
./discord.nix
|
||||||
./spotify.nix
|
./spotify.nix
|
||||||
./headphones-whmx4000.nix
|
./headphones-whmx4000.nix
|
||||||
|
./deluge.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Executable
+21
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
isEnabled =
|
||||||
|
config.azos.deluged.enable;
|
||||||
|
in {
|
||||||
|
options.azos.deluged.enable = lib.mkOption {
|
||||||
|
default = true;
|
||||||
|
example = true;
|
||||||
|
type = lib.types.bool;
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf isEnabled {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
deluged
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
outputs.overlays.addpkgs
|
outputs.overlays.addpkgs
|
||||||
inputs.azos-core.overlays.qutebrowserdrm
|
inputs.azos-core.overlays.qutebrowserdrm
|
||||||
outputs.overlays.modifications
|
outputs.overlays.modifications
|
||||||
outputs.overlays.unstable-packages
|
# outputs.overlays.unstable-packages
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
@@ -111,5 +111,5 @@
|
|||||||
systemd.targets.hibernate.enable = false;
|
systemd.targets.hibernate.enable = false;
|
||||||
systemd.targets.hybrid-sleep.enable = false;
|
systemd.targets.hybrid-sleep.enable = false;
|
||||||
|
|
||||||
system.stateVersion = "24.11"; # Did you read the comment?
|
system.stateVersion = "25.05"; # Did you read the comment?
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
boot.kernelModules = ["kvm-intel"];
|
boot.kernelModules = ["kvm-intel"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" ={
|
||||||
device = "/dev/disk/by-uuid/d28f6c1d-f7ec-44a1-a59b-a598c7f136f7";
|
device = "/dev/disk/by-uuid/d28f6c1d-f7ec-44a1-a59b-a598c7f136f7";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = ["subvol=@"];
|
options = ["subvol=@"];
|
||||||
|
|||||||
+3
-1
@@ -1,3 +1,5 @@
|
|||||||
{pkgs} @ args: {
|
{pkgs} @ args: {
|
||||||
debugTex = import ./debugTex args;
|
#TODO since I do not pass along packages, this cannot work
|
||||||
|
# debugTex = import ./debugTex args;
|
||||||
|
default = import ./defaultShell.nix args;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{pkgs} @ args:
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
( pkgs.writeShellScriptBin
|
||||||
|
"azos-lauretta-update"
|
||||||
|
"sudo nixos-rebuild switch --flake '.?submodules=1#lauretta'" )
|
||||||
|
( pkgs.writeShellScriptBin
|
||||||
|
"azos-update-azos-core"
|
||||||
|
"nix flake lock --update-input azos-core" )
|
||||||
|
|
||||||
|
( pkgs.writeShellScriptBin
|
||||||
|
"azos-update"
|
||||||
|
"nix flake update" )
|
||||||
|
];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user