flake.lock

@@ -300,11 +300,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1681737997,
-        "narHash": "sha256-pHhjgsIkRMu80LmVe8QoKIZB6VZGRRxFmIvsC5S89k4=",
+        "lastModified": 1681648924,
+        "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f00994e78cd39e6fc966f0c4103f908e63284780",
+        "rev": "f294325aed382b66c7a188482101b0f336d1d7db",
         "type": "github"
       },
       "original": {

hosts/lookingglass/default.nix

@@ -18,7 +18,6 @@ darwin.lib.darwinSystem {
     })
     home-manager.darwinModules.home-manager
     {
-      nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
       networking.hostName = "lookingglass";
       identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
       gui.enable = true;
@@ -27,6 +26,9 @@ darwin.lib.darwinSystem {
         dark = true;
       };
       mail.user = globals.user;
+      nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
+      # Set registry to flake packages, used for nix X commands
+      nix.registry.nixpkgs.flake = nixpkgs;
       charm.enable = true;
       neovim.enable = true;
       mail.enable = true;

modules/common/default.nix

@@ -81,6 +81,7 @@
 
       gc = {
         automatic = true;
+        dates = "weekly";
         options = "--delete-older-than 7d";
       };
 

modules/common/neovim/config/lsp.nix

@@ -33,7 +33,7 @@
         sources = {
             require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
             require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
-            require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+            require("null-ls").builtins.diagnostics.flake8.with({ command = "${pkgs.python310Packages.flake8}/bin/flake8" }),
             require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
             require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
             require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),

modules/common/shell/nixpkgs.nix

@@ -70,7 +70,7 @@
     # Set registry to this flake's packages, used for nix X commands
     registry.nixpkgs.to = {
       type = "path";
-      path = builtins.toString pkgs.path;
+      path = pkgs.path;
     };
 
   };

modules/darwin/system.nix

@@ -4,13 +4,6 @@
 
     services.nix-daemon.enable = true;
 
-    # This setting only applies to Darwin, different on NixOS
-    nix.gc.interval = {
-      Hour = 12;
-      Minute = 15;
-      Day = 1;
-    };
-
     environment.shells = [ pkgs.fish ];
 
     security.pam.enableSudoTouchIdAuth = true;

modules/nixos/hardware/networking.nix

@@ -12,16 +12,11 @@
     networking.firewall.allowPing = lib.mkIf config.server true;
 
     # DNS service discovery
-    services.avahi = {
-      enable = true;
-      domainName = "local";
-      publish = {
-        enable = true;
-        addresses = true;
-        domain = true;
-        workstation = true;
-      };
-    };
+    services.avahi.enable = true;
+    # services.avahi.public.enable = true;
+    # services.avahi.public.domain = true;
+    # services.avahi.public.addresses = true;
+    # services.avahi.domainName = "local";
 
     # Resolve local hostnames using Avahi DNS
     services.avahi.nssmdns = true;

modules/nixos/system/default.nix

@@ -8,9 +8,6 @@
     system.stateVersion =
       config.home-manager.users.${config.user}.home.stateVersion;
 
-    # This setting only applies to NixOS, different on Darwin
-    nix.gc.dates = "weekly";
-
   };
 
 }