diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/common/common/shell/default.nix | 8 | ||||
| -rw-r--r-- | modules/common/profiles/dev/default.nix | 1 | ||||
| -rw-r--r-- | modules/common/profiles/headful.nix | 1 | ||||
| -rw-r--r-- | modules/common/qutebrowser.nix | 18 | ||||
| -rw-r--r-- | modules/nixos/alertmanager.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/common/locale.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/lxc.nix | 3 |
7 files changed, 14 insertions, 25 deletions
diff --git a/modules/common/common/shell/default.nix b/modules/common/common/shell/default.nix index 5731f26..8c3fa8a 100644 --- a/modules/common/common/shell/default.nix +++ b/modules/common/common/shell/default.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, this, @@ -16,6 +17,8 @@ in { config = { hm = { + imports = [inputs.nix-index-database.hmModules.nix-index]; + programs = { bash = { enable = true; @@ -125,9 +128,10 @@ in { // cfg.aliases; }; - command-not-found.enable = false; - dircolors.enable = true; + + command-not-found.enable = false; + nix-index-database.comma.enable = true; }; home.packages = with pkgs; [grc]; diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix index 1bc0b0e..52dc49f 100644 --- a/modules/common/profiles/dev/default.nix +++ b/modules/common/profiles/dev/default.nix @@ -67,7 +67,6 @@ in { hydra-check jq logcli - nix-index nix-update nixpkgs-review sops diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index dc8e1d6..1578ccc 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -34,7 +34,6 @@ in { ''; packages = with pkgs; [ - comma fd ripgrep sd diff --git a/modules/common/qutebrowser.nix b/modules/common/qutebrowser.nix index 96da894..9a919b7 100644 --- a/modules/common/qutebrowser.nix +++ b/modules/common/qutebrowser.nix @@ -400,23 +400,7 @@ in { }; webpage = { bg = "white"; - darkmode = { - enabled = false; - algorithm = "lightness-cielab"; - contrast = 0.0; - grayscale = { - all = false; - images = 0.0; - }; - policy = { - images = "smart"; - page = "smart"; - }; - threshold = { - background = 0; - text = 256; - }; - }; + darkmode.enabled = false; preferred_color_scheme = "auto"; }; }; diff --git a/modules/nixos/alertmanager.nix b/modules/nixos/alertmanager.nix index 9c8d60a..4d7f2ec 100644 --- a/modules/nixos/alertmanager.nix +++ b/modules/nixos/alertmanager.nix @@ -67,7 +67,7 @@ in { name = my.username; webhook_configs = [ { - url = with config.pinpox.services.alertmanager-ntfy; "http://${httpAddress}:${httpPort}"; + url = with config.services.alertmanager-ntfy; "http://${httpAddress}:${httpPort}"; } ]; } @@ -76,7 +76,7 @@ in { }; }; - pinpox.services.alertmanager-ntfy = { + services.alertmanager-ntfy = { enable = true; httpAddress = "127.0.0.1"; httpPort = toString (config.nixfiles.modules.ntfy.port + 1); diff --git a/modules/nixos/common/locale.nix b/modules/nixos/common/locale.nix index 09e0686..76186bc 100644 --- a/modules/nixos/common/locale.nix +++ b/modules/nixos/common/locale.nix @@ -23,9 +23,9 @@ with lib; { }; }; - services.xserver = { + services.xserver.xkb = { layout = "us"; - xkbOptions = concatStringsSep "," [ + options = concatStringsSep "," [ "caps:escape" "compose:menu" "terminate:ctrl_alt_bksp" diff --git a/modules/nixos/lxc.nix b/modules/nixos/lxc.nix index bfdab8f..1306497 100644 --- a/modules/nixos/lxc.nix +++ b/modules/nixos/lxc.nix @@ -9,7 +9,10 @@ in { options.nixfiles.modules.lxc.enable = mkEnableOption "LXC/Incus"; config = mkIf cfg.enable { + ark.directories = ["/var/lib/incus"]; + virtualisation.incus.enable = true; + my.extraGroups = ["incus-admin"]; }; } |