Compare commits

...

6 Commits

Author SHA1 Message Date
Ryan Yin 2a26d51eaa feat(linux) - avoid compiling creative tools, update noctalia & utils.nu 2026-06-03 14:07:35 +08:00
Ryan Yin af0ef6d154 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs-patched':
    'github:ryan4yin/nixpkgs/d373b16187b32770d99f6ff54a133d9543e68702?narHash=sha256-75W3YfzkkKvpE3/wtHMihlT9kOnQZxWpLoshw1xu0T8%3D' (2026-03-20)
  → 'github:ryan4yin/nixpkgs/4425024452e93ce3d10e11bcd9b47f1dfa78593b?narHash=sha256-pu3loLm4gvcbh8iibeYDGgPHOVFXb8sAKEzJ9AxX5L4%3D' (2026-06-03)

fix: qq
2026-06-03 11:56:48 +08:00
Ryan Yin fe4923f8cb fix: suppress nixvim nixpkgs.source and ssh matchBlocks deprecation warnings (#262)
Explicitly set programs.nixvim.nixpkgs.source to suppress the follows
    warning, and migrate all programs.ssh.matchBlocks to programs.ssh.settings
    using upstream PascalCase directive names.
2026-06-03 11:23:30 +08:00
Ryan Yin 44b0258129 fix(darwin): ghostty 2026-06-03 11:08:16 +08:00
Ryan Yin 685af3fa2c fix(darwin): depends on wayland 2026-06-03 11:08:16 +08:00
Ryan Yin 67eb9934ab flake.lock: Update
Flake lock file updates:

• Updated input 'mysecrets':
    'git+ssh://git@github.com/ryan4yin/nix-secrets.git?ref=refs/heads/main&rev=c388ca33beb5c099bf4603e6ab25a2e94af00b80&shallow=1' (2026-03-19)
  → 'git+ssh://git@github.com/ryan4yin/nix-secrets.git?ref=refs/heads/main&rev=0e2b90e6d57dfa70c0527c3a4d399bde82998f78&shallow=1' (2026-06-03)
2026-06-03 10:25:24 +08:00
12 changed files with 49 additions and 51 deletions
Generated
+6 -6
View File
@@ -588,10 +588,10 @@
"mysecrets": { "mysecrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773927262, "lastModified": 1780453481,
"narHash": "sha256-nxx7jAiHGTYU6hXdjHYjdR1SJNgFcVPokiFlR8MZwTc=", "narHash": "sha256-kH3iAbIuRVtB8VOjQrV10HtxO1z22fwUH8oFVfJoFVE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c388ca33beb5c099bf4603e6ab25a2e94af00b80", "rev": "0e2b90e6d57dfa70c0527c3a4d399bde82998f78",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ryan4yin/nix-secrets.git" "url": "ssh://git@github.com/ryan4yin/nix-secrets.git"
@@ -804,11 +804,11 @@
}, },
"nixpkgs-patched": { "nixpkgs-patched": {
"locked": { "locked": {
"lastModified": 1774012337, "lastModified": 1780458942,
"narHash": "sha256-75W3YfzkkKvpE3/wtHMihlT9kOnQZxWpLoshw1xu0T8=", "narHash": "sha256-pu3loLm4gvcbh8iibeYDGgPHOVFXb8sAKEzJ9AxX5L4=",
"owner": "ryan4yin", "owner": "ryan4yin",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d373b16187b32770d99f6ff54a133d9543e68702", "rev": "4425024452e93ce3d10e11bcd9b47f1dfa78593b",
"type": "github" "type": "github"
}, },
"original": { "original": {
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
pkgs, pkgs,
pkgs-master, pkgs-patched,
nixpak, nixpak,
... ...
}: }:
@@ -22,7 +22,7 @@ in
nixpkgs.overlays = [ nixpkgs.overlays = [
(_: super: { (_: super: {
nixpaks = { nixpaks = {
qq = wrapper super ./qq.nix; qq = wrapper pkgs-patched ./qq.nix;
telegram-desktop = wrapper super ./telegram-desktop.nix; telegram-desktop = wrapper super ./telegram-desktop.nix;
firefox = wrapper super ./firefox.nix; firefox = wrapper super ./firefox.nix;
}; };
+10 -2
View File
@@ -1,7 +1,15 @@
{ config, nixvim, ... }: {
config,
nixpkgs,
nixvim,
pkgs,
...
}:
{ {
imports = [ nixvim.homeModules.nixvim ]; imports = [ nixvim.homeModules.nixvim ];
programs.nixvim.nixpkgs.source = nixpkgs;
home.shellAliases = { home.shellAliases = {
vi = "nvim"; vi = "nvim";
@@ -11,7 +19,7 @@
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;
clipboard.providers.wl-copy.enable = true; clipboard.providers.wl-copy.enable = pkgs.stdenv.isLinux;
opts = { opts = {
number = true; number = true;
+2 -2
View File
@@ -12,9 +12,9 @@
enable = true; enable = true;
package = package =
if pkgs.stdenv.isDarwin then if pkgs.stdenv.isDarwin then
pkgs.hello # pkgs.ghostty is currently broken on darwin null # installed via Homebrew cask on darwin
else else
pkgs.ghostty; # the stable version pkgs.ghostty;
enableBashIntegration = false; enableBashIntegration = false;
installBatSyntax = false; installBatSyntax = false;
# installVimSyntax = true; # installVimSyntax = true;
+19 -29
View File
@@ -9,42 +9,32 @@
programs.ssh = { programs.ssh = {
enable = true; enable = true;
# default config
enableDefaultConfig = false; enableDefaultConfig = false;
matchBlocks."*" = { settings."*" = {
forwardAgent = false; ForwardAgent = false;
# "a private key that is used during authentication will be added to ssh-agent if it is running" AddKeysToAgent = "yes";
addKeysToAgent = "yes"; Compression = true;
compression = true; ServerAliveInterval = 0;
serverAliveInterval = 0; ServerAliveCountMax = 3;
serverAliveCountMax = 3; HashKnownHosts = false;
hashKnownHosts = false; UserKnownHostsFile = "~/.ssh/known_hosts";
userKnownHostsFile = "~/.ssh/known_hosts"; ControlMaster = "no";
controlMaster = "no"; ControlPath = "~/.ssh/master-%r@%n:%p";
controlPath = "~/.ssh/master-%r@%n:%p"; ControlPersist = "no";
controlPersist = "no";
}; };
matchBlocks = { settings = {
"github.com" = { "github.com" = {
# "Using SSH over the HTTPS port for GitHub" HostName = "ssh.github.com";
# "(port 22 is banned by some proxies / firewalls)" Port = 443;
hostname = "ssh.github.com"; User = "git";
port = 443; IdentitiesOnly = true;
user = "git";
# Specifies that ssh should only use the identity file explicitly configured above
# required to prevent sending default identity files first.
identitiesOnly = true;
}; };
"192.168.*" = { "192.168.*" = {
# "allow to securely use local SSH agent to authenticate on the remote machine." ForwardAgent = true;
# "It has the same effect as adding cli option `ssh -A user@host`" IdentityFile = "/etc/agenix/ssh-key-romantic";
forwardAgent = true; IdentitiesOnly = true;
# "romantic holds my homelab~"
identityFile = "/etc/agenix/ssh-key-romantic";
identitiesOnly = true;
}; };
}; };
}; };
+1 -2
View File
@@ -5,6 +5,5 @@ in
{ {
imports = [ ../../darwin ]; imports = [ ../../darwin ];
programs.ssh.matchBlocks."github.com".identityFile = programs.ssh.settings."github.com".IdentityFile = "${config.home.homeDirectory}/.ssh/${hostName}";
"${config.home.homeDirectory}/.ssh/${hostName}";
} }
+1 -2
View File
@@ -5,6 +5,5 @@ in
{ {
imports = [ ../../darwin ]; imports = [ ../../darwin ];
programs.ssh.matchBlocks."github.com".identityFile = programs.ssh.settings."github.com".IdentityFile = "${config.home.homeDirectory}/.ssh/${hostName}";
"${config.home.homeDirectory}/.ssh/${hostName}";
} }
+1 -2
View File
@@ -6,8 +6,7 @@ in
{ {
imports = [ ../../linux/gui.nix ]; imports = [ ../../linux/gui.nix ];
programs.ssh.matchBlocks."github.com".identityFile = programs.ssh.settings."github.com".IdentityFile = "${config.home.homeDirectory}/.ssh/${hostName}";
"${config.home.homeDirectory}/.ssh/${hostName}";
modules.desktop.gaming.enable = false; modules.desktop.gaming.enable = false;
modules.desktop.niri.enable = true; modules.desktop.niri.enable = true;
+1 -1
View File
@@ -5,7 +5,7 @@ in
{ {
imports = [ ../../linux/gui.nix ]; imports = [ ../../linux/gui.nix ];
programs.ssh.matchBlocks."github.com".identityFile = "${config.home.homeDirectory}/.ssh/idols-ai"; programs.ssh.settings."github.com".IdentityFile = "${config.home.homeDirectory}/.ssh/idols-ai";
modules.desktop.gaming.enable = true; modules.desktop.gaming.enable = true;
modules.desktop.niri.enable = true; modules.desktop.niri.enable = true;
+2 -1
View File
@@ -1,12 +1,13 @@
{ {
lib, lib,
pkgs, pkgs,
pkgs-stable,
blender-bin, blender-bin,
... ...
}: }:
{ {
home.packages = home.packages =
with pkgs; with pkgs-stable;
[ [
# creative # creative
# gimp # image editing, I prefer using figma in browser instead of this one # gimp # image editing, I prefer using figma in browser instead of this one
@@ -176,8 +176,8 @@
"unreadBadgeColor": "primary" "unreadBadgeColor": "primary"
}, },
{ {
"deviceNativePath": "", "deviceNativePath": "__default__",
"displayMode": "alwaysShow", "displayMode": "icon-always",
"hideIfIdle": false, "hideIfIdle": false,
"hideIfNotDetected": true, "hideIfNotDetected": true,
"id": "Battery", "id": "Battery",
+2
View File
@@ -14,6 +14,8 @@ export def nixos-switch [
# show details via nix-output-monitor # show details via nix-output-monitor
nom build $".#nixosConfigurations.($name).config.system.build.toplevel" --show-trace --verbose nom build $".#nixosConfigurations.($name).config.system.build.toplevel" --show-trace --verbose
nixos-rebuild switch --sudo --flake $".#($name)" --show-trace --verbose nixos-rebuild switch --sudo --flake $".#($name)" --show-trace --verbose
} else if "boot" == $mode {
nixos-rebuild boot --sudo --flake $".#($name)"
} else { } else {
nixos-rebuild switch --sudo --flake $".#($name)" nixos-rebuild switch --sudo --flake $".#($name)"
} }