Commit bc02c1b
Changed files (27)
modules
desktop
de
custom
wm
niri
dev
hosts
users
hpcesia
secrets
cache
kevin
mobius
modules/core/nix/github-access-token.age
Binary file
modules/core/nix/substituters.nix
@@ -6,14 +6,13 @@
"https://mirrors.ustc.edu.cn/nix-channels/store?priority=10"
"https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store?priority=10"
- "https://nix-community.cachix.org?priority=20"
- "https://cache.garnix.io?priority=30"
+ "https://nix-community.cachix.org?priority=11"
# Flox has CUDA support binary cache, I don't want to build ffmpeg every time I update my system
- "https://cache.flox.dev?priority=40"
+ "https://cache.flox.dev?priority=20"
+ "https://cache.nixos-cuda.org?priority=21"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
- "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
];
};
modules/core/tools/packages.nix
@@ -25,7 +25,7 @@
file
which
findutils
- fastfetchMinimal
+ fastfetch.minimal
zellij
];
};
modules/core/tools/yazi.nix
@@ -38,14 +38,14 @@
};
plugin.prepend_fetchers = [
{
- id = "git";
- name = "*";
+ url = "*";
run = "git";
+ group = "git";
}
{
- id = "git";
- name = "*/";
+ url = "*/";
run = "git";
+ group = "git";
}
];
};
modules/desktop/apps/mpd.nix
@@ -1,31 +0,0 @@
-{lib, ...}: {
- den.aspects.desktop.provides.app.homeManager = {config, ...}: {
- services.mpd = {
- enable = true;
- network.startWhenNeeded = true;
- extraConfig = ''
- audio_output {
- type "pipewire"
- name "PipeWire Sound Server"
- }
- '';
- };
-
- services.mpd-mpris = {
- enable = true;
- };
-
- # Fix MPD not following `startWhenNeeded` configuration.
- systemd.user.services.mpd-mpris = let
- cfg = config.services.mpd-mpris;
- mpdCfg = config.services.mpd;
- in
- lib.mkIf (cfg.mpd.useLocal && mpdCfg.enable && mpdCfg.network.startWhenNeeded) {
- Install.WantedBy = lib.mkForce ["mpd.service"];
- Unit = {
- Requires = lib.mkForce [];
- BindsTo = ["mpd.service"];
- };
- };
- };
-}
modules/desktop/apps/packages.nix
@@ -1,53 +1,14 @@
{lib, ...}: {
- den.aspects.desktop.provides.app.homeManager = {
- pkgs,
- osConfig,
- ...
- }: let
- chromiumCLA = lib.optionals isLinux ([
- "--ozone-platform-hint=auto"
- "--enable-wayland-ime"
- "--wayland-text-input-version=3"
- ]
- ++ lib.optionals (!isPlasma) [
- # Fix https://github.com/microsoft/vscode/issues/187338
- "--password-store=gnome-libsecret"
- ]);
-
- isLinux = pkgs.stdenv.hostPlatform.isLinux;
- isPlasma = isLinux && (osConfig.services.desktopManager.plasma6.enable or false);
-
- # Fix Chromium IME bug
- cherry-studio = pkgs.cherry-studio.override {commandLineArgs = chromiumCLA;};
-
- wpsoffice-cn = pkgs.wpsoffice-cn.overrideAttrs (oldAttrs: {
- buildInputs = (oldAttrs.buildInputs or []) ++ [pkgs.makeWrapper];
- postFixup =
- (oldAttrs.postFixup or "")
- + ''
- for app in wps et wpp wpspdf; do
- wrapProgram $out/bin/$app \
- --set GTK_IM_MODULE fcitx \
- --set QT_IM_MODULE fcitx \
- --set XMODIFIERS @im=fcitx \
- --set QT_QPA_PLATFORM xcb \
- --set QT_FONT_DPI ${builtins.toString osConfig.services.xserver.dpi}
- done
- '';
- });
+ den.aspects.desktop.provides.app.homeManager = {pkgs, ...}: let
in {
home.packages =
(with pkgs; [
- blender
ffmpeg-full
fluffychat
- geogebra6
imagemagick
- inkscape
- wireshark
])
++ (lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [
- cherry-studio # No darwin package in Nixpkgs
+ nur.repos.hpcesia.kelivo
atril
gimp3
kdePackages.kdenlive
@@ -58,7 +19,6 @@
xdg.mimeApps.defaultApplications = {
"application/pdf" = ["org.mate.atril.desktop"];
- "application/epub+zip" = ["readest.desktop"];
};
};
}
modules/desktop/apps/rmpc.nix
@@ -1,15 +0,0 @@
-{
- den.aspects.desktop.provides.app.homeManager = {config, ...}: {
- # Require MPD
- programs.rmpc = {
- enable = true;
- config = let
- mpdNetworkCfg = config.services.mpd.network;
- in ''
- (
- address: "${mpdNetworkCfg.listenAddress}:${builtins.toString mpdNetworkCfg.port}",
- )
- '';
- };
- };
-}
modules/desktop/de/custom/wm/niri/config/config.kdl
@@ -8,6 +8,7 @@ workspace "4game"
include "nix/misc.kdl"
+include "input.kdl"
include "keybinding.kdl"
include "layout.kdl"
include "recent-windows.kdl"
modules/desktop/de/custom/wm/niri/config/input.kdl
@@ -0,0 +1,8 @@
+input {
+ touchpad {
+ tap
+ natural-scroll
+ dwt
+ drag true
+ }
+}
modules/desktop/de/custom/wm/niri/config/window-rules.kdl
@@ -86,6 +86,7 @@ window-rule {
match app-id="discord"
match app-id="vesktop"
match app-id="fluffychat"
+ match app-id="com.psyche.kelivo"
open-on-workspace "3chat"
}
modules/desktop/kmscon.nix
@@ -1,4 +1,4 @@
-{lib, ...}: {
+{
den.aspects.desktop.provides.kmscon.nixos = {
# https://wiki.archlinux.org/title/KMSCON
services.kmscon = {
@@ -8,9 +8,10 @@
# including full unicode support, and when the video card supports drm should be much faster.
enable = true;
extraOptions = "--term xterm-256color";
- extraConfig = lib.mkDefault "font-size=12";
- # Whether to use 3D hardware acceleration to render the console.
- hwRender = true;
+ config = {
+ # Whether to use 3D hardware acceleration to render the console.
+ hwaccel = true;
+ };
};
};
}
modules/desktop/utils.nix
@@ -20,7 +20,5 @@
lib.filter lib.isString (builtins.split "[^a-zA-Z]" config.lib.stylix.colors.scheme)
);
in "${themePackage}/share/color-schemes/${colorSchemeSlug}.colors";
-
- gtk.gtk4.theme = config.gtk.theme;
};
}
modules/dev/helix/default.nix
@@ -45,6 +45,7 @@
helix-file-watcher
scooter-hx
wakatime-hx
+ fcitx-focus
];
};
recursive = true;
modules/dev/helix/init.scm
@@ -4,6 +4,8 @@
(require "wakatime/wakatime.scm")
+(require "helix-fcitx-focus/cogs/fcitx-focus.scm")
+
(require "helix/configuration.scm")
(define-lsp "steel-language-server" (command "steel-language-server") (args '()))
(define-language "scheme" (language-servers '("steel-language-server")))
modules/dev/opencode.nix
@@ -1,5 +1,5 @@
{
- den.aspects.dev.homeManager = {
+ den.aspects.dev.homeManager = {pkgs, ...}: {
programs.opencode = {
enable = true;
settings = {
@@ -33,6 +33,13 @@
"@simonwjackson/opencode-direnv"
];
};
+ skills = {
+ jujutsu = pkgs.fetchurl {
+ pname = "jujutsu-skill.md";
+ url = "https://github.com/danverbraganza/jujutsu-skill/raw/4941ad91cb0671309b90633344e935fce27a7ffa/jujutsu/SKILL.md";
+ hash = "sha256-xmY7sEZd1T2iKBqHTFr1w3g5gqY++r7PL42G6q0O/b4=";
+ };
+ };
};
};
}
modules/hosts/kevin/hardware/screen.nix
@@ -9,8 +9,6 @@
];
services.xserver.dpi = 192;
-
- services.kmscon.extraConfig = "font-size=20";
};
den.aspects.kevin.provides.to-users.homeManager = {osConfig, ...}: let
modules/hosts/kevin/boot.nix
@@ -29,6 +29,8 @@
enable = true;
};
+ boot.binfmt.emulatedSystems = ["aarch64-linux"];
+
boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest;
boot.kernelParams = ["mem_sleep_default=deep"];
modules/hosts/mobius/default.nix
@@ -17,7 +17,10 @@ in {
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMesHdI8FLpEPr6KG7t50+d+jKntmtAKvPT9amqdPaaz root@mobius";
hashedPasswordAged = ./hashed-password.age;
sshPorts = [21632];
- authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMKaGC2I3an4AJDeWzVx5vhm63+kxi6zJNdh7yEp6CK hpcesia@kevin"];
+ authorizedKeys = [
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMKaGC2I3an4AJDeWzVx5vhm63+kxi6zJNdh7yEp6CK hpcesia@kevin"
+ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH6wZFUEv9pSV+MgzqZRJ08WwJvL5FRMhayp73kCnDckAAAABHNzaDo= me@hpcesia.com"
+ ];
tailscaleIpv4 = "100.64.0.2";
tailscaleIpv6 = "fd7a:115c:a1e0::2";
users.hpcesia.classes = ["homeManager"];
modules/hosts/pardofelis/default.nix
@@ -17,7 +17,10 @@ in {
pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuT/WkeA7btTeATmWJ2O9f/A6FI0Gl/1KjPGfHbWD5C root@pardofelis";
hashedPasswordAged = ./hashed-password.age;
sshPorts = [23930];
- authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMKaGC2I3an4AJDeWzVx5vhm63+kxi6zJNdh7yEp6CK hpcesia@kevin"];
+ authorizedKeys = [
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMKaGC2I3an4AJDeWzVx5vhm63+kxi6zJNdh7yEp6CK hpcesia@kevin"
+ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH6wZFUEv9pSV+MgzqZRJ08WwJvL5FRMhayp73kCnDckAAAABHNzaDo= me@hpcesia.com"
+ ];
tailscaleIpv4 = "100.64.0.4";
tailscaleIpv6 = "fd7a:115c:a1e0::4";
users.hpcesia = {};
modules/users/hpcesia/default.nix
@@ -51,6 +51,7 @@ in {
++ (lib.optionals config.programs.gamemode.enable ["gamemode"]);
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMKaGC2I3an4AJDeWzVx5vhm63+kxi6zJNdh7yEp6CK hpcesia@kevin"
+ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH6wZFUEv9pSV+MgzqZRJ08WwJvL5FRMhayp73kCnDckAAAABHNzaDo= me@hpcesia.com"
];
};
secrets/cache/kevin/9d9d5b63e578329ff73a1033dc0fded97e832e51a202b3a9fb69945e04bb8450
Binary file
secrets/cache/kevin/c28c68b759e3f9b721fdce31eb3c756e9d8d22ab1a3b07caf1eb778b844b3c03
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 WM7kiQ SuXBgcEZENdcU8+NdtL9N2d2dCzOSPs7FCZ4SoCszlU
-zF/OPQ3PycKd2q6nHqb8XOhb7Bcbn7iB05yr4gjaY0k
--> ?G-grease
-7g6Vo3xlb+MeFsVnDsaMbHc832TzdR0hNPqdkqw+d+RJErjeWc/bVw
---- ypsoMGuOxndktV0jCfNVRwAvLWwMpPNbJ4tubWn3A5k
-�6J0���ʼ�ӳ��p��W��<��͋(�Gɬ�����&�e�r��1#��VI�����ޒA��K�R�� �A��ʢ -��Ӌ�$BV1a:����6Q���"B_��ڶ��h��ANOW�־t�4N�
\ No newline at end of file
secrets/cache/mobius/7ea8d0d8906ee2b3f07060f2ab4a61bc296a54754df9a1168a48e7f9b8f6c8f4
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 5saP2w lkxerK82wYioFw/hCkGaqTtwbhP2CvMsaUiNQsRj7BY
+4ubbb+IxK68vozdUAUvtvu8+dNOgfINZn7cBvfDVof8
+-> >*3#nLQ-grease . M#%8'/ Zv"?< {
+DkGYvsk9DxN4E3kEDVcTMpqUyiMQ6JsMxWKbH4xElJDXW+O8yy5N8LRNX3c9MG4
+--- NqIgZietMpWcSLX5JYnC/HcT/EYegmWa8CbaQMwlVkM
+6Q�U,:Ϝ�6��3P��4#�MZ��!�o������e��}�:�>��������e�f ��R�n�Y�,��A|o�5Ǭ�k�Ϫ������6����������x}U���3�t�=t���N��
\ No newline at end of file
secrets/cache/mobius/e0a0d425a9c8cf3c35b5b2b08c377f2a5e2c7ed092ac7cc0bd27df3a0d2182ce
Binary file
secrets/cache/pardofelis/58b5a7d92e6210c9bbcff8e0c124faef32cc262ac171011b459a1633c17fefe3
Binary file
secrets/cache/pardofelis/d6ecf731105102f1d7443aa187ac2dd272540269fdc628d38496ccf31e66de11
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 B1HLiw LDfIfoC2LJ2mlZaIGFxW/t1C8QW/KjvwLBD2ztRdvi0
+VcsCqoZUqJHtBqlznJ/mj8y1Gjy48gT4Hre3Mx9OEW0
+-> <u(-grease
+o0SM9Pe/83xAdVE2tZ8jQIdly7+rqZSF1A0iteWlKJ02rDdhFXbKvzSPfQ8snTd5
+KCLi7x9dGrZHGkA2Cw
+--- QakmpdH+F3Z1PwCcjgGgi2MiPd9ZGE0ygf+0DyiQzjA
+�+r�ΒC�Y,L؇!��@ e��܋��kQ�9|h<X8K����gJw� FL�U�9��k- 3D�IY^װռ}��+r�;�� V �1?�����P��i@U-T�Lz����V�% �A;z�jr��
\ No newline at end of file
flake.lock
@@ -230,11 +230,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
- "lastModified": 1776136500,
- "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
+ "lastModified": 1779670703,
+ "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
- "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
+ "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9",
"type": "github"
},
"original": {
@@ -423,11 +423,11 @@
]
},
"locked": {
- "lastModified": 1775087534,
- "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+ "lastModified": 1778716662,
+ "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+ "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github"
},
"original": {
@@ -595,11 +595,11 @@
]
},
"locked": {
- "lastModified": 1779118529,
- "narHash": "sha256-+N//FFtb7YMg25HAhCejgQIkiqF5otLQtyrDrouRxlM=",
+ "lastModified": 1780885330,
+ "narHash": "sha256-aMA5oAq2Iv467U9s8YOb50DYQT9w0WJbyWqwlzHuLMs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "7519f615df36804ef40bcb03d4114f5ec9216d40",
+ "rev": "4fe95527cbe952713318ada8a4d122e1a6ab120f",
"type": "github"
},
"original": {
@@ -799,11 +799,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1778443072,
- "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+ "lastModified": 1780749050,
+ "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+ "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
"type": "github"
},
"original": {
@@ -918,11 +918,11 @@
]
},
"locked": {
- "lastModified": 1779205405,
- "narHash": "sha256-JzgpTZKfVp5HyXTWZlmIltpJkSzEBDZnXkoxf52hjrM=",
+ "lastModified": 1781364763,
+ "narHash": "sha256-G3YorGfN2Khu1+6iQh3MpxAz0YN3KjNKZumjzsATFr0=",
"owner": "HPCesia",
"repo": "nur-packages",
- "rev": "7e4949d662fe87d9771cb76269e408e99fd0626a",
+ "rev": "51657089bf64c9dc289a8b50b5679623765ebef9",
"type": "github"
},
"original": {
@@ -943,11 +943,11 @@
]
},
"locked": {
- "lastModified": 1777598946,
- "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
+ "lastModified": 1780281641,
+ "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
+ "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01",
"type": "github"
},
"original": {
@@ -1025,11 +1025,11 @@
"utils": "utils_2"
},
"locked": {
- "lastModified": 1779080081,
- "narHash": "sha256-ALbrKCm7fqsvwEpSTsNaqZn8AOJ1jdUJoe4Vrm8+6iQ=",
+ "lastModified": 1780914095,
+ "narHash": "sha256-OjjFnyowUL1qBxkdchZQMQVhZY255pOxWDID6KFmPpo=",
"owner": "wamserma",
"repo": "flake-programs-sqlite",
- "rev": "8b151aa1496b9c64790b90efc112394339927cb9",
+ "rev": "114f206e64a855286bc1c2cc64d6c660ccf37019",
"type": "github"
},
"original": {
@@ -1152,11 +1152,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
- "lastModified": 1778776709,
- "narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=",
+ "lastModified": 1780701809,
+ "narHash": "sha256-u7AUNs6U6eD1os4+ghbr1gH4QjPWzOdKvpeM+E+XRKM=",
"owner": "nix-community",
"repo": "stylix",
- "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819",
+ "rev": "3a02d9f73608641b28e08b26acb0b0b47c05f14b",
"type": "github"
},
"original": {
@@ -1259,11 +1259,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
- "lastModified": 1777041405,
- "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
+ "lastModified": 1777806186,
+ "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
"owner": "tinted-theming",
"repo": "schemes",
- "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
+ "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
"type": "github"
},
"original": {
@@ -1275,11 +1275,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
- "lastModified": 1777169200,
- "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
+ "lastModified": 1778379944,
+ "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
- "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
+ "rev": "fe0203a198690e71a5ff11e08812a4673de3678d",
"type": "github"
},
"original": {
@@ -1291,11 +1291,11 @@
"tinted-zed": {
"flake": false,
"locked": {
- "lastModified": 1777463218,
- "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
+ "lastModified": 1778378178,
+ "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=",
"owner": "tinted-theming",
"repo": "base16-zed",
- "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
+ "rev": "9cd816033ff969415b190722cddf134e78a5665f",
"type": "github"
},
"original": {