diff options
| -rw-r--r-- | flake.lock | 208 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | modules/common/common/shell/default.nix | 20 | ||||
| -rw-r--r-- | modules/common/emacs/default.nix | 3 | ||||
| -rw-r--r-- | modules/common/profiles/headful.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/common/locale.nix | 26 | ||||
| -rw-r--r-- | modules/nixos/common/nix.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/firefox/userContent.css | 8 | ||||
| -rw-r--r-- | modules/nixos/games/minecraft.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/games/steam.nix | 5 | ||||
| -rw-r--r-- | modules/nixos/kde.nix | 2 |
12 files changed, 220 insertions, 68 deletions
@@ -193,6 +193,40 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-registry": { "flake": false, "locked": { @@ -229,9 +263,49 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ + "pollymc", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ "pre-commit-hooks", "nixpkgs" ] @@ -278,11 +352,11 @@ ] }, "locked": { - "lastModified": 1685573051, - "narHash": "sha256-zrpbdQVJFpNVFK3SlA6mE0le8qnKjUjcuY4OzL+wSHw=", + "lastModified": 1686142265, + "narHash": "sha256-IP0xPa0VYqxCzpqZsg3iYGXarUF+4r2zpkhwdHy9WsM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3876cc613ac3983078964ffb5a0c01d00028139e", + "rev": "39c7d0a97a77d3f31953941767a0822c94dc01f5", "type": "github" }, "original": { @@ -335,11 +409,11 @@ ] }, "locked": { - "lastModified": 1685585448, - "narHash": "sha256-7onuCglc3yR5FDmH+PIMn+VhdP7lmjKD9eoIcI7/Wvw=", + "lastModified": 1686102907, + "narHash": "sha256-GqjaX914k6OXeysEA81Psf56zPzv6pGCJOPw9bqsDmY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "873f6b9ddd2018190830d3608a1522d7a511cf76", + "rev": "473897ae26beacef55d7c781054ce5408edb9982", "type": "github" }, "original": { @@ -362,11 +436,11 @@ ] }, "locked": { - "lastModified": 1685584329, - "narHash": "sha256-Eg/kDcAp/UIjCNgIRRyQscP6O0PHTmQ6aHkaC590ALY=", + "lastModified": 1686145321, + "narHash": "sha256-IrWdLpdulNEQTpFZ+h27kyX12h35U2x3TJLuLnKuAow=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "71a52cdeb59fc176ead60ca111a2eba7a330f5f9", + "rev": "6b3e042c3c654d32bb27ba7472f6361ffde130a4", "type": "github" }, "original": { @@ -394,11 +468,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685561376, - "narHash": "sha256-uIcJdaovXr55FJdmvR6yIN6IWoOL4amBj56e/T2KhgM=", + "lastModified": 1686089707, + "narHash": "sha256-LTNlJcru2qJ0XhlhG9Acp5KyjB774Pza3tRH0pKIb3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc3ec5eaa759d58e9fb1bdc9cfe94f74d0331b31", + "rev": "af21c31b2a1ec5d361ed8050edd0303c31306397", "type": "github" }, "original": { @@ -408,13 +482,31 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1685564631, + "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-master": { "locked": { - "lastModified": 1685645426, - "narHash": "sha256-5AS6PQG1//2WQ6H5ISlh81ahw1s4bAnLxrALF7fsFrQ=", + "lastModified": 1686161832, + "narHash": "sha256-et2KAERoZI8WREmMrvxOixn0tBa7WlbYK9M3sk7jsMk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06eb8ff061b52d2c23f64e6fe7213f2c54d28557", + "rev": "d987535062d54cb9a9f0b7e6f64cfcde765ae765", "type": "github" }, "original": { @@ -426,16 +518,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685587708, - "narHash": "sha256-kd+vA/n7cmCL1QWbKcrcwfq2fl6u6By2t6mS7tQgw7Y=", + "lastModified": 1686158406, + "narHash": "sha256-HzLu621eH25BwiRMP7qoGR9ssUCJ6m7jWKOlCSay+V4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "041fc5df0031224c56bbd47165d45b16cb628ca9", + "rev": "edeacb701347c27727e3277d9442b085847ecec7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -476,11 +568,11 @@ }, "nur": { "locked": { - "lastModified": 1685643901, - "narHash": "sha256-3zkK8nno/fnL3PSMYKtY0uhPdCyM1xVd5ES3ciZqDWU=", + "lastModified": 1686156360, + "narHash": "sha256-Hiq9RgnjOQ12PewlX5HIU+eZv7sK0H7pYpYD621uohI=", "owner": "nix-community", "repo": "NUR", - "rev": "313425ecb994550f7b5c585f1c75a6f9c27fcf7e", + "rev": "222cc78435a2a102896f9046b36cde8dfb4b60a8", "type": "github" }, "original": { @@ -492,25 +584,25 @@ }, "pollymc": { "inputs": { - "flake-compat": [ - "flake-compat" - ], + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts", "libnbtplusplus": "libnbtplusplus", "nixpkgs": [ "nixpkgs" - ] + ], + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1675636511, - "narHash": "sha256-k7EkqHY0Q1fuJQgOe6p/HXOuLPVRzbUfxItXaZVbOC4=", + "lastModified": 1686318133, + "narHash": "sha256-IyoqIt+RNUxvIC1KrGe2d0rB7J78eU0wh/fEaJ80Cew=", "owner": "fn2006", "repo": "PollyMC", - "rev": "f61f4fe722a93c40e8bfd903b7ad7eaa3205f8bf", + "rev": "392822ec7aab149e965842f2701d37b1ab643d3b", "type": "github" }, "original": { "owner": "fn2006", - "ref": "6.3", + "ref": "7.0", "repo": "PollyMC", "type": "github" } @@ -518,12 +610,43 @@ "pre-commit-hooks": { "inputs": { "flake-compat": [ + "pollymc", + "flake-compat" + ], + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "nixpkgs": [ + "pollymc", + "nixpkgs" + ], + "nixpkgs-stable": [ + "pollymc", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1686213770, + "narHash": "sha256-Re6xXLEqQ/HRnThryumyGzEf3Uv0Pl4cuG50MrDofP8=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "182af51202998af5b64ddecaa7ff9be06425399b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": [ "flake-compat" ], "flake-utils": [ "flake-utils" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "nixpkgs" ], @@ -532,11 +655,11 @@ ] }, "locked": { - "lastModified": 1685361114, - "narHash": "sha256-4RjrlSb+OO+e1nzTExKW58o3WRwVGpXwj97iCta8aj4=", + "lastModified": 1686050334, + "narHash": "sha256-R0mczWjDzBpIvM3XXhO908X5e2CQqjyh/gFbwZk/7/Q=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ca2fdbf3edda2a38140184da6381d49f8206eaf4", + "rev": "6881eb2ae5d8a3516e34714e7a90d9d95914c4dc", "type": "github" }, "original": { @@ -569,7 +692,7 @@ "nmap-vulscan": "nmap-vulscan", "nur": "nur", "pollymc": "pollymc", - "pre-commit-hooks": "pre-commit-hooks", + "pre-commit-hooks": "pre-commit-hooks_2", "simple-nixos-mailserver": "simple-nixos-mailserver", "xmonad-ng": "xmonad-ng" } @@ -620,6 +743,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xmonad-ng": { "inputs": { "flake-utils": [ @@ -26,7 +26,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "release-22.11"; + ref = "release-23.05"; }; # For testing PRs and stuff. @@ -115,11 +115,8 @@ type = "github"; owner = "fn2006"; repo = "PollyMC"; - ref = "6.3"; - inputs = { - flake-compat.follows = "flake-compat"; - nixpkgs.follows = "nixpkgs"; - }; + ref = "7.0"; + inputs.nixpkgs.follows = "nixpkgs"; }; dns-nix = { diff --git a/lib/default.nix b/lib/default.nix index de013c2..4251f7e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -12,7 +12,7 @@ lib: _: rec { pow = base: exponent: assert (builtins.isInt base) && (builtins.isInt exponent); assert exponent > 0; - builtins.foldl' (x: _: x * base) 1 (builtins.genList _ exponent); + builtins.foldl' (x: _: x * base) 1 (builtins.genList (_: _) exponent); mapListToAttrs = f: xs: builtins.listToAttrs (map (name: { diff --git a/modules/common/common/shell/default.nix b/modules/common/common/shell/default.nix index 1eebfa2..2b034e6 100644 --- a/modules/common/common/shell/default.nix +++ b/modules/common/common/shell/default.nix @@ -1,6 +1,7 @@ { lib, pkgs, + pkgsStable, this, ... }: @@ -64,15 +65,16 @@ with lib; { pkg = if this.isHeadful then - (coreutils.overrideAttrs (_: super: { - patches = - super.patches - ++ [ - (fetchpatch { - url = "https://raw.githubusercontent.com/jarun/advcpmv/ea268d870b475edd5960dcd55d5378abc9705958/advcpmv-0.9-9.1.patch"; - hash = "sha256-d+SRT/R4xmfHLAdOr7m4R3WFiW64P5ZH6iqDvErYCyg="; - }) - ]; + # FIXME Update this to 9.3 when patches[1] become available + # + # [1]: https://github.com/jarun/advcpmv + (pkgsStable.coreutils.overrideAttrs (_: _: { + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/jarun/advcpmv/ea268d870b475edd5960dcd55d5378abc9705958/advcpmv-0.9-9.1.patch"; + hash = "sha256-d+SRT/R4xmfHLAdOr7m4R3WFiW64P5ZH6iqDvErYCyg="; + }) + ]; })) else coreutils; in "${pkg}/bin/coreutils --coreutils-prog=${value}")) diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index d9a5922..5499d48 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -113,8 +113,7 @@ in { shfmt # :lang sh :editor format sqlite # :lang (org +roam2) :tools lookup texlab # lang (tex +lsp) - # FIXME https://github.com/NixOS/nixpkgs/issues/235434 - # texlive.combined.scheme-full # :lang org tex + texlive.combined.scheme-full # :lang org tex unzip # :tools debugger wordnet # :tools (lookup +dictionary +offline) yaml-language-server # :lang (yaml +lsp) diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix index 6ec092d..968b287 100644 --- a/modules/common/profiles/headful.nix +++ b/modules/common/profiles/headful.nix @@ -32,6 +32,7 @@ in { ''; packages = with pkgs; [ + anki comma fd ripgrep diff --git a/modules/nixos/common/locale.nix b/modules/nixos/common/locale.nix index 7529996..09e0686 100644 --- a/modules/nixos/common/locale.nix +++ b/modules/nixos/common/locale.nix @@ -1,4 +1,8 @@ -{lib, ...}: +{ + lib, + pkgs, + ... +}: with lib; { i18n = { defaultLocale = mkDefault "en_GB.UTF-8"; @@ -9,22 +13,22 @@ with lib; { "ja_JP.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8" ]; + + inputMethod = { + enabled = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-configtool + fcitx5-mozc + ]; + }; }; services.xserver = { - layout = concatStringsSep "," [ - "us" - "ru" - ]; - xkbVariant = concatStringsSep "," [ - "" - "phonetic" - ]; + layout = "us"; xkbOptions = concatStringsSep "," [ - "terminate:ctrl_alt_bksp" "caps:escape" "compose:menu" - "grp:win_space_toggle" + "terminate:ctrl_alt_bksp" ]; }; } diff --git a/modules/nixos/common/nix.nix b/modules/nixos/common/nix.nix index 410e01d..9978513 100644 --- a/modules/nixos/common/nix.nix +++ b/modules/nixos/common/nix.nix @@ -19,7 +19,7 @@ in { overlays = with inputs; [ nix-minecraft.overlay - pollymc.overlay + pollymc.overlays.default xmonad-ng.overlays.default ]; }; diff --git a/modules/nixos/firefox/userContent.css b/modules/nixos/firefox/userContent.css index 3903799..dc811ca 100644 --- a/modules/nixos/firefox/userContent.css +++ b/modules/nixos/firefox/userContent.css @@ -347,3 +347,11 @@ display: none !important; } } + +@-moz-document regexp("https?://duckduckgo\.com/") +{ + .badge-link, /* Annoying "Make DuckDuckGo default" ad. */ + .footer { + display: none !important; + } +} diff --git a/modules/nixos/games/minecraft.nix b/modules/nixos/games/minecraft.nix index 09b9239..b8a2949 100644 --- a/modules/nixos/games/minecraft.nix +++ b/modules/nixos/games/minecraft.nix @@ -31,7 +31,7 @@ in { config = mkMerge [ (mkIf cfg.client.enable { - hm.home.packages = with pkgs; [prismlauncher]; + hm.home.packages = with pkgs; [pollymc-unwrapped]; }) (mkIf cfg.server.enable { nixfiles.modules.common.nix.allowedUnfreePackages = ["minecraft-server"]; diff --git a/modules/nixos/games/steam.nix b/modules/nixos/games/steam.nix index 8dfa72c..679ce0e 100644 --- a/modules/nixos/games/steam.nix +++ b/modules/nixos/games/steam.nix @@ -20,6 +20,9 @@ in { }; }; - hm.home.packages = with pkgs; [steam]; + programs.steam = { + enable = true; + package = with pkgs; steam.override {extraPkgs = _pkgs: [attr];}; + }; }; } diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix index 17fcf03..05be874 100644 --- a/modules/nixos/kde.nix +++ b/modules/nixos/kde.nix @@ -17,7 +17,7 @@ in { }; hm = { - home.sessionVariables.GTK_USE_PORTAL = 1; + # home.sessionVariables.GTK_USE_PORTAL = 1; programs.firefox.profiles.default.settings = { "widget.use-xdg-desktop-portal.file-picker" = 1; |