Compare commits

..

1 Commits

Author SHA1 Message Date
Renovate Bot
e0e1d0d3df Lock file maintenance 2024-01-18 10:29:05 +00:00
13 changed files with 34 additions and 54 deletions

18
flake.lock generated
View File

@ -59,11 +59,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705660020, "lastModified": 1705535278,
"narHash": "sha256-1tOuNh+UbiZlaC8RrpQzzypgnLBC67eRlBunfkE4sbQ=", "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2064348e555b6aa963da6372a8f14e6acb80a176", "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705496572, "lastModified": 1705316053,
"narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1705674901, "lastModified": 1705571074,
"narHash": "sha256-sXJAurZAOfIZgs5x+CuBCopWKLRn5XY+jAeYqzNpHCM=", "narHash": "sha256-yPV1K5DP7GQZbXL8sGn7RNGJOBEwkAKyhEz5ReP5bJo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "750734b35cbc48450a8bfa04586fbe3610e2f2c3", "rev": "516c74d45d21debcb58ee3da0570d80d68278ab4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,7 +1,12 @@
{ lib, config, pkgs, ... }: { { lib, config, pkgs, ... }: {
imports = [ ./vscodium ]; imports = [ ./vscodium ];
config = lib.mkIf (config.homecfg.make.develop) { config = lib.mkIf (config.homecfg.make.develop) {
home.packages = with pkgs; [ blender godot_4 ];
home.packages = with pkgs; [
blender
godot_4
];
}; };
} }

View File

@ -24,10 +24,6 @@ with lib; {
type = types.bool; type = types.bool;
default = false; default = false;
}; };
develop = mkOption {
type = types.bool;
default = false;
};
}; };
net = { net = {
wlp = { wlp = {

View File

@ -1,9 +1,7 @@
{ ... }: { { ... }: {
systemd.services.systemd-udevd.restartIfChanged = false; systemd.services.systemd-udevd.restartIfChanged = false;
services.udev = { services.udev.extraRules = ''
packages = [ ];
extraRules = ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess"
@ -12,5 +10,4 @@
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess"
''; '';
};
} }

View File

@ -1,11 +1,9 @@
{ lib, config, pkgs, ... }: { lib, config, ... }:
let cfg = config.hostcfg.make.virt; let cfg = config.hostcfg.make.virt;
in { in {
config = lib.mkIf cfg { config = lib.mkIf cfg {
environment.systemPackages = [ pkgs.qemu ];
virtualisation = { virtualisation = {
libvirtd.enable = true; # libvirtd.enable = true;
# waydroid.enable = true; # waydroid.enable = true;
# lxd.enable = true; # lxd.enable = true;
docker = { docker = {

View File

@ -2,7 +2,6 @@
nixpkgs.config = { nixpkgs.config = {
permittedInsecurePackages = [ ]; permittedInsecurePackages = [ ];
allowUnfree = true; allowUnfree = true;
android_sdk.accept_license = true;
packageOverrides = pkgs: rec { packageOverrides = pkgs: rec {
custom = import ../../../../packages { inherit pkgs; }; custom = import ../../../../packages { inherit pkgs; };
}; };

View File

@ -1,6 +1,6 @@
{ pkgs, config, ... }: { { pkgs, ... }: {
programs.adb.enable = true; programs.adb.enable = true;
programs.wireshark.enable = true; programs.wireshark.enable = true;
environment.systemPackages = with pkgs; [ wget dconf wireshark ]; environment.systemPackages = with pkgs; [ wget dconf ];
} }

View File

@ -1 +1 @@
{ ... }: { imports = [ ./debug ./develop ]; } { ... }: { imports = [ ./debug ./devel ]; }

View File

@ -0,0 +1,4 @@
{ ... }:
{
}

View File

@ -1,15 +0,0 @@
{ lib, config, pkgs, ... }:
let
android_env = pkgs.androidenv.composeAndroidPackages {
platformVersions = [ "34" ];
abiVersions = [ "x86" "x86_64" ];
includeEmulator = false;
};
in {
config = lib.mkIf (config.hostcfg.make.develop) {
environment.systemPackages = with pkgs; [
android-tools
androidStudioPackages.canary
];
};
}

View File

@ -10,8 +10,6 @@
"wheel" "wheel"
"vboxsf" "vboxsf"
"adbusers" "adbusers"
"libvirtd"
"kvm"
"lp" "lp"
"audio" "audio"
"video" "video"

View File

@ -14,7 +14,6 @@
virt = true; virt = true;
power = false; power = false;
game = true; game = true;
develop = true;
}; };
net = { net = {
wlp = { wlp = {

View File

@ -14,7 +14,6 @@
virt = true; virt = true;
power = true; power = true;
game = true; game = true;
develop = true;
}; };
net = { net = {
wlp = { wlp = {