diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix index 7a31ed5..bba704f 100644 --- a/hosts/macbook/default.nix +++ b/hosts/macbook/default.nix @@ -12,6 +12,7 @@ darwin.lib.darwinSystem { gitEmail = globals.gitEmail; mailServer = globals.mailServer; dotfilesRepo = globals.dotfilesRepo; + dotfilesPath = "/Users/Noah.Masur/dev/dotfiles"; gui = { enable = true; colorscheme = globals.gui.colorscheme; diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index c34a69e..57aba43 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -1,4 +1,6 @@ { ... }: { + + services.nix-daemon.enable = true; system = { @@ -97,12 +99,12 @@ # Disable trackpad tap to click trackpad.Clicking = false; - universalaccess = { + # universalaccess = { - # Zoom in with Control + Scroll Wheel - closeViewScrollWheelToggle = true; - closeViewZoomFollowsFocus = true; - }; + # # Zoom in with Control + Scroll Wheel + # closeViewScrollWheelToggle = true; + # closeViewZoomFollowsFocus = true; + # }; # Where to save screenshots screencapture.location = "~/Downloads"; diff --git a/modules/darwin/utilities.nix b/modules/darwin/utilities.nix index 85770c7..8b38f16 100644 --- a/modules/darwin/utilities.nix +++ b/modules/darwin/utilities.nix @@ -35,8 +35,8 @@ }; - fonts.fonts = with pkgs; - [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; + # fonts.fonts = with pkgs; + # [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ]; } diff --git a/modules/mail/himalaya.nix b/modules/mail/himalaya.nix index 80497d4..92dfe5c 100644 --- a/modules/mail/himalaya.nix +++ b/modules/mail/himalaya.nix @@ -19,7 +19,7 @@ }; accounts.email = { - maildirBasePath = "/home/${config.user}/mail"; + maildirBasePath = "/Users/${config.user}/mail"; accounts = { home = let address = "${config.user}@${config.mailServer}"; in { @@ -68,7 +68,7 @@ mu.enable = false; notmuch.enable = false; passwordCommand = - "${pkgs.age}/bin/age --decrypt --identity /home/${config.user}/.ssh/id_ed25519 ${ + "${pkgs.age}/bin/age --decrypt --identity /Users/${config.user}/.ssh/id_ed25519 ${ builtins.toString ./mailpass.age }"; smtp = { diff --git a/modules/shell/fish/default.nix b/modules/shell/fish/default.nix index 3d115b8..6ee7150 100644 --- a/modules/shell/fish/default.nix +++ b/modules/shell/fish/default.nix @@ -60,7 +60,7 @@ bind yy fish_clipboard_copy bind Y fish_clipboard_copy bind -M visual y fish_clipboard_copy - bind p fish_clipboard_paste + bind -M default p fish_clipboard_paste set -g fish_vi_force_cursor set -g fish_cursor_default block set -g fish_cursor_insert line