diff --git a/hm/common.nix b/hm/common.nix index 94ef5b3..f8afb9f 100644 --- a/hm/common.nix +++ b/hm/common.nix @@ -19,6 +19,8 @@ let in { + nixpkgs.config.allowUnfree = true; + programs = let commonRc = lib.strings.concatLines ([ diff --git a/hm/desktop.nix b/hm/desktop.nix index d022f51..e78d47b 100644 --- a/hm/desktop.nix +++ b/hm/desktop.nix @@ -57,7 +57,7 @@ { modifier = "Mod1"; # FIXME Mod1 for VM, Mod4 for not VM terminal = "alacritty"; - bars = []; # Using frobar + bars = [ ]; # Using frobar colors = let ignore = "#ff00ff"; in with config.lib.stylix.colors.withHashtag; lib.mkForce { focused = { border = base0B; background = base0B; text = base00; indicator = base00; childBorder = base0B; }; @@ -348,17 +348,28 @@ # TODO Unbind d and T (?) }; }; - loadAutoconfig = true; # FIXME Salvage stuff from autoconfig.yml + loadAutoconfig = true; searchEngines = rec { DEFAULT = ecosia; + alpinep = "https://pkgs.alpinelinux.org/packages?name={}&branch=edge"; ampwhat = "http://www.amp-what.com/unicode/search/{}"; + arch = "https://wiki.archlinux.org/?search={}"; + archp = "https://www.archlinux.org/packages/?q={}"; + aur = "https://aur.archlinux.org/packages/?K={}"; aw = ampwhat; ddg = duckduckgo; + dockerhub = "https://hub.docker.com/search/?isAutomated=0&isOfficial=0&page=1&pullCount=0&q={}&starCount=0"; duckduckgo = "https://duckduckgo.com/?q={}&ia=web"; ecosia = "https://www.ecosia.org/search?q={}"; + gfr = "https://www.google.fr/search?hl=fr&q={}"; + g = google; + gh = github; + gi = "http://images.google.com/search?q={}"; + giphy = "https://giphy.com/search/{}"; github = "https://github.com/search?q={}"; google = "https://www.google.fr/search?q={}"; - g = google; + invidious = "https://invidious.frogeye.fr/search?q={}"; + inv = invidious; npm = "https://www.npmjs.com/search?q={}"; q = qwant; qwant = "https://www.qwant.com/?t=web&q={}"; @@ -372,16 +383,23 @@ show = "never"; tabs_are_windows = true; }; - url = { + url = rec { open_base_url = true; - start_pages = "https://geoffrey.frogeye.fr/blank.html"; + start_pages = lib.mkDefault "https://geoffrey.frogeye.fr/blank.html"; + default_page = start_pages; }; content = { # I had this setting below, not sure if it did something special # config.set("content.cookies.accept", "no-3rdparty", "chrome://*/*") cookies.accept = "no-3rdparty"; prefers_reduced_motion = true; + headers.accept_language = "fr-FR, fr;q=0.9, en-GB;q=0.8, en-US;q=0.7, en;q=0.6"; + tls.certificate_errors = "ask-block-thirdparty"; }; + editor.command = [ "${pkgs.neovide}/bin/neovide" "--" "-f" "{file}" "-c" "normal {line}G{column0}l" ]; + # TODO Doesn't work on Arch. Does it even load the right profile on Nix? + # TODO spellcheck.languages = ["fr-FR" "en-GB" "en-US"]; + }; }; @@ -446,6 +464,8 @@ }; }; rofi = { + # TODO This theme template, that was used for Arch, looks much better: + # https://gitlab.com/jordiorlando/base16-rofi/-/blob/master/templates/default.mustache enable = true; pass.enable = true; extraConfig = { @@ -631,7 +651,6 @@ zathura meld python3Packages.magic - yubikey-touch-detector # x11-exclusive numlockx diff --git a/hm/extra.nix b/hm/extra.nix index b20de1b..22d2eb7 100644 --- a/hm/extra.nix +++ b/hm/extra.nix @@ -20,7 +20,6 @@ android-tools # downloading - megatools # transmission TODO Collision if both transmissions are active? # Multimedia toolbox