Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

This commit is contained in:
Andreas Zweili 2024-02-29 13:16:17 +01:00
commit 6cce38cbd0
11 changed files with 38 additions and 15 deletions

View File

@ -89,11 +89,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1708091350,
"narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=",
"lastModified": 1708594753,
"narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3",
"rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
"type": "github"
},
"original": {
@ -104,11 +104,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1708161998,
"narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
"lastModified": 1708831307,
"narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "84d981bae8b5e783b3b548de505b22880559515f",
"rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
"type": "github"
},
"original": {
@ -120,11 +120,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1708118438,
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
"lastModified": 1708807242,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"type": "github"
},
"original": {

View File

@ -10,6 +10,7 @@
./misc/username
./profiles/desktop
./profiles/server
./programs/adb
./programs/distrobox
./programs/eog
./programs/libimobiledevice

View File

@ -86,6 +86,8 @@
pkgs.man-pages
pkgs.ncdu
pkgs.nmon
pkgs.pciutils # lspci
pkgs.usbutils # lsusb
pkgs.tree
pkgs.unzip
pkgs.vim

View File

@ -0,0 +1,20 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.az-adb;
in
{
options = {
programs.az-adb.enable = lib.mkEnableOption "Enable and configure ADB";
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.unstable.sidequest ];
programs.adb.enable = true;
users.users."${config.az-username}".extraGroups = [ "adbusers" ];
};
}

View File

@ -100,7 +100,6 @@ in
extraOptions = [
"--add-host=host.docker.internal:host-gateway"
"--cap-add=NET_ADMIN"
"--cap-add=SYS_PTRACE"
"--log-opt=tag='mailserver'"
];
};

View File

@ -53,7 +53,7 @@ in
containers."gitea" = {
# https://blog.gitea.io/
# https://hub.docker.com/r/gitea/gitea/tags
image = "gitea/gitea:1.21.5";
image = "gitea/gitea:1.21.6";
autoStart = true;
environment = {
PUID = "1000";

View File

@ -24,7 +24,7 @@ in
backend = "docker";
containers."grav" = {
# https://fleet.linuxserver.io/image?name=linuxserver/grav
image = "lscr.io/linuxserver/grav:1.7.44@sha256:c017525d2199ba788c4aefc2f38ed31a01cd705e79ba15664eb115c74a022745";
image = "lscr.io/linuxserver/grav:1.7.44@sha256:9258e7b8821ccba99fbb80c879d9b0ffba4db963006ee5715569fda94998f9e6";
autoStart = true;
environment = {
TZ = "Europe/Zurich";

View File

@ -24,7 +24,7 @@ in
backend = "docker";
containers."heimdall" = {
# https://fleet.linuxserver.io/image?name=linuxserver/heimdall
image = "linuxserver/heimdall:2.6.0@sha256:25b3467c792f4d18f66990a2f5a1415a5e46d691fbd1e18d87e1ab66b2cf29e3";
image = "linuxserver/heimdall:2.6.1@sha256:ca23336905e8134a5da0448b1e69cb70aef27df229d3097e5d3be2f35f13d633";
autoStart = true;
environment = {
TZ = "Europe/Zurich";

View File

@ -38,7 +38,7 @@ in
containers."plex" = {
autoStart = true;
# https://fleet.linuxserver.io/image?name=linuxserver/plex
image = "lscr.io/linuxserver/plex:1.40.0@sha256:be46474725ded6d7ed3c327be4eee62d0ab233eeb9bae0230552743dbdf28ce3";
image = "lscr.io/linuxserver/plex:1.40.0@sha256:f7096283eda3449cd0adfae4fc8d74a2355cbbc92e64e47b93fe34b6488848b6";
environment = {
TZ = " Europe/Zurich ";
PUID = "1000";

View File

@ -15,7 +15,7 @@ in
backend = "docker";
containers."rss-bridge" = {
# https://hub.docker.com/r/rssbridge/rss-bridge/tags
image = "rssbridge/rss-bridge@sha256:00dd67a5dd567af61a8a3013ebd7917abf47b61c2d8581542b4aa650617e3f21";
image = "rssbridge/rss-bridge@sha256:5f9543d44391047e566194ce861bbb7762f0350e1d6b0793c518d0903a6cdf03";
autoStart = true;
ports = [ "8082:80" ];
volumes = [

View File

@ -73,6 +73,7 @@
profiles.az-desktop.enable = true;
programs = {
az-adb.enable = true;
az-distrobox.enable = true;
az-lockscreen.enable = true;
az-makemkv.enable = true;