From 11fe0e501655276c82db8470824595567f986b12 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 2 May 2025 17:20:07 -0400 Subject: [PATCH] latest --- flake.lock | 60 ++++++++++++------------- hosts/fwbook.hardware-configuration.nix | 45 ++++++++++--------- hosts/fwbook.nix | 9 +--- 3 files changed, 54 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 62c731a..0bd487e 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "lastModified": 1746162366, + "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", "owner": "nix-community", "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1744406261, - "narHash": "sha256-Wh7pdOAZk0aQnA9agLjf+NUaXQrwLCFNT9Ai/YtQpAo=", + "lastModified": 1746199527, + "narHash": "sha256-oauEKm3UqANB4/Z6pzulYW/NgYH+27jeqEfVMHB2KU8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "66636195f18d21bd65f8e7ced461f6b6770be189", + "rev": "464b85b64c6228f1dfcf5cd853a342e582701126", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1745816321, + "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1741903049, - "narHash": "sha256-8Y8brH04JjSLrCLvBEbhK9vOu7lhQhqUBW4kI3tifdI=", + "lastModified": 1744659587, + "narHash": "sha256-xJnbmRVte13akgn+Prg06IaRHJ5OX3uVltwsCP/mxoc=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "42c7fb2702219b86a8f5969c3475ce594c28f5d0", + "rev": "928d868a9141b48f152d3b2b00c433e688d4b106", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1744456153, - "narHash": "sha256-xTaAboh9p0Mz0UEgcKe+B1zVKoRFG7RQR+gf7ypMQVA=", + "lastModified": 1746195507, + "narHash": "sha256-y3VD8Pr3XlB71eDJpewGZohOj6NH8gV8rsf3B7V/AlQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "a76a451a2c97aa37a7741bdf8244ad91205776b8", + "rev": "12a05785acfc512dfff815d2f4ac9117541405fc", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744366945, - "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1744425163, - "narHash": "sha256-iFcqIbyY25uhtRrQal5vFTxt0q59vDf++nY8du5hof4=", + "lastModified": 1746153335, + "narHash": "sha256-vwKelhJJS8haCdH3t8uf96VFao7/YzJahPG5JLTO1PU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4bb0b6dfc5bafa8b4e8dbe1170f051c437b2cb79", + "rev": "ebc7823c3ffde594c7733113042b72694d996de9", "type": "github" }, "original": { diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index 7736a96..c086c6b 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -1,46 +1,47 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, modulesPath, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - security.protectKernelImage = false; - fileSystems."/" = { - device = "/dev/disk/by-uuid/3fbf3ccf-655a-4040-b898-b97a1d555912"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/adaad601-f79c-4342-ba3a-9eab53ec4cd1"; + fsType = "btrfs"; + options = [ "subvol=@root" "compress=zstd" ]; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/3342-B2BE"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/home" = + { device = "/dev/disk/by-uuid/adaad601-f79c-4342-ba3a-9eab53ec4cd1"; + fsType = "btrfs"; + options = [ "subvol=@home" "compress=zstd" ]; + }; + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/adaad601-f79c-4342-ba3a-9eab53ec4cd1"; + fsType = "btrfs"; + options = [ "subvol=@nix" "compress=zstd" "noatime" ]; + }; fileSystems."/mnt/Data" = { device = "/dev/disk/by-uuid/239db4ac-762d-4d76-8297-ccd37bcdfd8b"; fsType = "ext4"; options = [ "users" "exec" "nofail" ]; }; - - swapDevices = - [ - # { device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; } - { - device = "/swapfile"; - size = 48 * 1024; # 48GB - } - ]; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0559-4C2D"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index f26444c..3d21a26 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -40,16 +40,9 @@ in }; }; # Desktop Env - services.displayManager.cosmic-greeter.enable = false; - - services.displayManager.sddm.enable = false; - services.displayManager.sddm.wayland.enable = false; - services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.wayland = true; - - services.displayManager.defaultSession = "cosmic"; - services.xserver.desktopManager.cinnamon.enable = false; + # services.displayManager.defaultSession = "cosmic"; services.xserver.desktopManager.gnome.enable = true; environment.gnome.excludePackages = with pkgs; [ gnome-tour