diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index d7e0e3c..05adc68 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -2,7 +2,13 @@ self, pkgs, ... -}: { +}: let + niri-switch-to-workspace = pkgs.writeShellScriptBin "niri-switch-to-workspace" '' + workspace="$(echo -en "main\nsocial\nkeepass\nbrowser\ninfra\nscratch\nmultimedia" | fuzzel --dmenu)" + # niri msg action focus-workspace-monitor "$workspace" + niri msg action focus-workspace "$workspace" + ''; +in { environment.systemPackages = builtins.attrValues { inherit (pkgs) @@ -99,5 +105,6 @@ television ; inherit (self.packages.${pkgs.stdenv.system}) helix; + inherit niri-switch-to-workspace; }; } diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index e83bf4a..f117583 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -25,7 +25,7 @@ in { time.timeZone = "Europe/Zurich"; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; - console.keyMap = "us"; + console.keyMap = "uk"; security.polkit.enable = true; # boot.kernelPackages = pkgs.linuxPackagesFor xanmod_blox; diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index 2a38c9e..85c35e8 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -7,13 +7,11 @@ in { anki asciinema beets - brave bubblewrap cachix calc calibre cinny-desktop - comma vscodium difftastic dnsutils @@ -21,7 +19,6 @@ in { element-desktop evince gcc - gh gnumake gparted halloy diff --git a/modules/programs/other/nix-index.nix b/modules/programs/other/nix-index.nix index 43fb005..189ac76 100644 --- a/modules/programs/other/nix-index.nix +++ b/modules/programs/other/nix-index.nix @@ -5,7 +5,7 @@ enable = false; }; nix-index = { - enable = true; + enable = false; }; }; } diff --git a/modules/services/searxng/module.nix b/modules/services/searxng/module.nix index bfc0e5d..7a153f3 100644 --- a/modules/services/searxng/module.nix +++ b/modules/services/searxng/module.nix @@ -6,7 +6,7 @@ }: let inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf; - inherit (builtins) toString; + inherit (lib.strings) toString; cfg = config.modules.services.searxng; port = 4021; in { @@ -15,8 +15,9 @@ in { config = mkIf cfg.enable { networking.firewall.allowedTCPPorts = [port]; + modules.system.services.nginx.enable = true; + services = { - nginx.enable = true; searx = { enable = true; package = pkgs.searxng; @@ -100,7 +101,7 @@ in { ]; }; }; - nginx.virtualHosts."search.copeberg.org" = { + nginx.virtualhosts."search.copeberg.org" = { locations."/".proxyPass = "http://127.0.0.1:${toString port}"; extraConfig = '' access_log /dev/null;