diff options
| -rw-r--r-- | configurations/eonwe/default.nix | 4 | ||||
| -rw-r--r-- | flake.lock | 62 | ||||
| -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 | ||||
| -rw-r--r-- | packages/nixfiles.nix | 14 |
8 files changed, 59 insertions, 63 deletions
diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix index a7505e7..c33c21d 100644 --- a/configurations/eonwe/default.nix +++ b/configurations/eonwe/default.nix @@ -31,8 +31,10 @@ with lib; hm = { home.packages = with pkgs; [ - # calibre # FIXME https://nixpk.gs/pr-tracker.html?pr=349884 + calibre + inkscape krita + paper-plane qolibri radeontop vial diff --git a/flake.lock b/flake.lock index 5ca3cec..800a638 100644 --- a/flake.lock +++ b/flake.lock @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1729281548, - "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", + "lastModified": 1729712798, + "narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=", "owner": "nix-community", "repo": "disko", - "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", + "rev": "09a776702b004fdf9c41a024e1299d575ee18a7d", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1729459288, - "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", + "lastModified": 1729716953, + "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", + "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", "type": "github" }, "original": { @@ -473,11 +473,11 @@ "infuse": { "flake": false, "locked": { - "lastModified": 1725534720, - "narHash": "sha256-nUKvPYUVKPGwqCSy4S46FpuaZP1oyodIh2THE+Hu+HU=", + "lastModified": 1729644337, + "narHash": "sha256-4XPDTUvV8dfuf9GzKg2/r7j7lMELRAwKKFx3ecQObeg=", "ref": "refs/heads/trunk", - "rev": "b5167b3ec5a398ab0b5377c07138d4e6a393a57d", - "revCount": 31, + "rev": "786657a2cf262c3cdce08f64dd4857655f18f166", + "revCount": 40, "type": "git", "url": "https://codeberg.org/amjoseph/infuse.nix" }, @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1729475340, - "narHash": "sha256-cdOVgmC6/ZNUu4ZGCwxy/vTaMJ6WaxBa9EZYcCCzxPA=", + "lastModified": 1729734363, + "narHash": "sha256-qSAmcOBaCadTe9VkoNHUmgzJoYy42RE9tSgbGIDQ34M=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "c5905ddb8c23d6f549e47cec51038c603093d49f", + "rev": "f3795fcc37f37ae8c488e70e2cf8a85e43043722", "type": "github" }, "original": { @@ -586,11 +586,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729455275, - "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -601,11 +601,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1729755165, + "narHash": "sha256-6IpnOHWsaSSjT3yvqlrWfHW6HVCT+wOAlUpcooGJ+FQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "cabaf14d3e69c9921d7acedf5d7d60bb2b90be02", "type": "github" }, "original": { @@ -648,11 +648,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1729497599, - "narHash": "sha256-VIL7URnjTkpYc7FQ0QJhV7Q2n2/hi3AgiFr5Ul1/glo=", + "lastModified": 1729808856, + "narHash": "sha256-es7qdVSyBe52caRzOD4JMc0JVQVeNIHmSZ6hhIK2uGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6bdbd1605b17cfbd8af51ba68db779e130d54b3", + "rev": "bc1400c95a65022d7e1ccb39c495c50b521a0ef1", "type": "github" }, "original": { @@ -664,11 +664,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729489324, - "narHash": "sha256-xAa7WPbtymWsI/15oC2zUBjkpHYCZ+gFMiav2lrlRH8=", + "lastModified": 1729805696, + "narHash": "sha256-FArm/EIAbykrhtWxWKT1QXIg+dD44joehXZWdY12WKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2589a4d25269cfa6a22022d01cd740d8abaa82b", + "rev": "50286248f2d7283682bdd47ba14af33a9233b88b", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1729472124, - "narHash": "sha256-l1uqRV0XPDrCVXb8irXSnIHOdzmss78KiUqB6WkhDMw=", + "lastModified": 1729731316, + "narHash": "sha256-InsUCPq86xyvJ9U+pVijYNBCep/dYACyJblG6fgkkWA=", "owner": "nix-community", "repo": "srvos", - "rev": "5607765a4ac3a567cfe6bf4efb3c352193604f57", + "rev": "0e447b6d3f16d6a305ca99ac89686d51042f516a", "type": "github" }, "original": { @@ -919,11 +919,11 @@ ] }, "locked": { - "lastModified": 1729475384, - "narHash": "sha256-x7ODafOKfxXMdgs/wPXVpmf04vOr7cJLEDWYT/TBjY0=", + "lastModified": 1729734515, + "narHash": "sha256-KGE6Exd1NAhTo806QUqK3oCk40L7spjfEpHnrNNkFD4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "77a421d6c7ea09381c7e33d90c3017c9727dfbc3", + "rev": "087ec37265ff1c8641086ee2a51450963494cdeb", "type": "github" }, "original": { 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; }; diff --git a/packages/nixfiles.nix b/packages/nixfiles.nix index 7a4c3db..8fdd419 100644 --- a/packages/nixfiles.nix +++ b/packages/nixfiles.nix @@ -64,16 +64,6 @@ let end ') ;; - update) - if (( $# )); then - args=() - for input do args+=(--update-input "$input"); done - exec nix flake lock --refresh "''${args[@]}" "$nixfiles" - else - # https://github.com/NixOS/nix/issues/6095 - exec nix flake update -v --refresh "$nixfiles" - fi - ;; rev) if (( $# )); then expr=inputs.''${1//'/'/.inputs.}.rev @@ -146,10 +136,10 @@ let if [[ $cur == @* ]]; then _known_hosts_real -a -- "$cur" else - __compreply -W 'compare update repl eval nix-build specialise revert home boot build build-vm build-vm-with-bootloader dry-activate dry-build edit switch test' + __compreply -W 'compare repl eval nix-build specialise revert home boot build build-vm build-vm-with-bootloader dry-activate dry-build edit switch test' fi else case ''${words[1]} in - compare|update|rev) + compare|rev) __complete_nix_cmd "$cword" nix flake lock "$nixfiles" --update-input ;; repl|eval|nix-build) |