This commit is contained in:
Philipp Hochkamp 2022-08-30 09:03:18 +02:00
parent 50adba0f93
commit ae980aa07b
3 changed files with 9 additions and 9 deletions

12
flake.lock generated
View file

@ -197,11 +197,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1661839252, "lastModified": 1661842206,
"narHash": "sha256-wtHBnsgeEKW/OyI/VxrN1pUfyIOxAIkbuijWesUbmv8=", "narHash": "sha256-6xJAFeZ9voQJ4kNYSVodNQ3VlEnj9RKJ0kpYhCSIFNQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30897d37099e1c59f5eab50e7ddfd3cd6b39ba7f", "rev": "5b76ccbfc320b305e7500cbd56e034ed6ba233a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -389,11 +389,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1661838653, "lastModified": 1661842962,
"narHash": "sha256-Q/GwZcl9z2Hwov4zfReo7Si1CsmjWvegZrXZgp3VrhE=", "narHash": "sha256-RQhGwEMOvpDbwDh4IH8ZlSsSKUjwu1Y/9ifiVUxFlYY=",
"owner": "thexyno", "owner": "thexyno",
"repo": "blog", "repo": "blog",
"rev": "a3838e2513d3e1c624252af1edb7f69cb89c6aca", "rev": "814412507e95f3c5348f8080fb46088878e30dc4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -68,7 +68,7 @@ in
networking.useDHCP = true; networking.useDHCP = true;
networking.networkmanager.enable = mkForce false; networking.networkmanager.enable = mkForce false;
services.mjpg-streamer.enable = true; services.mjpg-streamer.enable = true;
services.mjpg-streamer.inputPlugin = "input_uvc.so -d /dev/video1 -r 640x480 -f 15 -u"; services.mjpg-streamer.inputPlugin = "input_uvc.so -d /dev/video1 -r 1280x720 -f 15 -u";
services.xserver.desktopManager.phosh.enable = true; services.xserver.desktopManager.phosh.enable = true;
services.xserver.desktopManager.phosh.user = "ragon"; services.xserver.desktopManager.phosh.user = "ragon";
services.xserver.desktopManager.phosh.group = "wheel"; services.xserver.desktopManager.phosh.group = "wheel";

View file

@ -5,7 +5,7 @@ set -euo pipefail
REV=$(curl https://api.github.com/repos/thexyno/nixos-config/branches/main | jq -r .commit.sha) REV=$(curl https://api.github.com/repos/thexyno/nixos-config/branches/main | jq -r .commit.sha)
if [[ $(uname) == "Linux" ]]; then if [[ $(uname) == "Linux" ]]; then
sudo nixos-rebuild switch --flake "github:ragon000/nixos-config?rev=$REV" sudo nixos-rebuild switch --flake "github:thexyno/nixos-config?rev=$REV"
else # Darwin else # Darwin
/nix/var/nix/profiles/system/sw/bin/darwin-rebuild switch --flake "github:ragon000/nixos-config?rev=$REV" /nix/var/nix/profiles/system/sw/bin/darwin-rebuild switch --flake "github:thexyno/nixos-config?rev=$REV"
fi fi