zamn

flake.lock

@@ -119,11 +119,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1656906257,
+        "lastModified": 1657470464,
-        "narHash": "sha256-+vM3IYpFUOr/uECKHsDLV5Y/1ngE4X2KDRjJ0tQdkDQ=",
+        "narHash": "sha256-eMA+/7XzUJpCuDJZRPc/0OMWA6CNisDLSZh3bFYCybo=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "e58d28a9728fd5d451c98c48bd20c57fb9eec7dc",
+        "rev": "0cb0c306183be94b9d42c3fae22b805850f87584",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1656927578,
+        "lastModified": 1657396086,
-        "narHash": "sha256-ZSFrM/1PlJOqCb3mN88ZUh9dkQvNLU/nkoQ2tu02/FM=",
+        "narHash": "sha256-4cQ6hEuewWoFkTBlu211JGxPQQ1Zyli8oEq1cu7cVeA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f2445620d177e295e711c1b2bc6c01ed6df26c16",
+        "rev": "c645cc9f82c7753450d1fa4d1bc73b64960a9d7a",
         "type": "github"
       },
       "original": {
@@ -162,11 +162,11 @@
         "wlroots": "wlroots"
       },
       "locked": {
-        "lastModified": 1656950133,
+        "lastModified": 1657572680,
-        "narHash": "sha256-FerRg4+W3Xy+MVBmSBBERLFuJ0YWPWKf7fcL3k3TqLE=",
+        "narHash": "sha256-NOy0iHEnOcL5yAA7fWXni++axbNSFaYDxLeAkmPtZaY=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "beef23cee5cdc47142da50bf029f52bdff192025",
+        "rev": "676e4c36c53c991f6950a0c51fbe7b41ee9a4db2",
         "type": "github"
       },
       "original": {
@@ -234,11 +234,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656753965,
+        "lastModified": 1657447684,
-        "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
+        "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
+        "rev": "5f43d8b088d3771274bcfb69d3c7435b1121ac88",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1656928701,
+        "lastModified": 1657563923,
-        "narHash": "sha256-fQWedhQM0NuxgEE7ZRxjRPkXxZocYxSAsjg8xrQ4xzU=",
+        "narHash": "sha256-gvouxQe93ynZzlUWBxGbk7TJRzAQ5w3wiyNRYODiFJM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9c99082a18ebf177d7210aa391bff308027b9cbc",
+        "rev": "ba9415d7c8ad896048d4d54d770f2d0c45791d1a",
         "type": "github"
       },
       "original": {

hosts/lungmen/default.nix

@@ -70,7 +70,7 @@ in {
     algorithm = "zstd";
   };
 
-  nix.maxJobs = lib.mkDefault 4;
+  nix.settings.max-jobs = lib.mkDefault 4;
   security = {
     pam.loginLimits = [
       {

modules/base/nix.nix

@@ -20,10 +20,12 @@
       extra-experimental-features = nix-command flakes
       builders-use-substitutes = true
     '';
-    useSandbox = true;
-    allowedUsers = ["@wheel"];
-    trustedUsers = ["root" "@wheel"];
-    autoOptimiseStore = true;
     nixPath = ["nixpkgs=${inputs.nixpkgs}" "home-manager=${inputs.home}"];
   };
+  nix.settings = {
+    sandbox = true;
+    allowed-users = ["@wheel"];
+    trusted-users = ["root" "@wheel"];
+    auto-optimise-store = true;
+  };
 }

modules/cachix/default.nix

@@ -9,5 +9,5 @@
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
 in {
   inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
+  nix.settings.substituters = ["https://cache.nixos.org/"];
 }

modules/cachix/helix.nix

@@ -1,6 +1,6 @@
 {
-  nix = {
+  nix.settings = {
-    binaryCaches = ["https://helix.cachix.org"];
+    substituters = ["https://helix.cachix.org"];
-    binaryCachePublicKeys = ["helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="];
+    trusted-public-keys = ["helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="];
   };
 }

modules/cachix/nix-community.nix

@@ -1,6 +1,6 @@
 {
-  nix = {
+  nix.settings = {
-    binaryCaches = ["https://nix-community.cachix.org"];
+    substituters = ["https://nix-community.cachix.org"];
-    binaryCachePublicKeys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
+    trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
   };
 }

users/patriot/default.nix

@@ -41,7 +41,8 @@ in {
     # this is needed for impermanence
     fuse.userAllowOther = true;
     adb.enable = true;
-    steam.enable = true;
+    steam.enable = false;
+    kdeconnect.enable = true;
     # gnome stuffs
     seahorse.enable = true;
     hyprland.enable = true;
@@ -97,7 +98,7 @@ in {
           "Downloads"
           "proj"
           # "smos"
-          ".steam"
+          # ".steam"
           ".wine"
           # ssh / gpg / keys
           ".ssh"
@@ -111,7 +112,7 @@ in {
         ++ mkPaths ".local/share" [
           "direnv"
           "zsh"
-          "Steam"
+          # "Steam"
           "keyrings"
           "lutris"
           "PolyMC"
@@ -119,6 +120,7 @@ in {
         ++ mkPaths ".config" [
           "lutris"
           "discord"
+          "kdeconnect"
         ];
       files = l.flatten [
         ".config/wallpaper"
@@ -172,7 +174,9 @@ in {
           # polymc
           cloudflared
           lutris
-          (pkgs.callPackage pkgs.discord.override {withOpenASAR = true;})
+          (pkgs.discord.override {
+            withOpenASAR = true;
+          })
         ];
       shellAliases =
         nixosConfig.environment.shellAliases