mirror of
https://codeberg.org/leana8959/.files.git
synced 2026-02-01 22:49:41 +00:00
Compare commits
4 commits
acf4bba56d
...
2bfd250806
| Author | SHA1 | Date | |
|---|---|---|---|
| 2bfd250806 | |||
| ce446ffe39 | |||
| 9affd2771d | |||
| 895173460a |
5 changed files with 21 additions and 9 deletions
|
|
@ -8,7 +8,7 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = false;
|
enable = true;
|
||||||
|
|
||||||
policies.SearchEngines.Add = [
|
policies.SearchEngines.Add = [
|
||||||
# Forges
|
# Forges
|
||||||
|
|
|
||||||
|
|
@ -350,7 +350,7 @@ keybinds =
|
||||||
)
|
)
|
||||||
|
|
||||||
-- Launcher
|
-- Launcher
|
||||||
++ (let launchFirefox = "zen"
|
++ (let launchFirefox = "firefox"
|
||||||
launchDmenu = "dmenu_run -i -fn \"Iosevka-18\" -nb \"#36363a\" -nf \"#e2e2e4\" -sb \"#f7f7f8\" -sf \"#36363a\" -l 10"
|
launchDmenu = "dmenu_run -i -fn \"Iosevka-18\" -nb \"#36363a\" -nf \"#e2e2e4\" -sb \"#f7f7f8\" -sf \"#36363a\" -l 10"
|
||||||
lock = "xscreensaver-command -lock"
|
lock = "xscreensaver-command -lock"
|
||||||
in [ ((controlMask .|. altMask, xK_m), namedScratchpadAction myScratchpads "cmus" )
|
in [ ((controlMask .|. altMask, xK_m), namedScratchpadAction myScratchpads "cmus" )
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.zen-browser = {
|
programs.zen-browser = {
|
||||||
enable = true;
|
enable = false;
|
||||||
|
|
||||||
policies.SearchEngines.Add = [
|
policies.SearchEngines.Add = [
|
||||||
# Forges
|
# Forges
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,10 @@ in
|
||||||
"zen.view.show-newtab-button-top" = false;
|
"zen.view.show-newtab-button-top" = false;
|
||||||
"zen.view.use-single-toolbar" = false;
|
"zen.view.use-single-toolbar" = false;
|
||||||
"zen.tabs.ctrl-tab.ignore-pending-tabs" = true; # ctrl-tab ignore unloaded tabs
|
"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;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -23,14 +23,14 @@ main = do
|
||||||
) ->
|
) ->
|
||||||
manageArgs `showHelpOr` do
|
manageArgs `showHelpOr` do
|
||||||
nixpkgs <- readNixpkgsPath
|
nixpkgs <- readNixpkgsPath
|
||||||
void $ readProcessFriendly "nixos-rebuild" (action : nixosRebuildArgs nixpkgs host <> extraArgs)
|
exitWith =<< transparentProcess "nixos-rebuild" (action : nixosRebuildArgs nixpkgs host <> extraArgs)
|
||||||
|
|
||||||
( "install" : host
|
( "install" : host
|
||||||
: (partitionArgs -> (manageArgs, extraArgs))
|
: (partitionArgs -> (manageArgs, extraArgs))
|
||||||
) ->
|
) ->
|
||||||
manageArgs `showHelpOr` do
|
manageArgs `showHelpOr` do
|
||||||
nixpkgs <- readNixpkgsPath
|
nixpkgs <- readNixpkgsPath
|
||||||
void $ readProcessFriendly "nixos-install" (nixosInstallArgs nixpkgs host <> extraArgs)
|
exitWith =<< transparentProcess "nixos-install" (nixosInstallArgs nixpkgs host <> extraArgs)
|
||||||
|
|
||||||
_ -> putStr help >> exitFailure
|
_ -> putStr help >> exitFailure
|
||||||
|
|
||||||
|
|
@ -79,8 +79,10 @@ quote x = "\"" <> x <> "\""
|
||||||
blueForeground :: String -> String
|
blueForeground :: String -> String
|
||||||
blueForeground x = "\ESC[34m" <> x <> "\ESC[0m"
|
blueForeground x = "\ESC[34m" <> x <> "\ESC[0m"
|
||||||
|
|
||||||
readProcessFriendly :: String -> [String] -> IO String
|
-- |
|
||||||
readProcessFriendly cmdName args = do
|
-- Run with a shared std{in,out,err}
|
||||||
|
transparentProcess :: String -> [String] -> IO ExitCode
|
||||||
|
transparentProcess cmdName args = do
|
||||||
hPutStrLn stderr
|
hPutStrLn stderr
|
||||||
$ "Executing: " <> (quote . blueForeground) (showCommandForUser cmdName args)
|
$ "Executing: " <> (quote . blueForeground) (showCommandForUser cmdName args)
|
||||||
(_, _, _, pid) <- createProcess
|
(_, _, _, pid) <- createProcess
|
||||||
|
|
@ -89,8 +91,13 @@ readProcessFriendly cmdName args = do
|
||||||
, std_out = UseHandle stdout
|
, std_out = UseHandle stdout
|
||||||
, std_err = UseHandle stderr
|
, std_err = UseHandle stderr
|
||||||
}
|
}
|
||||||
_ <- waitForProcess pid
|
waitForProcess pid
|
||||||
pure ""
|
|
||||||
|
readProcessFriendly :: String -> [String] -> String -> IO String
|
||||||
|
readProcessFriendly cmdName args inp = do
|
||||||
|
hPutStrLn stderr
|
||||||
|
$ "Executing: " <> (quote . blueForeground) (showCommandForUser cmdName args)
|
||||||
|
readProcess cmdName args inp
|
||||||
|
|
||||||
readNixpkgsPath :: IO StorePath
|
readNixpkgsPath :: IO StorePath
|
||||||
readNixpkgsPath =
|
readNixpkgsPath =
|
||||||
|
|
@ -100,5 +107,6 @@ readNixpkgsPath =
|
||||||
, "-E"
|
, "-E"
|
||||||
, "let sources = import ./npins; in sources.nixpkgs.outPath"
|
, "let sources = import ./npins; in sources.nixpkgs.outPath"
|
||||||
]
|
]
|
||||||
|
""
|
||||||
where
|
where
|
||||||
clean = filter (\c -> c /= '\n' && c /= '"')
|
clean = filter (\c -> c /= '\n' && c /= '"')
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue