Compare commits
3 Commits
d9ba2b35e0
...
78c54171b3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78c54171b3
|
||
|
|
1a05ffd770
|
||
|
|
349dad753c
|
@@ -51,6 +51,7 @@ in
|
|||||||
./roles/graphviz
|
./roles/graphviz
|
||||||
./roles/hydra
|
./roles/hydra
|
||||||
./roles/image_based_appliance
|
./roles/image_based_appliance
|
||||||
|
./roles/instawow
|
||||||
./roles/iso
|
./roles/iso
|
||||||
./roles/iso_mount
|
./roles/iso_mount
|
||||||
./roles/jujutsu
|
./roles/jujutsu
|
||||||
@@ -281,6 +282,53 @@ in
|
|||||||
(disableOptimizationsPython3 "zopfli") # /nix/store/idjhlmljrapzm3i1svl5x9mdwfxxj51v-pytest-check-hook/nix-support/setup-hook: line 23: 280 Segmentation fault (core dumped) /nix/store/87l6i0czch42nzv39ydwld5hnhcq0b65-python3-3.14.7/bin/python3.14 "${flagsArray[@]}"
|
(disableOptimizationsPython3 "zopfli") # /nix/store/idjhlmljrapzm3i1svl5x9mdwfxxj51v-pytest-check-hook/nix-support/setup-hook: line 23: 280 Segmentation fault (core dumped) /nix/store/87l6i0czch42nzv39ydwld5hnhcq0b65-python3-3.14.7/bin/python3.14 "${flagsArray[@]}"
|
||||||
(disableOptimizations "zopfli")
|
(disableOptimizations "zopfli")
|
||||||
(disableOptimizations "nototools") # Needs to use the same version of python as the zopfli package
|
(disableOptimizations "nototools") # Needs to use the same version of python as the zopfli package
|
||||||
|
(final: prev: {
|
||||||
|
instawow = prev.instawow.overrideAttrs (
|
||||||
|
finalAttrs: prevAttrs:
|
||||||
|
let
|
||||||
|
version = "7.2.1";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit version;
|
||||||
|
|
||||||
|
src = final.fetchFromGitHub {
|
||||||
|
owner = "layday";
|
||||||
|
repo = "instawow";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-5y+oJfzWwaUc3p4fzsQ4j8a6YJEsI+3Qy3gK6VPkjA4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = prevAttrs.propagatedBuildInputs ++ [ final.python3.pkgs.versioningit ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# Upstream uses versioningit to set the version
|
||||||
|
sed -i '/^name =.*/a version = "${version}"' pyproject.toml
|
||||||
|
sed -i "/dynamic =/,+2d" pyproject.toml
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
);
|
||||||
|
})
|
||||||
|
(final: prev: {
|
||||||
|
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||||
|
(python-final: python-prev: {
|
||||||
|
aiohttp-client-cache = python-prev.aiohttp-client-cache.overridePythonAttrs (
|
||||||
|
oldAttrs:
|
||||||
|
let
|
||||||
|
version = "0.15.0";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit version;
|
||||||
|
|
||||||
|
src = final.fetchPypi {
|
||||||
|
pname = "aiohttp_client_cache";
|
||||||
|
inherit version;
|
||||||
|
hash = "sha256-Jk+n1pvNsuT+mZTn9Bq17sfLuipfXiYNRE0AL5Ym43Q=";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
})
|
||||||
|
];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
# This option defines the first version of NixOS you have installed on this particular machine,
|
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||||
|
|||||||
@@ -107,6 +107,7 @@
|
|||||||
me.graphical = true;
|
me.graphical = true;
|
||||||
me.graphics_card_type = "amd";
|
me.graphics_card_type = "amd";
|
||||||
me.graphviz.enable = true;
|
me.graphviz.enable = true;
|
||||||
|
me.instawow.enable = true;
|
||||||
me.iso_mount.enable = true;
|
me.iso_mount.enable = true;
|
||||||
me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
|
me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
|
||||||
me.jujutsu.enable = true;
|
me.jujutsu.enable = true;
|
||||||
|
|||||||
@@ -100,6 +100,7 @@
|
|||||||
me.graphical = true;
|
me.graphical = true;
|
||||||
me.graphics_card_type = "amd";
|
me.graphics_card_type = "amd";
|
||||||
me.graphviz.enable = true;
|
me.graphviz.enable = true;
|
||||||
|
me.instawow.enable = true;
|
||||||
me.iso_mount.enable = true;
|
me.iso_mount.enable = true;
|
||||||
me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
|
me.jujutsu.config = ../../roles/jujutsu/files/jujutsu_config_home.toml;
|
||||||
me.jujutsu.enable = true;
|
me.jujutsu.enable = true;
|
||||||
|
|||||||
53
nix/configuration/roles/instawow/default.nix
Normal file
53
nix/configuration/roles/instawow/default.nix
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [ ];
|
||||||
|
|
||||||
|
options.me = {
|
||||||
|
instawow.enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
example = true;
|
||||||
|
description = "Whether we want to install instawow.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.me.instawow.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
instawow
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
|
||||||
|
hideMounts = true;
|
||||||
|
users.talexander = {
|
||||||
|
directories = [
|
||||||
|
{
|
||||||
|
directory = ".config/instawow";
|
||||||
|
user = "talexander";
|
||||||
|
group = "talexander";
|
||||||
|
mode = "0755";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.persistence."/state" = lib.mkIf (config.me.mountPersistence) {
|
||||||
|
hideMounts = true;
|
||||||
|
users.talexander = {
|
||||||
|
directories = [
|
||||||
|
{
|
||||||
|
directory = ".cache/instawow";
|
||||||
|
user = "talexander";
|
||||||
|
group = "talexander";
|
||||||
|
mode = "0755";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user