diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/common/locale.nix | 15 | ||||
| -rw-r--r-- | modules/git/default.nix | 1 | ||||
| -rw-r--r-- | modules/profiles/headful.nix | 1 | ||||
| -rw-r--r-- | modules/vscode.nix | 15 | ||||
| -rw-r--r-- | modules/wireguard.nix | 10 |
5 files changed, 23 insertions, 19 deletions
diff --git a/modules/common/locale.nix b/modules/common/locale.nix index 870ce1b..372b69b 100644 --- a/modules/common/locale.nix +++ b/modules/common/locale.nix @@ -9,10 +9,10 @@ with lib; hm.home.language = { collate = "C"; messages = "C"; - monetary = "ru_RU.UTF-8"; - numeric = "ru_RU.UTF-8"; - paper = "ru_RU.UTF-8"; - telephone = "ru_RU.UTF-8"; + monetary = "tt_RU.UTF-8"; + numeric = "tt_RU.UTF-8"; + paper = "tt_RU.UTF-8"; + telephone = "tt_RU.UTF-8"; }; i18n = { @@ -20,9 +20,16 @@ with lib; supportedLocales = [ "C.UTF-8/UTF-8" "en_GB.UTF-8/UTF-8" + "en_GB/ISO-8859-1" "en_US.UTF-8/UTF-8" + "en_US/ISO-8859-1" + "ja_JP.EUC-JP/EUC-JP" "ja_JP.UTF-8/UTF-8" + "ru_RU.KOI8-R/KOI8-R" "ru_RU.UTF-8/UTF-8" + "ru_RU/ISO-8859-5" + "tt_RU/UTF-8" + "tt_RU@iqtelif/UTF-8" ]; inputMethod = { diff --git a/modules/git/default.nix b/modules/git/default.nix index 092a82c..b618a57 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -124,6 +124,7 @@ in mapAttrs' (name: values: nameValuePair ''url "https://${values}/"'' { insteadOf = "${name}:"; }) { "alpine" = "gitlab.alpinelinux.org"; + "clan" = "git.clan.lol"; "debian" = "salsa.debian.org"; "freedesktop" = "gitlab.freedesktop.org"; "gnome" = "gitlab.gnome.org"; diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix index b7c17d6..256ec25 100644 --- a/modules/profiles/headful.nix +++ b/modules/profiles/headful.nix @@ -62,7 +62,6 @@ in libreoffice-fresh mumble obs-studio - paper-plane qbittorrent ripgrep sd diff --git a/modules/vscode.nix b/modules/vscode.nix index 393b32f..3b0c3e1 100644 --- a/modules/vscode.nix +++ b/modules/vscode.nix @@ -51,9 +51,8 @@ in editorconfig.editorconfig efoerster.texlab github.vscode-pull-request-github - gitlab.gitlab-workflow golang.go - # graphql.vscode-graphql + graphql.vscode-graphql graphql.vscode-graphql-execution graphql.vscode-graphql-syntax hashicorp.hcl @@ -75,12 +74,16 @@ in streetsidesoftware.code-spell-checker-russian streetsidesoftware.code-spell-checker-scientific-terms tamasfe.even-better-toml - # task.vscode-task - # vscode-org-mode.org-mode + task.vscode-task + vscode-org-mode.org-mode ] ++ optional cfg.vim.enable vscodevim.vim; userSettings = { + # Something tries to write this every startup. I can't be arsed to + # figure out what, so I'll leave this like this. + "accessibility.signals.terminalBell".sound = "on"; + editor = { codeLens = false; cursorStyle = "block"; @@ -184,8 +187,10 @@ in }; nix = { + formatterPath = getExe pkgs.nixfmt; enableLanguageServer = true; - serverPath = getExe pkgs.nil; + serverPath = getExe pkgs.nixd; + serverSettings.nixd.formatting.command = getExe pkgs.nixfmt; }; python = with pkgs.python311Packages; { diff --git a/modules/wireguard.nix b/modules/wireguard.nix index f32e5ba..f60ea92 100644 --- a/modules/wireguard.nix +++ b/modules/wireguard.nix @@ -153,10 +153,6 @@ in jmax = 420 s1 = 69 s2 = 96 - h1 = 1134610890 - h2 = 2137373420 - h3 = 625719520 - h4 = 2106927320 ''; }) (with cfg.server; { @@ -232,11 +228,7 @@ in jmin 42 \ jmax 420 \ s1 69 \ - s2 96 \ - h1 1134610890 \ - h2 2137373420 \ - h3 625719520 \ - h4 2106927320 + s2 96 ''; allowedIPsAsRoutes = false; }; |