diff --git a/flake.lock b/flake.lock index 762e1e78..814b16ce 100644 --- a/flake.lock +++ b/flake.lock @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1715445235, - "narHash": "sha256-SUu+oIWn+xqQIOlwfwNfS9Sek4i1HKsrLJchsDReXwA=", + "lastModified": 1715722685, + "narHash": "sha256-SaccIpa1ToibLs3iULKUZEIBi8aOWVE2RSsLikjl4Tc=", "owner": "nix-community", "repo": "disko", - "rev": "159d87ea5b95bbdea46f0288a33c5e1570272725", + "rev": "d62af72c2262ee6b9bd143901e21dbb3503555f7", "type": "github" }, "original": { @@ -725,11 +725,11 @@ ] }, "locked": { - "lastModified": 1715380449, - "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7682620185f213df384c363288093b486b2883f", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -801,11 +801,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1715468612, - "narHash": "sha256-pA0lpLJ3a+EhOCpEdksx5UlzXTcOaZzISppKKLYwAeg=", + "lastModified": 1715724815, + "narHash": "sha256-I1ioStn+IZEURbjvsB+ZHuABldyqNefwi2utovefn+I=", "ref": "refs/heads/main", - "rev": "33a7b7bb6b307d6e4a093f75ffdda0419cd7ffaf", - "revCount": 4671, + "rev": "94c20a186372aace78b188842848b873eb3ebbd7", + "revCount": 4693, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -880,11 +880,11 @@ ] }, "locked": { - "lastModified": 1715287423, - "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", + "lastModified": 1715608589, + "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", + "rev": "65c2636484e5cb00583b8a7446c3fb657f568883", "type": "github" }, "original": { @@ -981,11 +981,11 @@ ] }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1715653378, + "narHash": "sha256-6kbg/PI3+SBP17f4T0js3CBsMLVtlD0JqJhDKgzk1mQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "de8b0d60d6fd34f35abffc46adc94ebaa6996ce2", "type": "github" }, "original": { @@ -1021,11 +1021,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1715476621, - "narHash": "sha256-tsvjakds3dmU0L+hFk35JwihQAd40d5AoVZmq62IaHU=", + "lastModified": 1715649322, + "narHash": "sha256-Af5CcJDTu0ZP/DX06Rmvvsu5lDlwdFtqfmson+AsgSk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "78c0a23969771a7fe1a0dc51b23dc8bc07a6c555", + "rev": "93c32c34b2b572038e1df62cf11ccc647f9d4066", "type": "github" }, "original": { @@ -1171,11 +1171,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1711336411, - "narHash": "sha256-0JZPbUB6LjcRilXhZdtsVHtb0V9Vy1bmVjVoeQAPJhQ=", + "lastModified": 1715737248, + "narHash": "sha256-DFh9cEWypbcitiuQ+pazHrY2z0qq2XYzPFsqZg7oZ5M=", "owner": "ryan4yin", "repo": "nixos-rk3588", - "rev": "349f39dcaafeb41250544bcc066db8668a7762ce", + "rev": "c4fef04d8c124146e6e99138283e0c57b2ad8e29", "type": "github" }, "original": { @@ -1202,11 +1202,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1715443657, - "narHash": "sha256-TSXxKuso+HwEkLzrFUOnGhjnD9TT4ypgjyOMEW8tRmw=", + "lastModified": 1715615524, + "narHash": "sha256-t1t39+9F0NSrUQQsvrQ0Ym/BfnOtjgXnJVn8daI3968=", "owner": "nixos", "repo": "nixpkgs", - "rev": "564052918454a8a255df77c07352d5e72aa71463", + "rev": "8a4282c38b6cbea9f0989c0eafc6ce1837a26442", "type": "github" }, "original": { @@ -1298,11 +1298,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1715395895, - "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", + "lastModified": 1715542476, + "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", + "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1442,11 +1442,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1507,11 +1507,11 @@ }, "nur": { "locked": { - "lastModified": 1715492953, - "narHash": "sha256-hEn/tkAbs42Gmm7WK3IhnzQG6X7ICMxhwBqAF9GvoM4=", + "lastModified": 1715747238, + "narHash": "sha256-2SDntG1J87XvN0SARgWbEPwkZa4K75/wsIej9z3R1BA=", "owner": "nix-community", "repo": "NUR", - "rev": "7d021b60cd4dd8af0e0d8b4ee1f8cdca91f4514c", + "rev": "15722f6171e918844b5bc4d55509b47db5e25ffa", "type": "github" }, "original": { @@ -1699,11 +1699,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "lastModified": 1715609711, + "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", + "rev": "c182c876690380f8d3b9557c4609472ebfa1b141", "type": "github" }, "original": { diff --git a/home/base/core/btop.nix b/home/base/core/btop.nix index 5f94613f..af47fc6a 100644 --- a/home/base/core/btop.nix +++ b/home/base/core/btop.nix @@ -14,4 +14,10 @@ theme_background = false; # make btop transparent }; }; + dconf.settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = ["qemu:///system"]; + uris = ["qemu:///system"]; + }; +}; } diff --git a/home/base/core/yazi.nix b/home/base/core/yazi.nix index bd43e7b7..295bea8d 100644 --- a/home/base/core/yazi.nix +++ b/home/base/core/yazi.nix @@ -11,7 +11,7 @@ # Changing working directory when exiting Yazi enableBashIntegration = true; # TODO: nushellIntegration is broken on release-23.11, wait for master's fix to be released - enableNushellIntegration = false; + enableNushellIntegration = true; }; xdg.configFile."yazi/theme.toml".source = "${nur-ryan4yin.packages.${pkgs.system}.catppuccin-yazi}/mocha.toml"; diff --git a/home/base/tui/editors/packages.nix b/home/base/tui/editors/packages.nix index 2e0aa70a..2b017ef1 100644 --- a/home/base/tui/editors/packages.nix +++ b/home/base/tui/editors/packages.nix @@ -33,6 +33,7 @@ requests pyquery pyyaml + boto3 ## emacs's lsp-bridge dependenciesge epc diff --git a/home/linux/gui/base/misc.nix b/home/linux/gui/base/misc.nix index e17cd429..c70a6ced 100644 --- a/home/linux/gui/base/misc.nix +++ b/home/linux/gui/base/misc.nix @@ -13,7 +13,7 @@ telegram-desktop discord pkgs-unstable.qq # https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/networking/instant-messengers/qq - + wechat-uos # remote desktop(rdp connect) remmina freerdp # required by remmina diff --git a/home/linux/gui/hyprland/conf/hyprland.conf b/home/linux/gui/hyprland/conf/hyprland.conf index 78da03f1..d561f83a 100644 --- a/home/linux/gui/hyprland/conf/hyprland.conf +++ b/home/linux/gui/hyprland/conf/hyprland.conf @@ -73,6 +73,7 @@ dwindle { } monitor = eDP-1,2560x1440@165,auto,1 +monitor = HDMI-A-1,2560x1440@144,auto,1,bitdepth,10 #-- Window Rules ---------------------------------------------------- windowrule=float,foot-float windowrule=float,yad|nm-connection-editor|pavucontrolk @@ -196,6 +197,4 @@ exec-once=~/.config/hypr/scripts/startup exec-once=cp ~/.config/fcitx5/profile-bak ~/.config/fcitx5/profile # restore fcitx5 profile managed by nixos exec-once=fcitx5 -d --replace # start fcitx5 daemon bind=ALT,E,exec,pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r -windowrulev2 = stayfocused, class:(Rofi) #fixed focus -exec-once = nm-applet - +windowrulev2 = stayfocused, class:(Rofi) #fixed focus \ No newline at end of file diff --git a/hosts/idols-ai/impermanence.nix b/hosts/idols-ai/impermanence.nix index 5ba0c54a..568513ba 100644 --- a/hosts/idols-ai/impermanence.nix +++ b/hosts/idols-ai/impermanence.nix @@ -57,7 +57,7 @@ "codes" "nix-config" "tmp" - + "Downloads" "Music" "Pictures" @@ -114,16 +114,17 @@ ".config/Code/User" ".config/Code - Insiders/User" + + # browsers ".mozilla" ".config/google-chrome" + ".config/Kingsoft" # neovim / remmina / flatpak / ... ".local/share" ".local/state" - ".cache/JetBrains" - # language package managers ".npm" ".conda" # generated by `conda-shell` @@ -139,7 +140,8 @@ files = [ ".wakatime.cfg" ".config/nushell/history.txt" - ".cache/rofi.druncache" + ".cache/rofi3.druncache" + ".cache/rofi-entry-history.txt" ]; }; }; diff --git a/modules/nixos/base/nix-ld.nix b/modules/nixos/base/nix-ld.nix new file mode 100644 index 00000000..d5eaced2 --- /dev/null +++ b/modules/nixos/base/nix-ld.nix @@ -0,0 +1,66 @@ +{ pkgs, self, ... }: +{ + # Enable nix ld + programs.nix-ld.enable = true; + programs.nix-ld.package = pkgs.nix-ld-rs; + + programs.nix-ld.libraries = with pkgs; [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + cudatoolkit + dbus + expat + fontconfig + freetype + fuse3 + gdk-pixbuf + glib + gtk3 + icu + libGL + libappindicator-gtk3 + libdrm + libglvnd + libnotify + libpulseaudio + libunwind + libusb1 + libuuid + libxkbcommon + libxml2 + libkrb5 + linuxPackages.nvidia_x11 + mesa + nspr + nss + ncurses5 + openssl + pango + pipewire + stdenv.cc.cc + systemd + vulkan-loader + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + xorg.libxkbfile + xorg.libxshmfence + zlib + wayland + + ]; +} \ No newline at end of file diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix index f955add3..1890e92c 100644 --- a/modules/nixos/base/nix.nix +++ b/modules/nixos/base/nix.nix @@ -19,7 +19,6 @@ # Manual optimise storage: nix-store --optimise # https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-auto-optimise-store nix.settings.auto-optimise-store = true; - programs.nix-ld.enable = true; nix.channel.enable = false; # remove nix-channel related tools & configs, we use flakes instead. } diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix index ae57db3b..b2ed5151 100644 --- a/modules/nixos/desktop/fonts.nix +++ b/modules/nixos/desktop/fonts.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{pkgs, ...}: + { # all fonts are linked to /nix/var/nix/profiles/system/sw/share/X11/fonts fonts = { # use fonts specified by user rather than default ones @@ -9,7 +10,8 @@ # icon fonts material-design-icons font-awesome - + + nur.repos.rewine.ttf-wps-fonts # Noto 系列字体是 Google 主导的，名字的含义是「没有豆腐」（no tofu），因为缺字时显示的方框或者方框被叫作 tofu # Noto 系列字族名只支持英文，命名规则是 Noto + Sans 或 Serif + 文字名称。 # 其中汉字部分叫 Noto Sans/Serif CJK SC/TC/HK/JP/KR，最后一个词是地区变种。 diff --git a/modules/nixos/desktop/myfonts/default.nix b/modules/nixos/desktop/myfonts/default.nix new file mode 100644 index 00000000..35cc896b --- /dev/null +++ b/modules/nixos/desktop/myfonts/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +let + ttf-ms-fonts = pkgs.callPackage ./ttf-ms-fonts.nix {}; +in +{ + environment.systemPackages = with pkgs; [ + ttf-ms-fonts + ]; +} diff --git a/modules/nixos/desktop/myfonts/ttf-ms-fonts.nix b/modules/nixos/desktop/myfonts/ttf-ms-fonts.nix new file mode 100644 index 00000000..7b540d80 --- /dev/null +++ b/modules/nixos/desktop/myfonts/ttf-ms-fonts.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { + pname = "ttf-ms-fonts"; + version = "9.9.9"; + + src = fetchFromGitHub { + owner = "QixYuanmeng"; + repo = "ttf-ms-win10"; + rev = "60742666ee375df71a77c57db4bbf0713f34e44a"; + sha256 = "1kp85ih34svjyxms2qkvvxr6qra5kqisj4gjzmknv1vv2mpc5fyb"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + install -D *.{ttf,ttc,TTF} $out/share/fonts/truetype/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/QixYuanmeng/ttf-ms-win10"; + description = "..."; + longDescription = '' + i need this + ''; + license = licenses.unfree; + platforms = platforms.all; + }; +} diff --git a/modules/nixos/desktop/virtualisation.nix b/modules/nixos/desktop/virtualisation.nix index cfd4cef6..db43aa47 100644 --- a/modules/nixos/desktop/virtualisation.nix +++ b/modules/nixos/desktop/virtualisation.nix @@ -61,4 +61,5 @@ # ...... qemu ]; + #services.qemuGuest.enable = true; }