From a1c2ce484cba5b6850a06b4fc79f09857333f537 Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Mon, 9 Dec 2024 13:26:44 +0100 Subject: [PATCH] framework-2024-12-09-13-26-44 --- flake.lock | 60 ++++++++++---------- machine/framework/configuration.nix | 12 ++-- machine/framework/hardware-configuration.nix | 32 +++++------ 3 files changed, 50 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index f57e819..22ea47c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733072746, - "narHash": "sha256-Rds19CCMsbT+eo5HoJahl2N/wLrvGZ0Nw6Vlu+hvfmE=", + "lastModified": 1733677156, + "narHash": "sha256-TSgU+M0Zm0PMnb6J/gOovC63wtqSbhgdmN7CucDO0oU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "36d157737c1682d31721f68c812353225956471b", + "rev": "354bcbbadbd00f5bda884bb2c119b7de63b197e9", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", + "lastModified": 1733491721, + "narHash": "sha256-n4fTKTYXeGRngeanNDxSxbuWSRCQ6l74IwOBlqp8dcw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", + "rev": "0f415721ee427270bc078ef3a5ba2a308d47461f", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1732532987, - "narHash": "sha256-mqusSz4l0vXJmi8KAxCh6xZChsWQ4jF7kVHpbmuxIqU=", + "lastModified": 1733586715, + "narHash": "sha256-qRwBwL6bI3ZIDHHaFgpOSYWhcVN102rsSvueHbyfxFs=", "owner": "taj-ny", "repo": "kwin-effects-forceblur", - "rev": "fb56661dacfea439741264d9a17a96afb415ccd5", + "rev": "6c5705e8f96d5d0cdd1fcbd48007740921fa7313", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733066523, - "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -251,11 +251,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -285,11 +285,11 @@ ] }, "locked": { - "lastModified": 1732575825, - "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "mic92", "repo": "sops-nix", - "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { diff --git a/machine/framework/configuration.nix b/machine/framework/configuration.nix index 012d111..f73c2d1 100644 --- a/machine/framework/configuration.nix +++ b/machine/framework/configuration.nix @@ -14,6 +14,7 @@ in { ../../configs/common-linux.nix ../../configs/docker.nix ../../configs/games.nix + ../../configs/hardware.nix ../../configs/virtualization.nix ../../configs/plasma.nix ../../configs/user-gui.nix @@ -21,7 +22,7 @@ in { ]; sops = { - defaultSopsFile = ../../secrets-framework.yaml; + defaultSopsFile = ../../secrets/secrets-framework.yaml; secrets = { borg-key = { @@ -85,11 +86,11 @@ in { } { temp = 65; - speed = 25; + speed = 20; } { temp = 70; - speed = 35; + speed = 25; } { temp = 75; @@ -205,13 +206,8 @@ in { msr-tools quota - mergerfs - snapraid - gparted homebank - # fahviewer - # fahcontrol ]; }; diff --git a/machine/framework/hardware-configuration.nix b/machine/framework/hardware-configuration.nix index f0dc12b..2e3cf1b 100644 --- a/machine/framework/hardware-configuration.nix +++ b/machine/framework/hardware-configuration.nix @@ -85,24 +85,24 @@ fsType = "vfat"; options = ["fmask=0022" "dmask=0022"]; }; - "/home/alex/shared/storage" = { - device = "/dev/disk/by-uuid/58259976-4f63-4f60-a755-7870b08286e7"; - fsType = "btrfs"; - options = [ - "subvol=@data" - "discard=async" - "compress=zstd" - "nodiratime" - "noatime" - "nofail" - "x-systemd.automount" - ]; - }; + # "/home/alex/shared/storage" = { + # device = "/dev/disk/by-uuid/58259976-4f63-4f60-a755-7870b08286e7"; + # fsType = "btrfs"; + # options = [ + # "subvol=@data" + # "discard=async" + # "compress=zstd" + # "nodiratime" + # "noatime" + # "nofail" + # "x-systemd.automount" + # ]; + # }; }; - environment.etc.crypttab.text = '' - luks-e36ec189-2211-4bcc-bb9d-46650443d76b UUID=e36ec189-2211-4bcc-bb9d-46650443d76b /persist/luks-key01 - ''; + # environment.etc.crypttab.text = '' + # luks-e36ec189-2211-4bcc-bb9d-46650443d76b UUID=e36ec189-2211-4bcc-bb9d-46650443d76b /persist/luks-key01 + # ''; swapDevices = [ {