diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/common/nix.nix | 13 | ||||
| -rw-r--r-- | modules/common/stylix.nix | 8 | ||||
| -rw-r--r-- | modules/direnv.nix | 16 | ||||
| -rw-r--r-- | modules/emacs/default.nix | 15 | ||||
| -rw-r--r-- | modules/emacs/doom/config.el | 3 | ||||
| -rw-r--r-- | modules/endlessh.nix | 5 | ||||
| -rw-r--r-- | modules/firefox/addons.nix | 12 | ||||
| -rw-r--r-- | modules/games/minecraft.nix | 4 | ||||
| -rw-r--r-- | modules/games/steam-run.nix | 9 | ||||
| -rw-r--r-- | modules/git/default.nix | 9 | ||||
| -rw-r--r-- | modules/incus.nix | 6 | ||||
| -rw-r--r-- | modules/profiles/headful.nix | 1 |
12 files changed, 40 insertions, 61 deletions
diff --git a/modules/common/nix.nix b/modules/common/nix.nix index aad7106..fec9b80 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -43,7 +43,7 @@ in inherit rev hash; } ); - pkgsPr = pr: pkgsRev "refs/pull/${toString pr}/head"; + pkgsPR = pr: pkgsRev "refs/pull/${toString pr}/head"; in { _module.args = { @@ -52,7 +52,7 @@ in pkgsMaster pkgsStable pkgsRev - pkgsPr + pkgsPR ; }; @@ -126,16 +126,11 @@ in overlays = with inputs; [ self.overlays.default - (_: prev: { + (_: _prev: { # Global PR package overrides go here. Example: # ``` - # inherit (pkgsPr 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go; + # inherit (pkgsPR 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go; # ``` - - spf-engine = prev.spf-engine.override { - # FIXME https://nixpk.gs/pr-tracker.html?pr=321940 - inherit (pkgsMaster.python311.pkgs) pymilter; - }; }) ]; }; diff --git a/modules/common/stylix.nix b/modules/common/stylix.nix index c7409b5..f1e0417 100644 --- a/modules/common/stylix.nix +++ b/modules/common/stylix.nix @@ -27,7 +27,6 @@ with lib; source-han-mono source-han-sans source-han-serif - twitter-color-emoji ]; readOnly = true; }; @@ -63,6 +62,11 @@ with lib; name = "Iosevka Aile"; }; + emoji = { + package = pkgs.twitter-color-emoji; + name = "Twitter Color Emoji"; + }; + sizes = { desktop = 10; applications = 10; @@ -103,7 +107,7 @@ with lib; "Noto Sans Mono" ]; emoji = mkForce [ - "Twitter Color Emoji" + emoji.name "Noto Color Emoji" ]; }; diff --git a/modules/direnv.nix b/modules/direnv.nix index ececad8..709a73a 100644 --- a/modules/direnv.nix +++ b/modules/direnv.nix @@ -7,17 +7,13 @@ in options.nixfiles.modules.direnv.enable = mkEnableOption "direnv"; config = mkIf cfg.enable { - hm = { - home.sessionVariables.DIRENV_LOG_FORMAT = ""; - - programs.direnv = { - enable = true; - config.global = { - strict_env = true; - warn_timeout = "1h"; - }; - nix-direnv.enable = true; + hm.programs.direnv = { + enable = true; + config.global = { + strict_env = true; + warn_timeout = "1h"; }; + nix-direnv.enable = true; }; }; } diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index b466b64..762c0a6 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -97,6 +97,7 @@ in editorconfig-core-c # :tools editorconfig fd # doom! gcc # :lang cc + gdb # :tools debugger ghc # :lang haskell gnuplot # :lang (org +gnuplot) gnutar # :tools tree-sitter @@ -128,9 +129,6 @@ in nodePackages.js-beautify # :lang web nodePackages.prettier # :editor format nodePackages.stylelint # :lang web - nodePackages.vscode-css-languageserver-bin # lang (web +lsp) - nodePackages.vscode-html-languageserver-bin # lang (web +lsp) - nodePackages.vscode-json-languageserver-bin # lang (json +lsp) nodejs # :tools debugger pandoc # :lang org markdown latex pinentry-emacs # doom! @@ -140,7 +138,7 @@ in python3 # :lang python python3Packages.black # :lang python :editor format python3Packages.isort # :lang python :editor format - python3Packages.nose # :lang python + python3Packages.nose2 # :lang python python3Packages.pyflakes # :lang python :editor format python3Packages.pytest # :lang python python3Packages.python-lsp-server # :lang python :editor format @@ -156,12 +154,12 @@ in texlab # lang (tex +lsp) texlive.combined.scheme-full # :lang org tex unzip # :tools debugger + vscode-langservers-extracted # :lang (json +lsp) (web +lsp) wordnet # :tools (lookup +dictionary +offline) yaml-language-server # :lang (yaml +lsp) zig # :lang zig :editor format zls # :lang (zig +lsp) zstd # :emacs undo - gdb # :tools debugger ]; in '' @@ -180,13 +178,11 @@ in ;; :input japanese (setq migemo-dictionary "${pkgs.cmigemo}/share/migemo/utf-8/migemo-dict" - migemo-options '("--quiet" "--emacs") - skk-large-jisyo "${pkgs.skk-dicts}/share/SKK-JISYO.L" - skk-show-inline t) + skk-large-jisyo "${pkgs.skk-dicts}/share/SKK-JISYO.L") ;; :editor parinfer (setq parinfer-rust-auto-download nil - parinfer-rust-library "${pkgs.parinfer-rust}/lib/libparinfer_rust.so") + parinfer-rust-library "${pkgs.parinfer-rust-emacs}/lib/libparinfer_rust.so") ;; :lang (org +roam2) :email mu4e (setq emacsql-sqlite-executable "${getExe pkgs.emacsql-sqlite}") @@ -207,6 +203,7 @@ in (setq doom-font "${monospace.name}-${toString sizes.terminal}" doom-serif-font "${serif.name}-${toString sizes.terminal}" doom-variable-pitch-font "${sansSerif.name}-${toString sizes.terminal}") + doom-emoji-font "${emoji.name}-${toString sizes.terminal}" '') ( with config.hm.accounts.email; diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el index 9ab1e23..1926627 100644 --- a/modules/emacs/doom/config.el +++ b/modules/emacs/doom/config.el @@ -19,6 +19,9 @@ xclip-mode t xclip-method 'wl-copy)) +(setq migemo-options '("--quiet" "--emacs") + skk-show-inline t) + ;; ;;; Doom-specific ;; diff --git a/modules/endlessh.nix b/modules/endlessh.nix index f1bf0bc..e607935 100644 --- a/modules/endlessh.nix +++ b/modules/endlessh.nix @@ -11,11 +11,6 @@ in port = 22; in mkIf cfg.enable { - ark.directories = [ - "/var/lib/gotify-server" - "/var/lib/private/gotify-server" - ]; - services.endlessh = { enable = true; inherit port; diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix index abdb06f..d53d9c9 100644 --- a/modules/firefox/addons.nix +++ b/modules/firefox/addons.nix @@ -2,10 +2,10 @@ { "bitwarden" = buildFirefoxXpiAddon { pname = "bitwarden"; - version = "2024.6.2"; + version = "2024.6.3"; addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}"; - url = "https://addons.mozilla.org/firefox/downloads/file/4305759/bitwarden_password_manager-2024.6.2.xpi"; - sha256 = "c064e2d6601cb921ecd154e0d3bfd54d71af43da1947aa51666877ef0afd1436"; + url = "https://addons.mozilla.org/firefox/downloads/file/4307738/bitwarden_password_manager-2024.6.3.xpi"; + sha256 = "d3c052e66a9daa390707c4481ec50c09bc3b6253cb222792c9a55aa4b5f4045a"; meta = with lib; { homepage = "https://bitwarden.com"; description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information."; @@ -50,10 +50,10 @@ }; "darkreader" = buildFirefoxXpiAddon { pname = "darkreader"; - version = "4.9.86"; + version = "4.9.87"; addonId = "addon@darkreader.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4295557/darkreader-4.9.86.xpi"; - sha256 = "dde9896751858d0179f3d724a59f2bd4a0d61e599cb8822dc8ed2de320510714"; + url = "https://addons.mozilla.org/firefox/downloads/file/4310627/darkreader-4.9.87.xpi"; + sha256 = "0327d42e507979b0a0443b6aad24d011fea50dd020bcfd07b326bd3df285c79b"; meta = with lib; { homepage = "https://darkreader.org/"; description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing."; diff --git a/modules/games/minecraft.nix b/modules/games/minecraft.nix index 6e163dc..f93a139 100644 --- a/modules/games/minecraft.nix +++ b/modules/games/minecraft.nix @@ -48,7 +48,9 @@ in enable = true; autoStart = true; - package = pkgs.paperServers.paper-1_19_3; + # https://api.papermc.io/v2/projects/paper + # https://github.com/Infinidoge/nix-minecraft/blob/master/pkgs/paper-servers/lock.json + package = pkgs.paperServers.paper-1_21_47; serverProperties = { # motd = ""; diff --git a/modules/games/steam-run.nix b/modules/games/steam-run.nix index f6902c0..be06c78 100644 --- a/modules/games/steam-run.nix +++ b/modules/games/steam-run.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + pkgsRev, ... }: with lib; @@ -28,12 +29,8 @@ in _: with cfg.quirks; optional blackIsleStudios openssl_1_0_0 - ++ optionals cryptOfTheNecrodancer [ - (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/d1c3fea7ecbed758168787fe4e4a3157e52bc808.tar.gz"; - sha256 = "0ykm15a690v8lcqf2j899za3j6hak1rm3xixdxsx33nz7n3swsyy"; - }) { inherit (config.nixpkgs) config localSystem; }).flac - ] + ++ optional cryptOfTheNecrodancer (pkgsRev "d1c3fea7ecbed758168787fe4e4a3157e52bc808" "sha256-3muuhz3fjtF1bz32UXOYCho51E8JSeEwo2iDZFQJdXo=") + .flac ++ optionals mountAndBladeWarband [ (glew.overrideAttrs ( _: super: diff --git a/modules/git/default.nix b/modules/git/default.nix index ad322ca..b32b5bc 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -5,6 +5,7 @@ libNginx, libPlausible, pkgs, + this, ... }: with lib; @@ -70,13 +71,7 @@ in git = { enable = true; - package = pkgs.git.override { - doInstallCheck = false; - pythonSupport = false; - sendEmailSupport = true; - withLibsecret = false; - withSsh = true; - }; + package = if this.isHeadful then pkgs.gitFull else pkgs.gitMinimal; userName = my.fullname; userEmail = my.email; diff --git a/modules/incus.nix b/modules/incus.nix index 184aa03..b4e04e2 100644 --- a/modules/incus.nix +++ b/modules/incus.nix @@ -55,12 +55,6 @@ in networking.firewall.trustedInterfaces = [ "incusbr0" ]; - # FIXME https://nixpk.gs/pr-tracker.html?pr=295364 - # systemd.services.incus.path = mkForce [ - # config.boot.zfs.package - # "${config.boot.zfs.package}/lib/udev" - # ]; - my.extraGroups = [ "incus-admin" ]; }; } diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix index d58eed0..7d6d00f 100644 --- a/modules/profiles/headful.nix +++ b/modules/profiles/headful.nix @@ -55,6 +55,7 @@ in imv libreoffice-fresh mumble + paper-plane ripgrep sd telegram-desktop |