diff --git a/flake.lock b/flake.lock index 4e732115..90a8ab37 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1666989765, - "narHash": "sha256-bPwGXizMQnXxEsKt1n0lGGB8kiaXhmehu1pSy0VwCow=", + "lastModified": 1667073293, + "narHash": "sha256-dXB0vo7MfwxttoOz0X7w4oLoABs+3HQc0xcC3IAPJYs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "87fd982e510d78c7ed61df5a0e339fe57f858f87", + "rev": "d078c99b943d96fdffe831dfb9ea1cbfca57a357", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1666903647, - "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=", + "lastModified": 1666990295, + "narHash": "sha256-JPMTX8W36IPV1jmKV1qEhNBI4MbIPYsnccWyTUlSiG0=", "owner": "nix-community", "repo": "home-manager", - "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745", + "rev": "423211401c245934db5052e3867cac704f658544", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666869603, - "narHash": "sha256-3V53or4Vpu4+LrGfGSh3T2V8+qf5RP6nRuex9GywkwE=", + "lastModified": 1666959691, + "narHash": "sha256-TRpWA3t8ata79HOGtFd5dDCl1kJQmIE16PDF53/Hcxo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2001e2b31c565bcdf7bc13062b8d7cfccaca05b8", + "rev": "448a599c49978c2794401bfc3a2e1fba1a8663be", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1666988888, - "narHash": "sha256-Y8KEhamUsCIGdHaGUn8WvgO2SSRRcTswaAxrV9LO3hs=", + "lastModified": 1667076996, + "narHash": "sha256-qU0Wwey2+Bp9fxjcetPzIXGNKJWHaNHrZOTPSrMSUzg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "39b10ad86715c0afac8cccfaf58f6b6aacbfb0b6", + "rev": "3fc1cf0d0f29211ddc0c3c46437c753cb68d16c5", "type": "github" }, "original": { diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix index 5aebd70e..3e2aec81 100644 --- a/hosts/daedalus/default.nix +++ b/hosts/daedalus/default.nix @@ -48,13 +48,6 @@ in #}; }; - launchd.user.agents.emacsdaemon = { - script = "${myEmacs}/Applications/Emacs.app/Contents/MacOS/Emacs --daemon"; - serviceConfig.RunAtLoad = true; - serviceConfig.UserName = "ragon"; - serviceConfig.KeepAlive = true; - serviceConfig.WorkingDirectory = "/Users/ragon"; - }; programs.gnupg.agent.enable = true; home-manager.users.ragon = { pkgs, lib, inputs, config, ... }: { diff --git a/hosts/daedalus/hammerspoon.lua b/hosts/daedalus/hammerspoon.lua index 43351128..20321226 100644 --- a/hosts/daedalus/hammerspoon.lua +++ b/hosts/daedalus/hammerspoon.lua @@ -279,8 +279,8 @@ hs.hotkey.bind(modifiers.hyper, hs.keycodes.map.delete, function() hs.caffeinate hs.hotkey.bind(modifiers.hyper, "a", function() showHideBundleId(bundleID.activityMonitor) end) hs.hotkey.bind(modifiers.hyper, "c", function() showHideBundleId(bundleID.safari) end) hs.hotkey.bind(modifiers.hyper, "f", function() showHideBundleId(bundleID.faclieThings) end) -hs.hotkey.bind(modifiers.hyper, "e", function() hs.task.new("@myEmacs@/bin/emacsclient", nil, function() return false end, {"-c"}):start() end) -hs.hotkey.bind(modifiers.hyper, "i", function() hs.task.new("@myEmacs@/bin/emacsclient", nil, function() return false end, {"--eval", "(emacs-everywhere)"}):start() end) +hs.hotkey.bind(modifiers.hyper, "e", function() hs.task.new("@myEmacs@/bin/emacsclient", nil, function() return false end, {"-c", "-a", ""}):start() end) +hs.hotkey.bind(modifiers.hyper, "i", function() hs.task.new("@myEmacs@/bin/emacsclient", nil, function() return false end, {"-a", "", "--eval", "(emacs-everywhere)"}):start() end) hs.hotkey.bind(modifiers.hyper, "p", function() showHideBundleId(bundleID.timeular) end) hs.hotkey.bind(modifiers.hyper, "b", function() showHideBundleId(bundleID.bitwarden) end) hs.hotkey.bind(modifiers.hyper, "t", function() showHideBundleId(bundleID.iterm) end) diff --git a/nixos-modules/services/nginx.nix b/nixos-modules/services/nginx.nix index 0cf37784..325100c8 100644 --- a/nixos-modules/services/nginx.nix +++ b/nixos-modules/services/nginx.nix @@ -13,6 +13,7 @@ in networking.firewall.allowedTCPPorts = [ 80 443 ]; services.nginx = { enable = true; + package = (pkgs.nginxStable.override { openssl = pkgs.openssl_1_1; }); recommendedProxySettings = true; recommendedTlsSettings = true; recommendedGzipSettings = true;