diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 05adc68..d7e0e3c 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -2,13 +2,7 @@ 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) @@ -105,6 +99,5 @@ in { 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 f117583..e83bf4a 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 = "uk"; + console.keyMap = "us"; security.polkit.enable = true; # boot.kernelPackages = pkgs.linuxPackagesFor xanmod_blox; diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index 85c35e8..2a38c9e 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -7,11 +7,13 @@ in { anki asciinema beets + brave bubblewrap cachix calc calibre cinny-desktop + comma vscodium difftastic dnsutils @@ -19,6 +21,7 @@ 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 189ac76..43fb005 100644 --- a/modules/programs/other/nix-index.nix +++ b/modules/programs/other/nix-index.nix @@ -5,7 +5,7 @@ enable = false; }; nix-index = { - enable = false; + enable = true; }; }; } diff --git a/modules/services/searxng/module.nix b/modules/services/searxng/module.nix index 7a153f3..bfc0e5d 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 (lib.strings) toString; + inherit (builtins) toString; cfg = config.modules.services.searxng; port = 4021; in { @@ -15,9 +15,8 @@ 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; @@ -101,7 +100,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;