Compare commits

..

4 Commits

Author SHA1 Message Date
Noah Masur
a2bbcf7f55 try reenabling avahi
used public instead of publish accidentally
2023-04-19 16:50:19 -04:00
Noah Masur
f388aee56c replace flake8 with ruff 2023-04-19 16:50:05 -04:00
Noah Masur
958ab8a96b update lockfile 2023-04-19 16:49:55 -04:00
Noah Masur
3059241c1c fix: builtins.storePath issue on mac 2023-04-19 16:49:40 -04:00
8 changed files with 26 additions and 14 deletions

View File

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

View File

@ -18,6 +18,7 @@ darwin.lib.darwinSystem {
}) })
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
networking.hostName = "lookingglass"; networking.hostName = "lookingglass";
identityFile = "/Users/Noah.Masur/.ssh/id_ed25519"; identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
gui.enable = true; gui.enable = true;
@ -26,9 +27,6 @@ darwin.lib.darwinSystem {
dark = true; dark = true;
}; };
mail.user = globals.user; 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; charm.enable = true;
neovim.enable = true; neovim.enable = true;
mail.enable = true; mail.enable = true;

View File

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

View File

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

View File

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

View File

@ -4,6 +4,13 @@
services.nix-daemon.enable = true; 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 ]; environment.shells = [ pkgs.fish ];
security.pam.enableSudoTouchIdAuth = true; security.pam.enableSudoTouchIdAuth = true;

View File

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

View File

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