diff --git a/nix/configurations/vanadium/home/firefox.nix b/nix/configurations/vanadium/home/firefox.nix index 87135e74..af525054 100644 --- a/nix/configurations/vanadium/home/firefox.nix +++ b/nix/configurations/vanadium/home/firefox.nix @@ -8,7 +8,7 @@ let in { programs.firefox = { - enable = true; + enable = false; policies.SearchEngines.Add = [ # Forges diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index 2a11cb98..32590777 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -350,7 +350,7 @@ keybinds = ) -- Launcher - ++ (let launchFirefox = "firefox" + ++ (let launchFirefox = "zen" launchDmenu = "dmenu_run -i -fn \"Iosevka-18\" -nb \"#36363a\" -nf \"#e2e2e4\" -sb \"#f7f7f8\" -sf \"#36363a\" -l 10" lock = "xscreensaver-command -lock" in [ ((controlMask .|. altMask, xK_m), namedScratchpadAction myScratchpads "cmus" ) diff --git a/nix/configurations/vanadium/home/zen-browser.nix b/nix/configurations/vanadium/home/zen-browser.nix index 0e2ecd9f..c658d744 100644 --- a/nix/configurations/vanadium/home/zen-browser.nix +++ b/nix/configurations/vanadium/home/zen-browser.nix @@ -8,7 +8,7 @@ let in { programs.zen-browser = { - enable = false; + enable = true; policies.SearchEngines.Add = [ # Forges diff --git a/nix/homeModules/common/zen-browser.nix b/nix/homeModules/common/zen-browser.nix index 4a691331..a9cecff2 100644 --- a/nix/homeModules/common/zen-browser.nix +++ b/nix/homeModules/common/zen-browser.nix @@ -32,10 +32,6 @@ in "zen.view.show-newtab-button-top" = false; "zen.view.use-single-toolbar" = false; "zen.tabs.ctrl-tab.ignore-pending-tabs" = true; # ctrl-tab ignore unloaded tabs - - # https://github.com/zen-browser/desktop/discussions/12025 - # This makes tabs sync across windows, which as annoying af - "zen.window-sync.enabled" = false; }; } ]; diff --git a/nix/packages/by-name/manage/src/Main.hs b/nix/packages/by-name/manage/src/Main.hs index 52e2b7b5..dc112e47 100755 --- a/nix/packages/by-name/manage/src/Main.hs +++ b/nix/packages/by-name/manage/src/Main.hs @@ -23,14 +23,14 @@ main = do ) -> manageArgs `showHelpOr` do nixpkgs <- readNixpkgsPath - exitWith =<< transparentProcess "nixos-rebuild" (action : nixosRebuildArgs nixpkgs host <> extraArgs) + void $ readProcessFriendly "nixos-rebuild" (action : nixosRebuildArgs nixpkgs host <> extraArgs) ( "install" : host : (partitionArgs -> (manageArgs, extraArgs)) ) -> manageArgs `showHelpOr` do nixpkgs <- readNixpkgsPath - exitWith =<< transparentProcess "nixos-install" (nixosInstallArgs nixpkgs host <> extraArgs) + void $ readProcessFriendly "nixos-install" (nixosInstallArgs nixpkgs host <> extraArgs) _ -> putStr help >> exitFailure @@ -79,10 +79,8 @@ quote x = "\"" <> x <> "\"" blueForeground :: String -> String blueForeground x = "\ESC[34m" <> x <> "\ESC[0m" --- | --- Run with a shared std{in,out,err} -transparentProcess :: String -> [String] -> IO ExitCode -transparentProcess cmdName args = do +readProcessFriendly :: String -> [String] -> IO String +readProcessFriendly cmdName args = do hPutStrLn stderr $ "Executing: " <> (quote . blueForeground) (showCommandForUser cmdName args) (_, _, _, pid) <- createProcess @@ -91,13 +89,8 @@ transparentProcess cmdName args = do , std_out = UseHandle stdout , std_err = UseHandle stderr } - waitForProcess pid - -readProcessFriendly :: String -> [String] -> String -> IO String -readProcessFriendly cmdName args inp = do - hPutStrLn stderr - $ "Executing: " <> (quote . blueForeground) (showCommandForUser cmdName args) - readProcess cmdName args inp + _ <- waitForProcess pid + pure "" readNixpkgsPath :: IO StorePath readNixpkgsPath = @@ -107,6 +100,5 @@ readNixpkgsPath = , "-E" , "let sources = import ./npins; in sources.nixpkgs.outPath" ] - "" where clean = filter (\c -> c /= '\n' && c /= '"')