diff --git a/flake.lock b/flake.lock index 5663e48..f28ef52 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1715607026, - "narHash": "sha256-mjmjNivj8/G3eElwP9OrykecHVh2Lhqry7ztbxfcO54=", + "lastModified": 1716563212, + "narHash": "sha256-m4M2EH9PcFGDpJRgK0u0FDadOBM8G02/p7F77fiEdNo=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f14b61c2cfd4fddcd0028673c3c08f8d75a78d50", + "rev": "f3685d816317958caf2bce128f80d02fee65b163", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1714661560, - "narHash": "sha256-E1ZiUbOgo7rWo8zt2M2vzCVSykCxK0Ot2dUAxTL6cpU=", + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", "owner": "matrix-org", "repo": "complement", - "rev": "370a014dca0f720614e0c8f68b9a3e66ecf7f516", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715543662, - "narHash": "sha256-Y+Joq1pMcbVi7qhAyExmd2KRmU0SYx8osUCOy1XnB3s=", + "lastModified": 1716442236, + "narHash": "sha256-6iHSjtGDvgfAOamDXuKn7saTTz21h8Zqi57DEIjtSr4=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "434b5118cc41b3359b502794bf3d39583d5f9e26", + "rev": "eb8dd9cb44f2cb284d92da0e07db805d0f19ed37", "type": "github" }, "original": { @@ -153,12 +153,12 @@ ] }, "locked": { - "lastModified": 1714842444, - "narHash": "sha256-z4HeSYtEdYxKurrbxCMb8v/I1LYDHR/aFrZtGtgUgHw=", - "rev": "c5ee4371eea1728ef04bb09c79577c84d5e67a48", - "revCount": 557, + "lastModified": 1716156051, + "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", + "rev": "7443df1c478947bf96a2e699209f53b2db26209d", + "revCount": 571, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.6/018f4495-627e-7385-b537-81f1c1d4003b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.1/018f92f7-d079-7a6a-8660-4fa94147552e/source.tar.gz" }, "original": { "type": "tarball", @@ -409,11 +409,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -429,11 +429,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -449,11 +449,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -486,11 +486,11 @@ ] }, "locked": { - "lastModified": 1715417624, - "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=", + "lastModified": 1716455390, + "narHash": "sha256-HZockBczLQPFqZMpxi0Xv/vxeqamJrSveFIRIpkiGrs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8fef078acb3206be58ae5892a32d6ed75b695647", + "rev": "e3f0e189e5ab4a28c51f84d5a052a39423ccc838", "type": "github" }, "original": { @@ -512,11 +512,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1715529584, - "narHash": "sha256-y2XgFHnLpeItAHsyrEWLEHXGRRBe8I/30YU69m9rhso=", + "lastModified": 1716518043, + "narHash": "sha256-JSRVAZdk1ZMWEmiqtVAUkDgs3/MbGQcbM1M/EJMsSSw=", "owner": "martinvonz", "repo": "jj", - "rev": "256988de65de2fe38eb9a963001f51f138f5cb6f", + "rev": "2e0dde81a626fda184e1846d98183bc1f95fd127", "type": "github" }, "original": { @@ -619,11 +619,11 @@ ] }, "locked": { - "lastModified": 1715574919, - "narHash": "sha256-WXZ27tFG26uVphCQEKVDghyLXCLQnA6fYGnhHGSago4=", + "lastModified": 1716554875, + "narHash": "sha256-BBAiAeWPwoOJyeW9PAnxSxS9kAi2b/T8bh8ChIfAD5Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "e06776c5d4673de8c2e6c9932cec0c0d761836a8", + "rev": "2ac8d840343dc964981507353c9128c68361cb6f", "type": "github" }, "original": { @@ -637,11 +637,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1716511055, + "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", "type": "github" }, "original": { @@ -730,11 +730,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1714264490, - "narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=", + "lastModified": 1716521847, + "narHash": "sha256-4sRvBx46iQycFNyUcaWevGzeudhil9HyWxiFb9zPsNE=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc", + "rev": "a9f9b2aae396861cdd99bd7b12abcc469a2bfa9e", "type": "github" }, "original": { @@ -745,11 +745,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", + "lastModified": 1716173274, + "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", + "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "type": "github" }, "original": { @@ -761,12 +761,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", - "revCount": 624623, + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "revCount": 629726, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.624623%2Brev-062ca2a9370a27a35c524dc82d540e6e9824b652/018f6cbd-ec88-7bb1-9340-f5e9f881cdb8/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.629726%2Brev-5710852ba686cc1fd0d3b8e22b3117d43ba374c2/018fa276-eb5e-762d-b67b-85f281987019/source.tar.gz" }, "original": { "type": "tarball", @@ -807,11 +807,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1715542476, - "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": { @@ -823,11 +823,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -868,27 +868,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { diff --git a/hosts/mac-nixos/configuration.nix b/hosts/mac-nixos/configuration.nix index e49ba33..6024134 100644 --- a/hosts/mac-nixos/configuration.nix +++ b/hosts/mac-nixos/configuration.nix @@ -33,17 +33,17 @@ xserver = { enable = true; - desktopManager.gnome.enable = true; + desktopManager.gnome.enable = false; # Enable the Plasma 6 Desktop Environment. displayManager = { - sddm.enable = false; + sddm.enable = true; # defaultSession = "plasma"; - gdm.enable = true; + gdm.enable = false; }; }; - desktopManager.plasma6.enable = false; + desktopManager.plasma6.enable = true; # enable auto discovery of printers avahi = { @@ -53,7 +53,7 @@ }; # Enable Flatpak - flatpak.enable = true; + flatpak.enable = false; }; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/hosts/mac-nixos/hardware-configuration.nix b/hosts/mac-nixos/hardware-configuration.nix index 804f54b..f77b590 100644 --- a/hosts/mac-nixos/hardware-configuration.nix +++ b/hosts/mac-nixos/hardware-configuration.nix @@ -48,15 +48,15 @@ options = [ "subvol=root" ]; }; - fileSystems."/boot/EFI" = + fileSystems."/boot" = { device = "/dev/disk/by-uuid/F4A1-C77F"; fsType = "vfat"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3aaa1d0e-057d-4b7d-b2fe-ef02db373e9f"; - fsType = "ext4"; - }; +# fileSystems."/boot" = +# { device = "/dev/disk/by-uuid/3aaa1d0e-057d-4b7d-b2fe-ef02db373e9f"; +# fsType = "ext4"; +# }; swapDevices = [ ];