mirrors/mdlayher-homelab
1
0
Fork 0
mirror of https://github.com/mdlayher/homelab.git synced 2024-12-14 11:47:32 +00:00
Code Activity

Merge branch 'master' of github:mdlayher/homelab

Browse source
This commit is contained in:
Matt Layher 2020-05-17 21:07:00 -04:00
commit b1ee541b9e
4 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/lib/vargen/go.mod
View file

@ -4,5 +4,5 @@ go 1.14
require (
github.com/mdlayher/eui64 v0.0.0-20191004205636-300b7bde793c
inet.af/netaddr v0.0.0-20200425195807-ed91f5d53cc9
inet.af/netaddr v0.0.0-20200512140312-d37a9e0a2dd4
)

4
nixos/lib/vargen/go.sum
View file

@ -1,4 +1,4 @@
github.com/mdlayher/eui64 v0.0.0-20191004205636-300b7bde793c h1:758I75uwYgVtX8fzyn0dvHQEUGNA60284ujMT7a0q2Y=
github.com/mdlayher/eui64 v0.0.0-20191004205636-300b7bde793c/go.mod h1:1Po4lSpd7AjxFUNZbEut0MJQ4gT4MDn2ZuBiNfitUDI=
inet.af/netaddr v0.0.0-20200425195807-ed91f5d53cc9 h1:UtE0zzcV/h1n5gUsYwK5IWHXF85HZoWhhVzuc8ZxSAQ=
inet.af/netaddr v0.0.0-20200425195807-ed91f5d53cc9/go.mod h1:qqYzz/2whtrbWJvt+DNWQyvekNN4ePQZcg2xc2/Yjww=
inet.af/netaddr v0.0.0-20200512140312-d37a9e0a2dd4 h1:2Lj2bqi5EmgZSyJSaLoniH93rP/IhuWr6BTdgAJuiYA=
inet.af/netaddr v0.0.0-20200512140312-d37a9e0a2dd4/go.mod h1:qqYzz/2whtrbWJvt+DNWQyvekNN4ePQZcg2xc2/Yjww=

18
nixos/lib/vargen/main.go
View file

@ -167,26 +167,26 @@ func newInterface(s subnet) iface {
}
// Router always has a .1 or ::1 suffix.
ip4 := s.IPv4.IPNet().IP
ip4[3] = 1
ip4 := s.IPv4.IP.As16()
ip4[15] = 1
gua := s.IPv6.GUA.IPNet().IP
gua := s.IPv6.GUA.IP.As16()
gua[15] = 1
ula := s.IPv6.ULA.IPNet().IP
ula := s.IPv6.ULA.IP.As16()
ula[15] = 1
lla := s.IPv6.LLA.IPNet().IP
lla := s.IPv6.LLA.IP.As16()
lla[15] = 1
return iface{
Name: s.Name,
InternalDomain: internal,
IPv4: mustStdIP(ip4),
IPv4: netaddr.IPFrom16(ip4),
IPv6: ipv6Addresses{
GUA: mustStdIP(gua),
ULA: mustStdIP(ula),
LLA: mustStdIP(lla),
GUA: netaddr.IPFrom16(gua),
ULA: netaddr.IPFrom16(ula),
LLA: netaddr.IPFrom16(lla),
},
}
}

56
obs/scenes/Programming.json
View file

@ -861,7 +861,7 @@
},
"sync": 0,
"versioned_id": "pulse_input_capture",
"volume": 1.7782794237136841
"volume": 1.0
},
{
"balance": 0.5,
@ -1476,14 +1476,14 @@
"locked": true,
"name": "Source: Audio/Video Fullscreen",
"pos": {
"x": 3159.82275390625,
"y": 1720.0
"x": 3136.0,
"y": 1632.970703125
},
"private_settings": {},
"rot": 0.0,
"scale": {
"x": 0.20364584028720856,
"y": 0.20370370149612427
"x": 0.32509449124336243,
"y": 0.32532677054405212
},
"scale_filter": "disable",
"visible": true
@ -1496,23 +1496,25 @@
},
"bounds_align": 0,
"bounds_type": 0,
"crop_bottom": 0,
"crop_left": 0,
"crop_right": 0,
"crop_top": 0,
"crop_bottom": 70,
"crop_left": 120,
"crop_right": 120,
"crop_top": 40,
"group_item_backup": false,
"id": 22,
"locked": true,
"name": "Scene: Audio/Video Corner",
"pos": {
"x": 3159.82275390625,
"y": 1720.0
"x": 3136.0,
"y": 1632.970703125
},
"private_settings": {
"collapsed": false
},
"private_settings": {},
"rot": 0.0,
"scale": {
"x": 1.0,
"y": 1.0
"x": 1.5963718891143799,
"y": 1.5970587730407715
},
"scale_filter": "disable",
"visible": true
@ -1890,14 +1892,14 @@
"locked": true,
"name": "Source: Audio/Video Fullscreen",
"pos": {
"x": 3159.82275390625,
"y": 1720.0
"x": 3136.0,
"y": 1632.970703125
},
"private_settings": {},
"rot": 0.0,
"scale": {
"x": 0.20364584028720856,
"y": 0.20370370149612427
"x": 0.32509449124336243,
"y": 0.32532677054405212
},
"scale_filter": "disable",
"visible": true
@ -1910,23 +1912,23 @@
},
"bounds_align": 0,
"bounds_type": 0,
"crop_bottom": 0,
"crop_left": 0,
"crop_right": 0,
"crop_top": 0,
"crop_bottom": 70,
"crop_left": 120,
"crop_right": 120,
"crop_top": 40,
"group_item_backup": false,
"id": 34,
"locked": true,
"name": "Scene: Audio/Video Corner",
"pos": {
"x": 3159.82275390625,
"y": 1720.0
"x": 3136.0,
"y": 1632.970703125
},
"private_settings": {},
"rot": 0.0,
"scale": {
"x": 1.0,
"y": 1.0
"x": 1.5963718891143799,
"y": 1.5970587730407715
},
"scale_filter": "disable",
"visible": true
@ -2732,8 +2734,8 @@
"push-to-talk-delay": 0,
"settings": {
"Exposure, Auto": 5557561106012987725,
"Focus, Auto": false,
"Power Line Frequency": 7234307546238118212,
"Zoom, Absolute": 120,
"device_id": "/dev/video0",
"framerate": 65566,
"input": 0,