xin/diffu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump version

Browse source
This commit is contained in:
xinyangli 2023-07-22 01:20:55 +08:00
parent 77da044665
commit 5cc78b3494
8 changed files with 68 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
flake.lock
View file

@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685108129, "lastModified": 1689891262,
"narHash": "sha256-6Jv6LxrLfaueHj095oBUKBk++eW4Ya0qfHwhQVQqyoo=", "narHash": "sha256-Pc4wDczbdgd6QXKJIXprgxe7L9AVDsoAkMnvm5vmpUU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bec196cd9b5f34213c7dc90ef2a524336df70e30", "rev": "ee5673246de0254186e469935909e821b8f4ec15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,11 +76,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1685150126, "lastModified": 1689903271,
"narHash": "sha256-Pzliu5Q0Ck95vtuIAGw+rjuvEpnZOdQ6hnEoEOwhEE4=", "narHash": "sha256-t3CPQ3afi5fUbY/I4nldZgsUMO9/17UwIC9XPiD0ybs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "10ce968c6896fb0866d4c80c7e4c684f849d56d2", "rev": "2064829219ef11822e539664ba975fdf443bbe7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,11 +112,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1684899633, "lastModified": 1689320556,
"narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1685004253, "lastModified": 1689885880,
"narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=", "narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e01645c40b92d29f3ae76344a6d654986a91a91", "rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,27 +160,27 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1684632198, "lastModified": 1689473667,
"narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=", "narHash": "sha256-41ePf1ylHMTogSPAiufqvBbBos+gtB6zjQlYFSEKFMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247", "rev": "13231eccfa1da771afa5c0807fdd73e05a1ec4e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684935479, "lastModified": 1689850295,
"narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=", "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f91ee3065de91a3531329a674a45ddcb3467a650", "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1684585791, "lastModified": 1689413807,
"narHash": "sha256-lYPboblKrchmbkGMoAcAivomiOscZCjtGxxTSCY51SM=", "narHash": "sha256-exuzOvOhGAEKWQKwDuZAL4N8a1I837hH5eocaTcIbLc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eea79d584eff53bf7a76aeb63f8845da6d386129", "rev": "46ed466081b9cad1125b11f11a2af5cc40b942c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1685145797, "lastModified": 1689957702,
"narHash": "sha256-a4mMWQKgjWShf0MkEMoDJPYEJ8eu2T7MA8DxbTMQRUA=", "narHash": "sha256-65SH/R79QEJMy41Z4oKGV6aGI0maFy7kgOExORJ5ttM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "cbc0fb5c6412cc84de6a4fb33d6500217082c4c9", "rev": "5bf71ded2372cbf1df969164193523c09a36b92c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +239,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1684637723, "lastModified": 1689534977,
"narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=", "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9", "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
home/xin/alacritty.nix
View file

@ -4,6 +4,10 @@
settings = { settings = {
shell = { shell = {
program = config.programs.zellij.package + "/bin/zellij"; program = config.programs.zellij.package + "/bin/zellij";
args = [
"attach"
"-c"
];
}; };
font.size = 10.0; font.size = 10.0;
window = { window = {

2
home/xin/calcite/default.nix
View file

@ -29,6 +29,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
thunderbird thunderbird
remmina
]; ];
} }

2
home/xin/common/default.nix
View file

@ -20,5 +20,7 @@
neofetch neofetch
rclone rclone
clash clash
inetutils
]; ];
} }

2
home/xin/common/vim.nix
View file

@ -28,5 +28,5 @@
colorscheme dracula colorscheme dracula
''; '';
}; };
} }

1
home/xin/common/zellij.nix
View file

@ -2,7 +2,6 @@
programs.zellij = { programs.zellij = {
enable = true; enable = true;
settings = { settings = {
on_force_close = "quit";
default_shell = "fish"; default_shell = "fish";
keybinds = { keybinds = {
unbind = [ unbind = [

26
home/xin/vscode.nix
View file

@ -1,5 +1,8 @@
{ config, pkgs, inputs, system, ... }: { config, pkgs, inputs, system, ... }:
{ {
home.packages = with pkgs; [
pkgs.wl-clipboard-x11
];
programs.vscode = { programs.vscode = {
enable = true; enable = true;
enableUpdateCheck = false; enableUpdateCheck = false;
@ -32,11 +35,11 @@
vue.volar vue.volar
ms-vscode-remote.remote-ssh-edit ms-vscode-remote.remote-ssh-edit
]) ++ (with inputs.nixpkgs.legacyPackages.${system}.vscode-extensions; [ mushan.vscode-paste-image
]) ++ (with pkgs.vscode-extensions; [
# Rust # Rust
rust-lang.rust-analyzer rust-lang.rust-analyzer
github.copilot
mkhl.direnv
]); ]);
userSettings = { userSettings = {
"workbench.colorTheme" = "Default Dark+"; "workbench.colorTheme" = "Default Dark+";
@ -117,17 +120,14 @@
} }
]; ];
"[latex]" = { "[latex]" = {
"editor.formatonpaste" = false; "editor.formatOnPaste" = false;
"editor.suggestselection" = "recentlyusedbyprefix"; "editor.suggestSelection" = "recentlyusedbyprefix";
"editor.wordwrap" = "bounded"; "editor.wordWrap" = "bounded";
"editor.wordwrapcolumn" = 100; "editor.wordWrapColumn" = 80;
"editor.unicodehighlight.allowedlocales" = { "editor.unicodeHighlight.ambiguousCharacters" = false;
"_os" = true;
"_vscode" = true;
"zh-hans" = true;
"zh-hant" = true;
};
}; };
# Extension vscode-paste-image
"pasteImage.path" = "\${currentFileDir}/.assets";
}; };
}; };
} }

24
machines/calcite/configuration.nix
View file

@ -104,7 +104,7 @@
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"openssl-1.1.1t" "openssl-1.1.1u"
# For wechat-uos # For wechat-uos
"electron-19.0.7" "electron-19.0.7"
]; ];
@ -131,12 +131,6 @@
# ==== Development ==== # # ==== Development ==== #
jetbrains.jdk # patch jetbrain runtime java
jetbrains.clion
jetbrains.pycharm-professional
jetbrains.idea-ultimate
android-studio
# Language server # Language server
clang-tools clang-tools
rnix-lsp rnix-lsp
@ -164,6 +158,14 @@
texlive.combined.scheme-full texlive.combined.scheme-full
# ==== GUI Softwares ==== # # ==== GUI Softwares ==== #
# IDE
jetbrains.jdk # patch jetbrain runtime java
jetbrains.clion
jetbrains.pycharm-professional
jetbrains.idea-ultimate
android-studio
# Gnome tweaks # Gnome tweaks
gnomeExtensions.dash-to-dock gnomeExtensions.dash-to-dock
gnomeExtensions.hide-top-bar gnomeExtensions.hide-top-bar
@ -218,6 +220,14 @@
"https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store" "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
]; ];
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.auto-optimise-store = true;
nix.settings.access-tokens = [ "github.com=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" ];
nix.settings.trusted-users = [ "xin" "root" ];
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 30d";
};
# MTP support # MTP support
services.gvfs.enable = true; services.gvfs.enable = true;