diff --git a/flake.lock b/flake.lock index d0cd4ead..9246df25 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722001358, - "narHash": "sha256-moi3BX2YMApVwPzkABzlWuLzKiyF7MW6DyIikkvYIHs=", + "lastModified": 1723035737, + "narHash": "sha256-zwU15+2G4i+dHBXacpen+gknrysAmZSmNCDks3v5KBc=", "owner": "agda", "repo": "agda", - "rev": "5da3f3f2be5fc0d4ed6a2b828bd751e44e29292f", + "rev": "fb700aab8fab445848c63214f29989b5e8614eff", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "astro-nvim": { "flake": false, "locked": { - "lastModified": 1721995845, - "narHash": "sha256-FHBpjFPnuhC3jv+rhPJUfTyT+OfxaOmqWT60iRryQ0s=", + "lastModified": 1723124196, + "narHash": "sha256-w3y5S24N85OzqZt8LGPt0YQVHNRClwnK6ea871n0hPg=", "owner": "AstroNvim", "repo": "AstroNvim", - "rev": "daf0b604e8e1dabbe4d90e378c781a877b7ca966", + "rev": "b0758c334eb6f5074222d4811fee9075604d1066", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1722997334, + "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", "owner": "Stonks3141", "repo": "ctp-nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1722019186, - "narHash": "sha256-w2r2VGZrh5pT6dNntlCKAlF7aFs5B3prLQKPNJCj8C0=", + "lastModified": 1723156315, + "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", "owner": "cachix", "repo": "devenv", - "rev": "075c114280751f956335333179304d14ae01aedc", + "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1722157696, - "narHash": "sha256-UPzBMBUF89LzQ3zc7WY/bpw18o4pDOZInYfFM0J77ao=", + "lastModified": 1723137044, + "narHash": "sha256-cvEsedBp7sqKxR/DpQ+G4sR3p/G/tqBwSffBVDtqUow=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "443b6591a1640ef4bf21dd8d29a0d8da6e401696", + "rev": "719fcbc0392e846cdd37f230f5cd82bdda58f71c", "type": "github" }, "original": { @@ -236,11 +236,11 @@ "emacs-plus": { "flake": false, "locked": { - "lastModified": 1721032571, - "narHash": "sha256-jKTOwbm0cNp8D5pinF4wtn5beQRlLmsnClg+8ooDkX0=", + "lastModified": 1722838585, + "narHash": "sha256-wjimri+UcqSSiCO3nNU/3wdxuXW3p3LB6nZvoJnKssc=", "owner": "d12frosted", "repo": "homebrew-emacs-plus", - "rev": "323d86b2685a2420341e648bbc6c7b7c02029fa9", + "rev": "ff462afe5e971411e9738305ac6afd67a0e041bb", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1722128008, - "narHash": "sha256-/5je8gba7DLdOc/+egLQVJtbTctbuwIP4w8Cz7wAvl0=", + "lastModified": 1722991853, + "narHash": "sha256-B3HAbnP81/MRbmI+zuQL1MO/X7NETCGoYO9VNqbIm3o=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "269d84cf5630803441099787d85ec8792ccccdc7", + "rev": "8e73a2ded29253ae288b00bf4a03d5647adb72b8", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -580,11 +580,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1721530802, - "narHash": "sha256-eUMmQKXjt4WQq+IBscftg/Y9bXWiOYhasfeH5Yb9Psc=", + "lastModified": 1722810187, + "narHash": "sha256-mbfL4ytGqVEjqcuVizgOqYBUNf0kAUFWrn+h0dzRn9I=", "owner": "srid", "repo": "haskell-flake", - "rev": "f8f38ecd259338167cc0c85fd541479297a315af", + "rev": "dc6c8caa8c77b1e55c2af6242ba0f3e8e18d8745", "type": "github" }, "original": { @@ -636,16 +636,16 @@ ] }, "locked": { - "lastModified": 1722119539, - "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", - "owner": "nix-community", + "lastModified": 1723229525, + "narHash": "sha256-L563623XEXEBeqwMnptOx/Hq26Gy8vS7CjGsmI+meVc=", + "owner": "yuanwang-wf", "repo": "home-manager", - "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", + "rev": "7c9cadd389167acaf1fa1887d3486a09f25a0e2b", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "master", + "owner": "yuanwang-wf", + "ref": "fix-darwin-firefox", "repo": "home-manager", "type": "github" } @@ -655,11 +655,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1722124820, - "narHash": "sha256-0/niQ0qWzGesqWIe/NZ2SD0Pdvk3GRsY1mT24eFMpt8=", + "lastModified": 1723147219, + "narHash": "sha256-0AcmI3gerfGXMq5xjlA6qh0kyJcM3AhzOqO424SjDTk=", "owner": "StevenBlack", "repo": "hosts", - "rev": "b5235d6bd3562ffb459c9172847e40dea1bfe3c0", + "rev": "7ebdf6905bb84ce1844f010e728640d28e23b2be", "type": "github" }, "original": { @@ -743,11 +743,11 @@ ] }, "locked": { - "lastModified": 1722082646, - "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -902,11 +902,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1722170637, - "narHash": "sha256-XfEF2/KJhwleDbd/GcYBvYrQtJRcqEQGX77k6YqCQX4=", + "lastModified": 1723158063, + "narHash": "sha256-NUytLZ5S9e6hSXT26vkzNVLAspSCmGwv56B70OLwN/I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "257e0b2ac1a518f4c08467b4b44e6027341cb4a5", + "rev": "c3f597a01377828852d50675d3adb2d431e565e0", "type": "github" }, "original": { @@ -966,11 +966,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": { @@ -998,11 +998,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": { @@ -1030,11 +1030,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1109,11 +1109,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722141560, - "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=", + "lastModified": 1723019560, + "narHash": "sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160", + "rev": "f5129fb42b9c262318130a97b47516946da3e7d7", "type": "github" }, "original": { @@ -1187,11 +1187,11 @@ }, "nur": { "locked": { - "lastModified": 1722167240, - "narHash": "sha256-o5DekEM13zsldIy9znDUpNAz6zHay1qLlkf0zZtK/A8=", + "lastModified": 1723160234, + "narHash": "sha256-6TbIYokYNcLnyXlSEGDhoodYmYxLpBtcYu13OPgoyNU=", "owner": "nix-community", "repo": "NUR", - "rev": "a89a3198c5d2d92073a71bfde50944567f04d280", + "rev": "f6115c6b89b9cfe47f4ee38be369479a7db4ae24", "type": "github" }, "original": { @@ -1285,11 +1285,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1723056346, + "narHash": "sha256-YpzywjTAUHRRHcO8zz9x2gYqJ0JmZlcB9+RaUvD89qM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "3c977f1c9930f54066c085305b4b2291385e7a73", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1721802603, - "narHash": "sha256-TbCSht10gPCF84/HpJs2Ji/AiqfCQiF+oUnUiLKVlWg=", + "lastModified": 1723012587, + "narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=", "owner": "roc-lang", "repo": "roc", - "rev": "d5db3137a3d8da46f92c31b6bf088bc495f759c2", + "rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb", "type": "github" }, "original": { @@ -1541,11 +1541,11 @@ ] }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 875b5165..10e791b4 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,9 @@ nix-colors.url = "github:misterio77/nix-colors"; hosts.url = "github:StevenBlack/hosts"; flake-utils.url = "github:numtide/flake-utils"; + # https://github.com/nix-community/home-manager/issues/5717 home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:yuanwang-wf/home-manager/fix-darwin-firefox"; inputs.nixpkgs.follows = "nixpkgs"; }; astro-nvim = { diff --git a/hosts/wk01174.nix b/hosts/wk01174.nix index 547dd7f7..add68636 100644 --- a/hosts/wk01174.nix +++ b/hosts/wk01174.nix @@ -40,7 +40,6 @@ brew = { enable = true; # taps = [ "homebrew/core" "homebrew/cask" ]; - casks = [ "docker" "google-chrome" @@ -48,16 +47,10 @@ "sloth" "mysql-shell" "viscosity" - "vial" "brave-browser" - "launchcontrol" ]; brews = [ "redis" - #"frugal" - "picat" - # "mit-scheme" - # https://formulae.brew.sh/formula/docker-compose # mkdir -p ~/.docker/cli-plugins # ln -sfn $HOMEBREW_PREFIX/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose "docker-compose" @@ -65,7 +58,8 @@ }; browsers.firefox = { enable = true; - pkg = pkgs.firefox-bin; + # pkg = pkgs.runCommand "firefox-0.0.0" { } "mkdir $out"; + pkg = pkgs.firefox-beta-bin; }; editors.emacs = { enable = true; diff --git a/modules/browsers/firefox.nix b/modules/browsers/firefox.nix index 20c7e70d..723ad633 100644 --- a/modules/browsers/firefox.nix +++ b/modules/browsers/firefox.nix @@ -22,10 +22,6 @@ in config = mkIf cfg.enable { home-manager.users.${config.my.username} = { home = { - file."startpage".source = ./startpage; - packages = [ - pkgs.tridactyl-native - ]; file."${profilesPath}/home/chrome".source = "${inputs.shy-fox}/chrome"; }; programs.firefox.enable = true; @@ -52,12 +48,14 @@ in kagi-search userchrome-toggle-extended sidebery + # https://addons.mozilla.org/api/v5/addons/search/?q=mtab (buildFirefoxXpiAddon { pname = "mtab"; - version = "1.3.5"; + version = "1.3.7"; addonId = "contact@maxhu.dev"; - url = "https://addons.mozilla.org/firefox/downloads/file/4330262/mtab-1.3.5.xpi"; - sha256 = "cd2d440e7cae56e09ae6ef9250e8ddcb1550dd9f4055cc8fd84cbd387694a07f"; + url = "https://addons.mozilla.org/firefox/downloads/file/4333689/mtab-1.3.7.xpi"; + #sha256 = lib.fakeSha256; + sha256 = "sha256-kKh6VBoqB4ODmKowyRaWjsazm4GQpk5gyzZdrLTi+mc="; meta = with lib; { homepage = "https://github.com/maxhu08/mtab"; @@ -68,7 +66,6 @@ in ]; platforms = platforms.all; }; - }) ]; @@ -108,11 +105,7 @@ in # }; }; }; - # userChrome = '' - # *{font-size: 18px !important; - # } - # ''; - # https://github.com/arkenfox/user.js/blob/master/user.js + # # https://github.com/arkenfox/user.js/blob/master/user.js settings = { # ratio to enlarge default 96 pixes per inch 1.5 gives 50% enlargement # "layout.css.devPixelsPerPx" = "2.0"; @@ -126,7 +119,7 @@ in "privacy.donottrackheader.enabled" = true; "privacy.donottrackheader.value" = 1; "privacy.purge_trackers.enabled" = true; - "browser.startup.homepage" = "https://yuanwang.dev/"; + #"browser.startup.homepage" = "https://yuanwang.dev/"; "browser.search.region" = "CA"; "browser.search.countryCode" = "CA"; "browser.search.isUS" = false; @@ -166,9 +159,9 @@ in # Disable the "new tab page" feature and show a blank tab instead # https://wiki.mozilla.org/Privacy/Reviews/New_Tab # https://support.mozilla.org/en-US/kb/new-tab-page-show-hide-and-customize-top-sites#w_how-do-i-turn-the-new-tab-page-off - "browser.newtabpage.enabled" = false; + # "browser.newtabpage.enabled" = false; # "browser.newtab.url" = "about:blank"; - "browser.newtab.url" = "yuanwang.dev"; + # "browser.newtab.url" = "yuanwang.dev"; # Disable Activity Stream # https://wiki.mozilla.org/Firefox/Activity_Stream # Disable new tab tile ads & preload @@ -212,8 +205,8 @@ in # Show whole URL in address bar "browser.urlbar.trimURLs" = false; # Disable some not so useful functionality. - "browser.disableResetPrompt" = - true; # "Looks like you haven't started Firefox in a while." + "browser.disableResetPrompt" = true; + # "Looks like you haven't started Firefox in a while." "browser.onboarding.enabled" = false; # "New to Firefox? Let's get started!" tour "browser.aboutConfig.showWarning" = @@ -313,10 +306,9 @@ in # shyfox ## Fill SVG Color "svg.context-properties.content.enabled" = true; - ## CSS's `:has()` selector + # ## CSS's `:has()` selector "layout.css.has-selector.enabled" = true; }; - }; }; }; diff --git a/modules/macos_packages.nix b/modules/macos_packages.nix index c78ea8a7..0445e1aa 100644 --- a/modules/macos_packages.nix +++ b/modules/macos_packages.nix @@ -2,7 +2,7 @@ with pkgs; [ # alerter - neofetch + fastfetch pinentry_mac calibre_mac ] diff --git a/modules/wm/yabai.nix b/modules/wm/yabai.nix index 7c0a1386..5997f44f 100644 --- a/modules/wm/yabai.nix +++ b/modules/wm/yabai.nix @@ -9,13 +9,14 @@ with lib; let cfg = config.modules.wm.yabai; emacsEveryWhere = - ''${pkgs.emacs}/bin/emacsclient --eval "(emacs-everywhere)"''; - + ''emacsclient --eval "(emacs-everywhere)"''; + emacsClient = "emacsclient -c -a 'emacs'"; # to escape $ propertly, config uses that create fsspace moveConfig = builtins.readFile ./skhdrc; # it is nice to reference pkgs full path laucherConfig = '' - shift + ctrl + alt - e: ${emacsEveryWhere} + shift + ctrl + alt - e: ${emacsClient} + shift + ctrl + alt + cmd - e: ${emacsEveryWhere} shift + ctrl + alt - x: org-capture -k n shift + ctrl + alt - f : open -n -a ~/.nix-profile/Applications/Firefox.app shift + ctrl + alt - return : open -n -a ~/.nix-profile/Applications/Alacritty.app