Compare commits
13 Commits
bdbaba1ffa
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
234dfcf3ca
|
|||
|
9e0b78cc3d
|
|||
|
9246c8bf0f
|
|||
|
6a2f51a874
|
|||
|
b93a73f24d
|
|||
|
009bec8774
|
|||
|
36ff8d03db
|
|||
|
db5b3adc43
|
|||
|
846a14e2f7
|
|||
|
355ef79d9f
|
|||
|
76ab42af49
|
|||
|
f1d05a0203
|
|||
|
6f9360cb76
|
92
flake.lock
generated
92
flake.lock
generated
@@ -213,11 +213,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762276996,
|
||||
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
|
||||
"lastModified": 1763651264,
|
||||
"narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
|
||||
"rev": "e86a89079587497174ccab6d0d142a65811a4fd9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -332,11 +332,11 @@
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762980239,
|
||||
"narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -353,11 +353,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762440070,
|
||||
"narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -605,11 +605,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763071594,
|
||||
"narHash": "sha256-s5FF0rQE6UIBAUfqk5ZqGedU3bhW0OvXfmz5lzJGurY=",
|
||||
"lastModified": 1763912895,
|
||||
"narHash": "sha256-tTdCVeROhYTwV510tygS5AMutJGz5imM++P4+cXAy2w=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "43527d363472b52f17dd9f9f4f87ec25cbf8a399",
|
||||
"rev": "2b0fd417d32278159d0ca1d23fb997588c37995b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -681,11 +681,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762989208,
|
||||
"narHash": "sha256-NBTbKW0MVIMFCjAqeoJWkg5iUucAZ9jS4Lbyax6rIBE=",
|
||||
"lastModified": 1763856454,
|
||||
"narHash": "sha256-jlP442tr1Q7BynLKEb+L5lyGViJF5qUioymBCccV7/Y=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-plugins",
|
||||
"rev": "befb2670803cf7c1b9f0323449c8d9ccdaa485e2",
|
||||
"rev": "7ffc0b314e638ca4f8ce9cb1305951a47d107ade",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -735,11 +735,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758927902,
|
||||
"narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
|
||||
"lastModified": 1763254292,
|
||||
"narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
|
||||
"rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -812,11 +812,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762387740,
|
||||
"narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
|
||||
"lastModified": 1763323331,
|
||||
"narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
|
||||
"rev": "0c6411851cc779d551edc89b83966696201611aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -960,11 +960,11 @@
|
||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755110674,
|
||||
"narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=",
|
||||
"lastModified": 1763302796,
|
||||
"narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "f5936247dbdb8501221978562ab0b302dd75456c",
|
||||
"rev": "5b38fb599f50e9d78325d1d2706e36303c166047",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -976,11 +976,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1762363567,
|
||||
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
|
||||
"lastModified": 1763283776,
|
||||
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
|
||||
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1023,11 +1023,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"lastModified": 1763835633,
|
||||
"narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1038,11 +1038,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1763049705,
|
||||
"narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
|
||||
"lastModified": 1763622513,
|
||||
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
|
||||
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1061,11 +1061,11 @@
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762722066,
|
||||
"narHash": "sha256-Kph9HBaDqN0dOvsb8fnhoyj4mpxF6RfoqzVqXxvpzVY=",
|
||||
"lastModified": 1763823006,
|
||||
"narHash": "sha256-OuxzqKSmzs35aRPsmdmvTwRhUZqp7uLyUIYDRDUuogs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "b36fcf1d64e782488fc6296eaa4f26d6cae4e090",
|
||||
"rev": "370eb3d69252fa07b81d8c9979cb1a537b74ebb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1108,11 +1108,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762441963,
|
||||
"narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
|
||||
"lastModified": 1763319842,
|
||||
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
|
||||
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1130,11 +1130,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763032142,
|
||||
"narHash": "sha256-M+2QBQoC0lzkCdUQRXylR2RkcT6BCRfW3KDs+c/IGLw=",
|
||||
"lastModified": 1763984553,
|
||||
"narHash": "sha256-zkbEsU9YFhz7FVzEpIETMpvzB/oKHGEFP21otHe5y5c=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "84255025dee4c8701a99fbff65ac3c9095952f99",
|
||||
"rev": "54a9ece994e2ad689085849d507a78e888456613",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1173,11 +1173,11 @@
|
||||
"secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1756051653,
|
||||
"narHash": "sha256-JJkQliqI7zn+esLnKQP82eQEuolNz8IELm/BYGPTvEw=",
|
||||
"lastModified": 1763213908,
|
||||
"narHash": "sha256-VnsvhCOO2h1HRLG+wbmYlKrAQL5HnmvkE+aHcZ8YS/M=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "01cf200f61946ac9f259f9163933ea1749cb3531",
|
||||
"revCount": 41,
|
||||
"rev": "2a17f8af388cd87d12d6340c3601d35ca330956f",
|
||||
"revCount": 42,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
|
||||
},
|
||||
|
||||
34
hosts/odyssey/comfyui-docker.nix
Normal file
34
hosts/odyssey/comfyui-docker.nix
Normal file
@@ -0,0 +1,34 @@
|
||||
{
|
||||
hardware.graphics.enable32Bit = true;
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
virtualisation.oci-containers = {
|
||||
backend = "docker";
|
||||
containers = {
|
||||
comfyui = {
|
||||
image = "ghcr.io/clsferguson/comfyui-docker:latest";
|
||||
autoStart = true;
|
||||
ports = [ "8188:8188" ];
|
||||
extraOptions = [
|
||||
"--device=nvidia.com/gpu=all"
|
||||
"--ipc=host"
|
||||
];
|
||||
volumes = [
|
||||
"/home/jordan/ComfyUI/user:/app/ComfyUI/user"
|
||||
"/home/jordan/ComfyUI/custom_nodes:/app/ComfyUI/custom_nodes"
|
||||
"/home/jordan/ComfyUI/models:/app/ComfyUI/models:rw"
|
||||
"/home/jordan/ComfyUI/input:/app/ComfyUI/input:rw"
|
||||
"/home/jordan/ComfyUI/output:/app/ComfyUI/output:rw"
|
||||
];
|
||||
environment = {
|
||||
TZ = "Europe/London";
|
||||
PUID = "1000";
|
||||
PGID = "1000";
|
||||
COMFY_AUTO_INSTALL = "1";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -7,7 +7,9 @@
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./comfyui-docker.nix
|
||||
./gitea-runner.nix
|
||||
./home-assistant
|
||||
./nix-serve.nix
|
||||
../desktop.nix
|
||||
../../users/jordan
|
||||
|
||||
63
hosts/odyssey/home-assistant/dashboards.nix
Normal file
63
hosts/odyssey/home-assistant/dashboards.nix
Normal file
@@ -0,0 +1,63 @@
|
||||
{
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
/**
|
||||
*******************
|
||||
- Service Dashboard for stats (energy usage, bandwidth etc.)
|
||||
- Dashboard fragment per room
|
||||
- Tablet in each room can display just its associated fragment
|
||||
- Per user dynamic dashboard that shows the dashboard fragment for the room
|
||||
you are in using Bluetooth presence detection
|
||||
|
||||
Rooms: [Auto, Bedroom, Kitchen, Living Room, Office]
|
||||
|
||||
Shared: Date/time, Guest Override action, Weather, Air quality
|
||||
|
||||
Bedroom:
|
||||
- Temperature
|
||||
- Minimal Lights action
|
||||
- Individual light cards
|
||||
- Sheets last changed
|
||||
- Plant last watered
|
||||
|
||||
Kitchen:
|
||||
- Temperature
|
||||
- Individual light cards
|
||||
- Water filter age
|
||||
|
||||
Living Room:
|
||||
- Temperature
|
||||
- Turn TV on action
|
||||
* dynamic card to start Movie Mode
|
||||
- Individual light cards
|
||||
- Plant last watered
|
||||
|
||||
Office:
|
||||
- Temperature
|
||||
- Individual light cards
|
||||
- Bandwidth usage
|
||||
- Computer stats
|
||||
|
||||
Primary IEEE address: 00:12:4B:00:29:E8:B1:9E
|
||||
|
||||
Random inspiration words:
|
||||
- "Temp Disable Office Motion"
|
||||
- "Main Lights {Bright,Dim,Warm}"
|
||||
- "Robot Vacuum"
|
||||
- "Living Room TV"
|
||||
- "Morning wakeup"
|
||||
- "Going to sleep early"
|
||||
- "Take out bins"
|
||||
- "Video Conference"
|
||||
- "Gaming"
|
||||
- Monitor power usage to tell when something has started/stopped
|
||||
- Vibration sensor for kitchen drawer
|
||||
- Todo list for dinner schedule
|
||||
- Air quality sensor in kitchen
|
||||
- Notification to close vents when outdoor air quality is bad
|
||||
- "TV Lights Lock" - don't auto dim-lights on play/pause
|
||||
*********************
|
||||
*/
|
||||
}
|
||||
@@ -8,7 +8,6 @@
|
||||
imports = [
|
||||
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
||||
./hardware-configuration.nix
|
||||
./home-assistant
|
||||
./snapcast.nix
|
||||
../server.nix
|
||||
];
|
||||
|
||||
@@ -36,7 +36,7 @@ in
|
||||
{
|
||||
name = "home.mesh.vimium.net";
|
||||
type = "A";
|
||||
value = "100.64.0.7";
|
||||
value = "100.64.0.5";
|
||||
}
|
||||
];
|
||||
magic_dns = true;
|
||||
@@ -60,7 +60,7 @@ in
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString config.services.headscale.port}";
|
||||
proxyPass = "http://127.0.0.1:${toString config.services.headscale.port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -136,16 +136,16 @@ in
|
||||
];
|
||||
locations = {
|
||||
"/" = {
|
||||
proxyPass = "http://localhost:8008";
|
||||
proxyPass = "http://127.0.0.1:8008";
|
||||
extraConfig = proxyConfig;
|
||||
};
|
||||
"/_matrix" = {
|
||||
proxyPass = "http://localhost:8008";
|
||||
proxyPass = "http://127.0.0.1:8008";
|
||||
extraConfig = proxyConfig + ''
|
||||
client_max_body_size 50M;
|
||||
'';
|
||||
};
|
||||
"/_synapse/client".proxyPass = "http://localhost:8008";
|
||||
"/_synapse/client".proxyPass = "http://127.0.0.1:8008";
|
||||
};
|
||||
};
|
||||
"${serverName}" =
|
||||
|
||||
@@ -82,6 +82,7 @@ in
|
||||
maxSize = "100m";
|
||||
};
|
||||
};
|
||||
proxyResolveWhileRunning = true;
|
||||
resolver.addresses = [ "100.100.100.100" ];
|
||||
upstreams = {
|
||||
jellyfin.servers = {
|
||||
|
||||
@@ -47,7 +47,6 @@ in
|
||||
gnomeExtensions.dash-to-panel
|
||||
gnomeExtensions.desktop-cube
|
||||
gnomeExtensions.easyScreenCast
|
||||
gnomeExtensions.espresso
|
||||
gnomeExtensions.fly-pie
|
||||
gnomeExtensions.forge
|
||||
gnomeExtensions.gsconnect
|
||||
|
||||
Reference in New Issue
Block a user