1
0
Fork 0

Compare commits

..

No commits in common. "a99103dcaaa1651774a6e92820baa1e11347b402" and "53eb2e0a49a84aac34545e26d50400537d1db071" have entirely different histories.

6 changed files with 14 additions and 89 deletions

View file

@ -252,7 +252,7 @@
"locked": { "locked": {
"lastModified": 1716827240, "lastModified": 1716827240,
"narHash": "sha256-0LHXNvx7KEsn3j9w/4VtQiEWKrqJmmWn1k/169x/N04=", "narHash": "sha256-0LHXNvx7KEsn3j9w/4VtQiEWKrqJmmWn1k/169x/N04=",
"ref": "f8a243d7e9db4689bcfc7726df75d5725daf4b60", "ref": "refs/heads/main",
"rev": "f8a243d7e9db4689bcfc7726df75d5725daf4b60", "rev": "f8a243d7e9db4689bcfc7726df75d5725daf4b60",
"revCount": 40, "revCount": 40,
"type": "git", "type": "git",
@ -265,18 +265,18 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1717000136, "lastModified": 1716881121,
"narHash": "sha256-MyFE1416Wsb9UxTNiHTGoOvtUl5JuCftj4EBfz9oPHU=", "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=",
"ref": "master", "ref": "master",
"rev": "2575b7552f52b34dadb08f140326fbbd19056355", "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf",
"revCount": 1685, "revCount": 1694,
"type": "git", "type": "git",
"url": "https://code.8bitbuddhism.com/aires/nixos-hardware" "url": "https://github.com/NixOS/nixos-hardware"
}, },
"original": { "original": {
"ref": "master", "ref": "master",
"type": "git", "type": "git",
"url": "https://code.8bitbuddhism.com/aires/nixos-hardware" "url": "https://github.com/NixOS/nixos-hardware"
} }
}, },
"nixpkgs": { "nixpkgs": {
@ -313,11 +313,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716966868, "lastModified": 1716793392,
"narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=", "narHash": "sha256-ex3nO87EEQhshXd19QSVW5UIXL0pbPuew4q8TdEJQBY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8", "rev": "67a8b308bae9c26be660ccceff3e53a65e01afe1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -25,8 +25,8 @@
nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1";
# Hardware configurations # Hardware configurations
nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master"; #nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master";
#nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master"; nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master";
# Home-manager # Home-manager
home-manager = { home-manager = {

View file

@ -113,32 +113,4 @@ in
# Allow Haven to be a build target for other architectures (mainly ARM64) # Allow Haven to be a build target for other architectures (mainly ARM64)
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
# Automatically update Flake configuration for other hosts to use
systemd.services."nixos-update-flake" = {
serviceConfig = {
Type = "oneshot";
User = config.users.users.aires.name;
};
script = ''
set -eu
cd ${config.users.users.aires.home}/Development/nix-configuration
git pull
nix flake update
git add flake.lock
git commit -m "Update flake.lock"
git push
'';
};
systemd.timers."nixos-update-flake-timer" = {
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = "daily";
Persistent = "true";
Unit = "nixos-update-flake.service";
};
};
} }

View file

@ -1,42 +0,0 @@
[General]
Name=Victrix Pro BFG
Appearance=0x03c4
AddressType=public
SupportedTechnologies=LE;
Trusted=true
Blocked=false
WakeAllowed=true
Services=00001800-0000-1000-8000-00805f9b34fb;00001801-0000-1000-8000-00805f9b34fb;0000180a-0000-1000-8000-00805f9b34fb;0000180f-0000-1000-8000-00805f9b34fb;00001812-0000-1000-8000-00805f9b34fb;00001813-0000-1000-8000-00805f9b34fb;f95a48e6-a721-11e9-a2a3-022ae2dbcce4;
[LongTermKey]
Key=F12268049C72EA0561E2E77DEA02AC12
Authenticated=0
EncSize=16
EDiv=29996
Rand=5139827239406697411
[PeripheralLongTermKey]
Key=CC60B7A9080383302B61EC2127E0D5CD
Authenticated=0
EncSize=16
EDiv=59630
Rand=6653202288716901387
[SlaveLongTermKey]
Key=CC60B7A9080383302B61EC2127E0D5CD
Authenticated=0
EncSize=16
EDiv=59630
Rand=6653202288716901387
[DeviceID]
Source=2
Vendor=3695
Product=587
Version=768
[ConnectionParameters]
MinInterval=6
MaxInterval=6
Latency=0
Timeout=300

View file

@ -15,9 +15,6 @@ let
mano-touchpad-bluetooth = pkgs.writeText "info" ( mano-touchpad-bluetooth = pkgs.writeText "info" (
builtins.readFile ./bluetooth/mano-touchpad-bluetooth-params builtins.readFile ./bluetooth/mano-touchpad-bluetooth-params
); );
vitrix-pdp-pro-bluetooth = pkgs.writeText "info" (
builtins.readFile ./bluetooth/vitrix-pdp-pro-params
);
# Use gremlin user's monitor configuration for GDM (desktop monitor primary). See https://discourse.nixos.org/t/gdm-monitor-configuration/6356/4 # Use gremlin user's monitor configuration for GDM (desktop monitor primary). See https://discourse.nixos.org/t/gdm-monitor-configuration/6356/4
monitorsXmlContent = builtins.readFile ./monitors.xml; monitorsXmlContent = builtins.readFile ./monitors.xml;
@ -78,7 +75,6 @@ in
"L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/00:0E:DD:72:2F:0C/info - - - - ${shure-aonic-bluetooth}" "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/00:0E:DD:72:2F:0C/info - - - - ${shure-aonic-bluetooth}"
"L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/F4:6A:D7:3A:16:75/info - - - - ${xbox-elite-bluetooth}" "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/F4:6A:D7:3A:16:75/info - - - - ${xbox-elite-bluetooth}"
"L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/F8:5D:3C:7D:9A:00/info - - - - ${mano-touchpad-bluetooth}" "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/F8:5D:3C:7D:9A:00/info - - - - ${mano-touchpad-bluetooth}"
"L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/00:34:30:47:37:AB/info - - - - ${vitrix-pdp-pro-bluetooth}"
]; ];
# Configure the virtual machine created by nixos-rebuild build-vm # Configure the virtual machine created by nixos-rebuild build-vm

View file

@ -29,12 +29,11 @@
# Configure automatic updates # Configure automatic updates
system.autoUpgrade = { system.autoUpgrade = {
enable = true; enable = true;
flake = "git+https://${config.secrets.services.forgejo.url}/aires/nix-configuration"; flake = "${config.users.users.aires.home}/Development/nix-configuration";
dates = "daily"; dates = "daily";
randomizedDelaySec = "30m";
allowReboot = false; allowReboot = false;
operation = "switch"; operation = "switch";
persistent = true; flags = [ "--commit-lock-file" ];
}; };
services = { services = {