diff --git a/flake.lock b/flake.lock index 6918978c..8abacdd2 100644 --- a/flake.lock +++ b/flake.lock @@ -47,16 +47,16 @@ "astronvim": { "flake": false, "locked": { - "lastModified": 1702659104, - "narHash": "sha256-h019vKDgaOk0VL+bnAPOUoAL8VAkhY6MGDbqEy+uAKg=", + "lastModified": 1705337239, + "narHash": "sha256-jF+D2CdnSJ5at9HYrDGHKYodVL4VBdqA94OPBu4ESUo=", "owner": "AstroNvim", "repo": "AstroNvim", - "rev": "271c9c3f71c2e315cb16c31276dec81ddca6a5a6", + "rev": "c58489a292fc2ebbc662c54a45213b01f7401f41", "type": "github" }, "original": { "owner": "AstroNvim", - "ref": "v3.40.3", + "ref": "v3.41.2", "repo": "AstroNvim", "type": "github" } @@ -371,11 +371,11 @@ ] }, "locked": { - "lastModified": 1705535278, - "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", + "lastModified": 1705823474, + "narHash": "sha256-2C4uRe9/U3QwSPC4dYKM1/njgCQk0Mltezy4VcjAqa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", + "rev": "928f2528f9ee952ba0a47bbb1ece8d93ed66e784", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1705452289, - "narHash": "sha256-i/WodLabBcmRr9hdSv5jzDigL1hRYuI8vNh+xTbGt+g=", + "lastModified": 1705796049, + "narHash": "sha256-zkqbujNu3ixEar79QJTpJeOG5MYse1uJdcjl9f96uBg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "74ab0227ee495e526f2dd57ea684b34f6396445a", + "rev": "3ac7acd32db4f7111015e8d5349ff6067df01bf6", "type": "github" }, "original": { @@ -641,11 +641,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1705422927, - "narHash": "sha256-R8EHigOW4pSreftcAx3V+XVKUc3AFi/JgnCim6EYpOk=", + "lastModified": 1705641746, + "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc4e67c811b7681e72a0324be0144d627005ab3d", + "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", "type": "github" }, "original": { @@ -672,6 +672,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1705641746, + "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1704874635, "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", @@ -689,11 +705,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { @@ -721,11 +737,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { @@ -890,14 +906,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1705229514, - "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=", + "lastModified": 1705757126, + "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05", + "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", "type": "github" }, "original": { @@ -924,6 +940,7 @@ "nixos-rk3588": "nixos-rk3588", "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", + "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", diff --git a/flake.nix b/flake.nix index c041fb36..1550cf71 100644 --- a/flake.nix +++ b/flake.nix @@ -95,9 +95,9 @@ # which represents the GitHub repository URL + branch/commit-id/tag. # Official NixOS package source, using nixos's stable branch by default - # nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; # for macos nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.11-darwin"; @@ -164,7 +164,7 @@ # AstroNvim is an aesthetic and feature-rich neovim config. astronvim = { - url = "github:AstroNvim/AstroNvim/v3.40.3"; + url = "github:AstroNvim/AstroNvim/v3.41.2"; flake = false; }; # doom-emacs is a configuration framework for GNU Emacs. diff --git a/home/base/desktop/editors/emacs/default.nix b/home/base/desktop/editors/emacs/default.nix index a5c28431..3ce19cdc 100644 --- a/home/base/desktop/editors/emacs/default.nix +++ b/home/base/desktop/editors/emacs/default.nix @@ -64,9 +64,6 @@ in { home.shellAliases = shellAliases; programs.nushell.shellAliases = shellAliases; - # allow fontconfig to discover fonts and configurations installed through `home.packages` - fonts.fontconfig.enable = true; - xdg.configFile."doom" = { source = ./doom; force = true; diff --git a/home/base/desktop/editors/packages.nix b/home/base/desktop/editors/packages.nix index 9dedc041..048c28bc 100644 --- a/home/base/desktop/editors/packages.nix +++ b/home/base/desktop/editors/packages.nix @@ -21,7 +21,7 @@ #-- python nodePackages.pyright # python language server - (python310.withPackages ( + (python311.withPackages ( ps: with ps; [ ruff-lsp diff --git a/home/linux/desktop/base/creative.nix b/home/linux/desktop/base/creative.nix index 159f4b89..b1373de0 100644 --- a/home/linux/desktop/base/creative.nix +++ b/home/linux/desktop/base/creative.nix @@ -12,7 +12,7 @@ krita # digital painting musescore # music notation # reaper # audio production - pkgs-unstable.sonic-pi # music programming + # sonic-pi # music programming # this app consumes a lot of storage, so do not install it currently # kicad # 3d printing, eletrical engineering diff --git a/home/linux/desktop/base/misc.nix b/home/linux/desktop/base/misc.nix index 1d51c128..5f841eae 100644 --- a/home/linux/desktop/base/misc.nix +++ b/home/linux/desktop/base/misc.nix @@ -27,4 +27,8 @@ programs.gh = { enable = true; }; + + # allow fontconfig to discover fonts and configurations installed through home.packages + # Install fonts at system-level, not user-level + fonts.fontconfig.enable = false; } diff --git a/home/linux/desktop/hyprland/values/hyprland.nix b/home/linux/desktop/hyprland/values/hyprland.nix index 24153468..aea0f999 100644 --- a/home/linux/desktop/hyprland/values/hyprland.nix +++ b/home/linux/desktop/hyprland/values/hyprland.nix @@ -63,7 +63,4 @@ recursive = true; }; }; - - # allow fontconfig to discover fonts and configurations installed through home.packages - fonts.fontconfig.enable = true; } diff --git a/home/linux/desktop/i3/values/i3.nix b/home/linux/desktop/i3/values/i3.nix index a5abfbeb..03e04961 100644 --- a/home/linux/desktop/i3/values/i3.nix +++ b/home/linux/desktop/i3/values/i3.nix @@ -48,7 +48,4 @@ # xrandr - set primary screen ".screenlayout/monitor.sh".source = ../conf/dual-monitor-4k-1080p.sh; }; - - # allow fontconfig to discover fonts and configurations installed through home.packages - fonts.fontconfig.enable = true; } diff --git a/modules/nixos/desktop/visualisation.nix b/modules/nixos/desktop/visualisation.nix index 33571394..566dd982 100644 --- a/modules/nixos/desktop/visualisation.nix +++ b/modules/nixos/desktop/visualisation.nix @@ -25,19 +25,19 @@ # Need to add [File (in the menu bar) -> Add connection] when start for the first time virt-manager - # QEMU/KVM, provides: + # QEMU/KVM(HostCpuOnly), provides: # qemu-storage-daemon qemu-edid qemu-ga # qemu-pr-helper qemu-nbd elf2dmp qemu-img qemu-io # qemu-kvm qemu-system-x86_64 qemu-system-aarch64 qemu-system-i386 qemu_kvm - # Install all packages about QEMU, provides: + # Install QEMU(other architectures), provides: # ...... # qemu-loongarch64 qemu-system-loongarch64 # qemu-riscv64 qemu-system-riscv64 qemu-riscv32 qemu-system-riscv32 # qemu-system-arm qemu-arm qemu-armeb qemu-system-aarch64 qemu-aarch64 qemu-aarch64_be # qemu-system-xtensa qemu-xtensa qemu-system-xtensaeb qemu-xtensaeb # ...... - qemu_full + qemu ]; } diff --git a/systems/default.nix b/systems/default.nix index f02fd605..e4e07176 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -17,6 +17,11 @@ # To use chrome, we need to allow the installation of non-free software config.allowUnfree = true; }; + pkgs-stable = import inputs.nixpkgs-stable { + inherit system; + # To use chrome, we need to allow the installation of non-free software + config.allowUnfree = true; + }; } // inputs;