From 5cc78b3494232e65592f8592e5c6c49e3f098d5f Mon Sep 17 00:00:00 2001 From: xinyangli Date: Sat, 22 Jul 2023 01:20:55 +0800 Subject: [PATCH] Bump version --- flake.lock | 56 +++++++++++++++--------------- home/xin/alacritty.nix | 6 +++- home/xin/calcite/default.nix | 2 +- home/xin/common/default.nix | 2 ++ home/xin/common/vim.nix | 2 +- home/xin/common/zellij.nix | 3 +- home/xin/vscode.nix | 26 +++++++------- machines/calcite/configuration.nix | 24 +++++++++---- 8 files changed, 68 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index 7cb9f86..c5d4f12 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1685108129, - "narHash": "sha256-6Jv6LxrLfaueHj095oBUKBk++eW4Ya0qfHwhQVQqyoo=", + "lastModified": 1689891262, + "narHash": "sha256-Pc4wDczbdgd6QXKJIXprgxe7L9AVDsoAkMnvm5vmpUU=", "owner": "nix-community", "repo": "home-manager", - "rev": "bec196cd9b5f34213c7dc90ef2a524336df70e30", + "rev": "ee5673246de0254186e469935909e821b8f4ec15", "type": "github" }, "original": { @@ -76,11 +76,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1685150126, - "narHash": "sha256-Pzliu5Q0Ck95vtuIAGw+rjuvEpnZOdQ6hnEoEOwhEE4=", + "lastModified": 1689903271, + "narHash": "sha256-t3CPQ3afi5fUbY/I4nldZgsUMO9/17UwIC9XPiD0ybs=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "10ce968c6896fb0866d4c80c7e4c684f849d56d2", + "rev": "2064829219ef11822e539664ba975fdf443bbe7b", "type": "github" }, "original": { @@ -112,11 +112,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1684899633, - "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", + "lastModified": 1689320556, + "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", + "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685004253, - "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=", + "lastModified": 1689885880, + "narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91", + "rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0", "type": "github" }, "original": { @@ -160,27 +160,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1684632198, - "narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=", + "lastModified": 1689473667, + "narHash": "sha256-41ePf1ylHMTogSPAiufqvBbBos+gtB6zjQlYFSEKFMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247", + "rev": "13231eccfa1da771afa5c0807fdd73e05a1ec4e6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1684935479, - "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=", + "lastModified": 1689850295, + "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f91ee3065de91a3531329a674a45ddcb3467a650", + "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", "type": "github" }, "original": { @@ -192,11 +192,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1684585791, - "narHash": "sha256-lYPboblKrchmbkGMoAcAivomiOscZCjtGxxTSCY51SM=", + "lastModified": 1689413807, + "narHash": "sha256-exuzOvOhGAEKWQKwDuZAL4N8a1I837hH5eocaTcIbLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eea79d584eff53bf7a76aeb63f8845da6d386129", + "rev": "46ed466081b9cad1125b11f11a2af5cc40b942c7", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "nur": { "locked": { - "lastModified": 1685145797, - "narHash": "sha256-a4mMWQKgjWShf0MkEMoDJPYEJ8eu2T7MA8DxbTMQRUA=", + "lastModified": 1689957702, + "narHash": "sha256-65SH/R79QEJMy41Z4oKGV6aGI0maFy7kgOExORJ5ttM=", "owner": "nix-community", "repo": "NUR", - "rev": "cbc0fb5c6412cc84de6a4fb33d6500217082c4c9", + "rev": "5bf71ded2372cbf1df969164193523c09a36b92c", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1684637723, - "narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=", + "lastModified": 1689534977, + "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9", + "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81", "type": "github" }, "original": { diff --git a/home/xin/alacritty.nix b/home/xin/alacritty.nix index a4feed5..f34ff67 100644 --- a/home/xin/alacritty.nix +++ b/home/xin/alacritty.nix @@ -4,6 +4,10 @@ settings = { shell = { program = config.programs.zellij.package + "/bin/zellij"; + args = [ + "attach" + "-c" + ]; }; font.size = 10.0; window = { @@ -12,4 +16,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/home/xin/calcite/default.nix b/home/xin/calcite/default.nix index 84af437..1a13e94 100644 --- a/home/xin/calcite/default.nix +++ b/home/xin/calcite/default.nix @@ -29,6 +29,6 @@ home.packages = with pkgs; [ thunderbird + remmina ]; - } diff --git a/home/xin/common/default.nix b/home/xin/common/default.nix index fc8de9d..20f1d80 100644 --- a/home/xin/common/default.nix +++ b/home/xin/common/default.nix @@ -20,5 +20,7 @@ neofetch rclone clash + + inetutils ]; } diff --git a/home/xin/common/vim.nix b/home/xin/common/vim.nix index dac31ee..f73228d 100644 --- a/home/xin/common/vim.nix +++ b/home/xin/common/vim.nix @@ -28,5 +28,5 @@ colorscheme dracula ''; - }; +}; } diff --git a/home/xin/common/zellij.nix b/home/xin/common/zellij.nix index c994139..e485d11 100644 --- a/home/xin/common/zellij.nix +++ b/home/xin/common/zellij.nix @@ -2,7 +2,6 @@ programs.zellij = { enable = true; settings = { - on_force_close = "quit"; default_shell = "fish"; keybinds = { unbind = [ @@ -26,4 +25,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/home/xin/vscode.nix b/home/xin/vscode.nix index 66f1a15..a0b9eac 100644 --- a/home/xin/vscode.nix +++ b/home/xin/vscode.nix @@ -1,5 +1,8 @@ { config, pkgs, inputs, system, ... }: { + home.packages = with pkgs; [ + pkgs.wl-clipboard-x11 + ]; programs.vscode = { enable = true; enableUpdateCheck = false; @@ -32,11 +35,11 @@ vue.volar ms-vscode-remote.remote-ssh-edit - ]) ++ (with inputs.nixpkgs.legacyPackages.${system}.vscode-extensions; [ + mushan.vscode-paste-image + ]) ++ (with pkgs.vscode-extensions; [ # Rust rust-lang.rust-analyzer - - mkhl.direnv + github.copilot ]); userSettings = { "workbench.colorTheme" = "Default Dark+"; @@ -117,17 +120,14 @@ } ]; "[latex]" = { - "editor.formatonpaste" = false; - "editor.suggestselection" = "recentlyusedbyprefix"; - "editor.wordwrap" = "bounded"; - "editor.wordwrapcolumn" = 100; - "editor.unicodehighlight.allowedlocales" = { - "_os" = true; - "_vscode" = true; - "zh-hans" = true; - "zh-hant" = true; - }; + "editor.formatOnPaste" = false; + "editor.suggestSelection" = "recentlyusedbyprefix"; + "editor.wordWrap" = "bounded"; + "editor.wordWrapColumn" = 80; + "editor.unicodeHighlight.ambiguousCharacters" = false; }; + # Extension vscode-paste-image + "pasteImage.path" = "\${currentFileDir}/.assets"; }; }; } diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix index 5590c30..2599fad 100644 --- a/machines/calcite/configuration.nix +++ b/machines/calcite/configuration.nix @@ -104,7 +104,7 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; nixpkgs.config.permittedInsecurePackages = [ - "openssl-1.1.1t" + "openssl-1.1.1u" # For wechat-uos "electron-19.0.7" ]; @@ -131,12 +131,6 @@ # ==== Development ==== # - jetbrains.jdk # patch jetbrain runtime java - jetbrains.clion - jetbrains.pycharm-professional - jetbrains.idea-ultimate - android-studio - # Language server clang-tools rnix-lsp @@ -164,6 +158,14 @@ texlive.combined.scheme-full # ==== GUI Softwares ==== # + + # IDE + jetbrains.jdk # patch jetbrain runtime java + jetbrains.clion + jetbrains.pycharm-professional + jetbrains.idea-ultimate + android-studio + # Gnome tweaks gnomeExtensions.dash-to-dock gnomeExtensions.hide-top-bar @@ -218,6 +220,14 @@ "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store" ]; 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 services.gvfs.enable = true;