set machine id manually instead of impermenance

flake.lock

@@ -52,11 +52,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1730390431,
+        "lastModified": 1730555728,
-        "narHash": "sha256-M+rMhDB69Y35IlhmAMN4ErDige+wKPwhb6HDqpF14Rw=",
+        "narHash": "sha256-jBr4WUPat+R/79DBdk85hKyqDfoJII4Z+V+GoevYNDY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "40388a7427ee32af175c5169ae7587ffd2dec125",
+        "rev": "e734744bc2e9ca9aa577555bf028c5ea51eb5f77",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1730338548,
+        "lastModified": 1730597759,
-        "narHash": "sha256-wwAKXZr5GU36NrVy/gERRWuQjIKvZYrTD5mRahd87vI=",
+        "narHash": "sha256-DStWygV/fV3aU8VWN4wIG4Mjpq7s540gUD4A103u+Zo=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "bb2350119400c47be764c348e67f1b38e858435f",
+        "rev": "db3975340480a6c2532398991f3a47f74df17eed",
         "type": "github"
       },
       "original": {
@@ -336,11 +336,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730016908,
+        "lastModified": 1730633670,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
+        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
         "type": "github"
       },
       "original": {
@@ -351,11 +351,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1729068498,
+        "lastModified": 1730403150,
-        "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
+        "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "e337457502571b23e449bf42153d7faa10c0a562",
+        "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f",
         "type": "github"
       },
       "original": {
@@ -444,11 +444,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1730184279,
+        "lastModified": 1730600078,
-        "narHash": "sha256-6OB+WWR6gnaWiqSS28aMJypKeK7Pjc2Wm6L0MtOrTuA=",
+        "narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "b379bd4d872d159e5189053ce9a4adf86d56db4b",
+        "rev": "4652874d014b82cb746173ffc64f6a70044daa7e",
         "type": "github"
       },
       "original": {
@@ -524,11 +524,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730368399,
+        "lastModified": 1730537918,
-        "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=",
+        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc",
+        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
         "type": "github"
       },
       "original": {
@@ -568,11 +568,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1730137625,
+        "lastModified": 1730327045,
-        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
+        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
+        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
         "type": "github"
       },
       "original": {
@@ -600,11 +600,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1730137625,
+        "lastModified": 1730327045,
-        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
+        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
+        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
     },
     "nixpkgs-stable_4": {
       "locked": {
-        "lastModified": 1729973466,
+        "lastModified": 1730602179,
-        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
         "type": "github"
       },
       "original": {
@@ -632,11 +632,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1730200266,
+        "lastModified": 1730531603,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
         "type": "github"
       },
       "original": {
@@ -648,11 +648,11 @@
     },
     "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1730359060,
+        "lastModified": 1730642263,
-        "narHash": "sha256-Hkk0mf4pgvX9Ut0YA397nsFqMLhzFVBdFHc4PhBrxYE=",
+        "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e19cfce6f3f08d07653157d8826f5c920c770d7b",
+        "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae",
         "type": "github"
       },
       "original": {
@@ -694,11 +694,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1729951556,
+        "lastModified": 1730272153,
-        "narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=",
+        "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee",
+        "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
         "type": "github"
       },
       "original": {
@@ -792,11 +792,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730255392,
+        "lastModified": 1730514457,
-        "narHash": "sha256-9pydem8OVxa0TwjUai1PJe0yHAJw556CWCEwyoAq8Ik=",
+        "narHash": "sha256-cjFX208s9pyaOfMvF9xI6WyafyXINqdhMF7b1bMQpLI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7509d76ce2b3d22b40bd25368b45c0a9f7f36c89",
+        "rev": "1ff38ca26eb31858e4dfe7fe738b6b3ce5d74922",
         "type": "github"
       },
       "original": {
@@ -852,11 +852,11 @@
         "nixpkgs-stable": "nixpkgs-stable_4"
       },
       "locked": {
-        "lastModified": 1729999681,
+        "lastModified": 1730605784,
-        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
+        "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+        "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
         "type": "github"
       },
       "original": {

flake.nix

@@ -84,7 +84,7 @@
 
       nixosConfigurations = {
         # Desktop
-        "matt-nixos" = nixpkgs-unstable.lib.nixosSystem {
+        "matt-nixos" = nixpkgs-unstable-small.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
             inherit inputs outputs;

hosts/desktop/configuration.nix

@@ -201,6 +201,7 @@ in
       aspellDicts.en-science
       borgbackup
       clinfo
+      deja-dup
       direnv
       efibootmgr
       fixWifiScript
@@ -219,6 +220,7 @@ in
       pciutils
       # python3
       # python3Packages.requests
+      qemu_full
       rclone
       rclone-browser
       rsync

hosts/desktop/gnome/default.nix

@@ -27,6 +27,7 @@
 
     environment = {
       systemPackages = with pkgs; [
+        colloid-gtk-theme
         gnome-tweaks
         gnomeExtensions.appindicator
         gnomeExtensions.arcmenu

hosts/desktop/gnome/home.nix

@@ -8,7 +8,8 @@
       "org/gnome/desktop/interface".enable-hot-corners = false;
       "org/gnome/desktop/interface".font-antialiasing = "grayscale";
       "org/gnome/desktop/interface".font-hinting = "slight";
-      "org/gnome/desktop/interface".icon-theme = lib.mkDefault "Papirus-Dark";
+      "org/gnome/desktop/interface".gtk-theme = lib.mkDefault "Colloid-Dark";
+      "org/gnome/desktop/interface".icon-theme = lib.mkDefault "Colloid-Dark";
       "org/gnome/desktop/peripherals/mouse".accel-profile = "flat";
       "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true;
       "org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
@@ -26,6 +27,7 @@
       ];
       "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1;
       "org/gnome/shell/extensions/dash-to-panel".multi-monitors = false;
+      "org/gnome/shell/extensions/user-theme".name = lib.mkDefault "Colloid-Dark";
       "org/gtk/settings/file-chooser".clock-format = "12h";
     };
   };

hosts/nas/configuration.nix

@@ -70,6 +70,8 @@ in
       hdd5 UUID=2b4be219-613d-4512-8277-0260989d5377 none tpm2-device=auto
     '';
 
+    etc.machine-id.source = ./machine-id;
+
     # List packages installed in system profile. To search, run:
     # $ nix search wget
 

hosts/nas/impermanence.nix

@@ -37,7 +37,6 @@
       }
     ];
     files = [
-      "/etc/machine-id"
       "/var/cache-priv-key.pem"
     ];
   };

hosts/nas/machine-id

@@ -0,0 +1 @@
+57cdf5fc27f3469f80d0a339f1238aeb

hosts/nas/services.nix

@@ -28,7 +28,7 @@ in
     };
 
     adguardhome = {
-      enable = true;
+      enable = false;
       allowDHCP = true;
       port = 1880;
       openFirewall = true;

modules/samba/default.nix

@@ -38,13 +38,13 @@ in {
         hosts deny = 0.0.0.0/0
         guest account = nobody
         map to guest = bad user
+        force user = nix-apps
       '';
       shares = let
         make = name: share:
           nameValuePair "${name}" {
             path = share.sharePath;
             public = if share.enableTimeMachine then "no" else "yes";
-            private = if !share.public || share.enableTimeMachine then "yes" else "no";
             browseable = if share.browseable then "yes" else "no";
             writable = "yes";
             "read only" = if share.readOnly then "yes" else "no";
@@ -59,4 +59,5 @@ in {
       in mapAttrs' make cfg.shares;
     };
   };
-}
+}
+            # private = if !share.public || share.enableTimeMachine then "yes" else "no";