From e2fe743afdf3195099d963254f6454e9f3936c67 Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Thu, 21 Nov 2024 13:52:39 +0100 Subject: [PATCH] framework-2024-11-21-13-52-39 --- configs/user-gui.nix | 2 +- flake.lock | 24 ++++++------ machine/framework/configuration.nix | 10 ++--- machine/framework/hardware-configuration.nix | 39 ++++++++++---------- 4 files changed, 35 insertions(+), 40 deletions(-) diff --git a/configs/user-gui.nix b/configs/user-gui.nix index f6a3b81..fbc8436 100755 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -54,7 +54,7 @@ keepassxc nextcloud-client pinta - rustdesk-flutter + # rustdesk-flutter simple-scan telegram-desktop diff --git a/flake.lock b/flake.lock index a1054a4..5d45ea4 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731977366, - "narHash": "sha256-UufePQLAmJtLG2ghOSYG/asD+sSo2qubwdozd9Bj9f4=", + "lastModified": 1732047192, + "narHash": "sha256-QVvcbiOgQIMLM5+NrpKxpB3IRKH4ZbP7+WKBISKO1zM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a5536db0de3357bee3a78725ebecb6c0b660e3f6", + "rev": "d3ec352824dbec68aa0c17851f7424fdc735ecc4", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1731887066, - "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1731968878, - "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1731736013, - "narHash": "sha256-AYB3yeogE9vtBuSStdFFmGR0kzGuumW4nrpdlcuZ/As=", + "lastModified": 1732032028, + "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a2c6d8d1acce49de8dc7ed951428aae901908316", + "rev": "65dc04371cf914c9af4f073638821e4787303005", "type": "github" }, "original": { diff --git a/machine/framework/configuration.nix b/machine/framework/configuration.nix index 3d35edd..88b106c 100755 --- a/machine/framework/configuration.nix +++ b/machine/framework/configuration.nix @@ -83,7 +83,7 @@ in { tmp.useTmpfs = false; supportedFilesystems = ["btrfs"]; - kernelPackages = pkgs.linuxPackages_cachyos; + kernelPackages = pkgs.linuxPackages_cachyos-hardened; initrd = { luks.devices = { @@ -206,9 +206,10 @@ in { security.rtkit.enable = true; # rtkit is optional but recommended services = { - # foldingathome.enable = true; power-profiles-daemon.enable = true; colord.enable = true; + fprintd.enable = false; + tailscale.enable = true; btrfs.autoScrub = { enable = true; @@ -242,8 +243,6 @@ in { extraPruneArgs = "--save-space --list --stats"; exclude = map (x: "/home/alex/" + x) be.borg-exclude; }; - - tailscale.enable = true; }; powerManagement = { @@ -260,10 +259,7 @@ in { environment = { sessionVariables = {LIBVA_DRIVER_NAME = "iHD";}; # Force intel-media-driver systemPackages = with pkgs; [ - # psensor - # mission-center resources - gnumake pkg-config libftdi diff --git a/machine/framework/hardware-configuration.nix b/machine/framework/hardware-configuration.nix index 1fd4742..5937f83 100644 --- a/machine/framework/hardware-configuration.nix +++ b/machine/framework/hardware-configuration.nix @@ -19,9 +19,9 @@ "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + # boot.initrd.kernelModules = []; + # boot.kernelModules = ["kvm-intel"]; + # boot.extraModulePackages = []; fileSystems = { "/" = { @@ -86,25 +86,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 /etc/luks-key01 - ''; - # boot.initrd.luks.devices."luks-e36ec189-2211-4bcc-bb9d-46650443d76b".device = "/dev/disk/by-uuid/e36ec189-2211-4bcc-bb9d-46650443d76b"; + # environment.etc.crypttab.text = '' + # luks-e36ec189-2211-4bcc-bb9d-46650443d76b UUID=e36ec189-2211-4bcc-bb9d-46650443d76b /persist/luks-key01 + # ''; swapDevices = [ {