starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-01-11 20:40:24 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

feat: comment out nixpkgs-unstable, we use unstable by default (#232)

Browse Source 
* feat: comment out nixpkgs-unstable, we use unstable by default

Signed-off-by: Ryan Yin <xiaoyin_c@qq.com>

* fix: typo...

---------

Signed-off-by: Ryan Yin <xiaoyin_c@qq.com>
This commit is contained in:
Ryan Yin
2025-11-01 21:21:57 +08:00
committed by GitHub
parent 0c2dcc0734
commit 34fdd92351
18 changed files with 93 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
flake.lock generated
View File

@@ -802,6 +802,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1761998647,
"narHash": "sha256-MFd2bpd3V/Nr2UhFE0uhF/21JNi5GrbCXqwCFCt4Mlg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2a8c7895537748fb6d8f0a14c08a482ffe549441",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-patched": { "nixpkgs-patched": {
"locked": { "locked": {
"lastModified": 1761672384, "lastModified": 1761672384,
@@ -866,22 +882,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1758427187,
"narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1748189127, "lastModified": 1748189127,
@@ -1083,9 +1083,9 @@
"nixpak": "nixpak", "nixpak": "nixpak",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-darwin": "nixpkgs-darwin",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-patched": "nixpkgs-patched", "nixpkgs-patched": "nixpkgs-patched",
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_3",
"nixpkgs-unstable": "nixpkgs-unstable",
"nu_scripts": "nu_scripts", "nu_scripts": "nu_scripts",
"nuenv": "nuenv", "nuenv": "nuenv",
"nur-ryan4yin": "nur-ryan4yin", "nur-ryan4yin": "nur-ryan4yin",

6
flake.nix
View File

@@ -35,11 +35,13 @@
# Official NixOS package source, using nixos's unstable branch by default # Official NixOS package source, using nixos's unstable branch by default
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
# nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# nixpkgs with some custom patches
nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched"; nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched";
# get some latest packages from the master branch
nixpkgs-master.url = "github:nixos/nixpkgs/master";
# for macos # for macos
# nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";

4
hardening/nixpaks/default.nix
View File

@@ -1,6 +1,6 @@
{ {
pkgs, pkgs,
pkgs-patched, pkgs-master,
nixpak, nixpak,
... ...
}: }:
@@ -22,7 +22,7 @@ in
nixpkgs.overlays = [ nixpkgs.overlays = [
(_: super: { (_: super: {
nixpaks = { nixpaks = {
qq = wrapper pkgs-patched ./qq.nix; qq = wrapper pkgs-master ./qq.nix;
wechat = wrapper super ./wechat.nix; wechat = wrapper super ./wechat.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;

1
home/base/core/shells/default.nix
View File

@@ -27,7 +27,6 @@ in
# NOTE: nushell will be launched in bash, so it can inherit all the eenvironment variables. # NOTE: nushell will be launched in bash, so it can inherit all the eenvironment variables.
programs.nushell = { programs.nushell = {
enable = true; enable = true;
# package = pkgs-unstable.nushell;
configFile.source = ./config.nu; configFile.source = ./config.nu;
inherit shellAliases; inherit shellAliases;
}; };

2
home/base/gui/terminal/alacritty/default.nix
View File

@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
pkgs-unstable,
... ...
}: }:
########################################################### ###########################################################
@@ -26,7 +25,6 @@
{ {
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
# package = pkgs-unstable.alacritty;
# https://alacritty.org/config-alacritty.html # https://alacritty.org/config-alacritty.html
settings = { settings = {
window = { window = {

1
home/base/tui/dev-tools.nix
View File

@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
pkgs-unstable,
... ...
}: }:
{ {

3
home/base/tui/editors/neovim/default.nix
View File

@@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
pkgs-unstable,
... ...
}: }:
############################################################################### ###############################################################################
@@ -29,7 +28,7 @@ in
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs-unstable.neovim-unwrapped; package = pkgs.neovim-unwrapped;
# defaultEditor = true; # set EDITOR at system-wide level # defaultEditor = true; # set EDITOR at system-wide level
viAlias = true; viAlias = true;

16
home/base/tui/editors/packages.nix
View File

@@ -1,6 +1,6 @@
{ {
pkgs, pkgs,
pkgs-unstable, pkgs-master,
... ...
}: }:
{ {
@@ -36,7 +36,7 @@
marksman # language server for markdown marksman # language server for markdown
glow # markdown previewer glow # markdown previewer
pandoc # document converter pandoc # document converter
pkgs-unstable.hugo # static site generator pkgs-master.hugo # static site generator
#-- sql #-- sql
sqlfluff sqlfluff
@@ -90,11 +90,11 @@
#-- rust #-- rust
# we'd better use the rust-overlays for rust development # we'd better use the rust-overlays for rust development
pkgs-unstable.rustc pkgs-master.rustc
pkgs-unstable.rust-analyzer pkgs-master.rust-analyzer
pkgs-unstable.cargo # rust package manager pkgs-master.cargo # rust package manager
pkgs-unstable.rustfmt pkgs-master.rustfmt
pkgs-unstable.clippy # rust linter pkgs-master.clippy # rust linter
#-- golang #-- golang
go go
@@ -141,7 +141,7 @@
# fnlfmt # fennel # fnlfmt # fennel
# ( # (
# if pkgs.stdenv.isLinux && pkgs.stdenv.isx86 # if pkgs.stdenv.isLinux && pkgs.stdenv.isx86
# then pkgs-unstable.akkuPackages.scheme-langserver # then pkgs-master.akkuPackages.scheme-langserver
# else pkgs.emptyDirectory # else pkgs.emptyDirectory
# ) # )
# ] # ]

1
home/base/tui/encryption/default.nix
View File

@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
pkgs-unstable,
... ...
}: }:
{ {

59
home/linux/gui/base/creative.nix
View File

@@ -1,9 +1,6 @@
{ {
lib, lib,
pkgs, pkgs,
pkgs-unstable,
# pkgs-stable,
nur-ryan4yin,
blender-bin, blender-bin,
... ...
}: }:
@@ -43,36 +40,32 @@
# live streaming # live streaming
obs-studio = { obs-studio = {
enable = pkgs.stdenv.isx86_64; enable = pkgs.stdenv.isx86_64;
plugins = plugins = with pkgs.obs-studio-plugins; [
with pkgs.obs-studio-plugins; # screen capture
[ wlrobs
# screen capture # obs-ndi
wlrobs # obs-nvfbc
# obs-ndi obs-teleport
# obs-nvfbc # obs-hyperion
obs-teleport droidcam-obs
# obs-hyperion obs-vkcapture
droidcam-obs obs-gstreamer
obs-vkcapture input-overlay
obs-gstreamer obs-multi-rtmp
input-overlay obs-source-clone
obs-multi-rtmp obs-shaderfilter
obs-source-clone obs-source-record
obs-shaderfilter obs-livesplit-one
obs-source-record looking-glass-obs
obs-livesplit-one obs-vintage-filter
looking-glass-obs obs-command-source
obs-vintage-filter obs-move-transition
obs-command-source obs-backgroundremoval
obs-move-transition # advanced-scene-switcher
obs-backgroundremoval obs-pipewire-audio-capture
# advanced-scene-switcher obs-vaapi
obs-pipewire-audio-capture obs-3d-effect
] ];
++ (lib.optionals pkgs.stdenv.isx86_64 [
obs-vaapi
obs-3d-effect
]);
}; };
}; };
} }

32
home/linux/gui/base/media.nix
View File

@@ -1,29 +1,25 @@
{ {
pkgs, pkgs,
pkgs-x64, pkgs-x64,
pkgs-unstable,
nur-ryan4yin,
... ...
}: }:
# media - control and enjoy audio/video # media - control and enjoy audio/video
{ {
home.packages = home.packages = with pkgs; [
with pkgs; # audio control
[ pavucontrol
# audio control playerctl
pavucontrol pulsemixer
playerctl imv # simple image viewer
pulsemixer
imv # simple image viewer
# video/audio tools # video/audio tools
libva-utils libva-utils
vdpauinfo vdpauinfo
vulkan-tools vulkan-tools
glxinfo glxinfo
nvitop nvitop
(pkgs-x64.zoom-us.override { hyprlandXdgDesktopPortalSupport = true; }) (pkgs-x64.zoom-us.override { hyprlandXdgDesktopPortalSupport = true; })
]; ];
programs.mpv = { programs.mpv = {
enable = true; enable = true;

7
home/linux/gui/base/misc.nix
View File

@@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
pkgs-unstable,
... ...
}: }:
{ {
@@ -15,10 +14,10 @@
freerdp # required by remmina freerdp # required by remmina
# my custom hardened packages # my custom hardened packages
pkgs.nixpaks.qq nixpaks.qq
pkgs.nixpaks.telegram-desktop nixpaks.telegram-desktop
# qqmusic # qqmusic
pkgs.bwraps.wechat bwraps.wechat
# discord # update too frequently, use the web version instead # discord # update too frequently, use the web version instead
]; ];

4
home/linux/gui/editors/default.nix
View File

@@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs-master, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs-master; [
zed-editor zed-editor
(code-cursor.overrideAttrs (oldAttrs: rec { (code-cursor.overrideAttrs (oldAttrs: rec {
pname = "cursor"; pname = "cursor";

6
hosts/12kingdoms-shoukei/apple-silicon.nix
View File

@@ -1,5 +1,5 @@
{ {
pkgs-unstable, pkgs,
nixos-apple-silicon, nixos-apple-silicon,
my-asahi-firmware, my-asahi-firmware,
... ...
@@ -18,7 +18,7 @@
]; ];
}; };
environment.systemPackages = with pkgs-unstable; [ environment.systemPackages = with pkgs; [
box64 # Linux Userspace x86 and x86_64 Emulator, run x86_64 apps(such as games, gui apps) on aarch64. box64 # Linux Userspace x86 and x86_64 Emulator, run x86_64 apps(such as games, gui apps) on aarch64.
# https://asahilinux.org/2024/12/muvm-x11-bridging/ # https://asahilinux.org/2024/12/muvm-x11-bridging/
# https://github.com/nix-community/nixos-apple-silicon/issues/237 # https://github.com/nix-community/nixos-apple-silicon/issues/237
@@ -66,7 +66,7 @@
# After adding this snippet, you need to restart the system for the touchbar to work. # After adding this snippet, you need to restart the system for the touchbar to work.
hardware.apple.touchBar = { hardware.apple.touchBar = {
enable = true; enable = true;
package = pkgs-unstable.tiny-dfr; package = pkgs.tiny-dfr;
# https://github.com/WhatAmISupposedToPutHere/tiny-dfr/blob/master/share/tiny-dfr/config.toml # https://github.com/WhatAmISupposedToPutHere/tiny-dfr/blob/master/share/tiny-dfr/config.toml
settings = { settings = {
# F{number} keys are shown when Fn is not pressed by default. # F{number} keys are shown when Fn is not pressed by default.

3
modules/darwin/apps.nix
View File

@@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
pkgs-unstable,
... ...
}: }:
########################################################################## ##########################################################################
@@ -95,7 +94,7 @@ in
programs.zsh.enable = true; programs.zsh.enable = true;
environment.shells = [ environment.shells = [
pkgs.zsh pkgs.zsh
pkgs-unstable.nushell # my custom shell pkgs.nushell # my custom shell
]; ];
# homebrew need to be installed manually, see https://brew.sh # homebrew need to be installed manually, see https://brew.sh

2
modules/nixos/desktop/misc.nix
View File

@@ -1,8 +1,6 @@
{ {
config,
lib, lib,
pkgs, pkgs,
pkgs-unstable,
... ...
}: }:
{ {

1
modules/nixos/desktop/peripherals.nix
View File

@@ -15,7 +15,6 @@
# https://nixos.wiki/wiki/PipeWire # https://nixos.wiki/wiki/PipeWire
services.pipewire = { services.pipewire = {
enable = true; enable = true;
# package = pkgs-unstable.pipewire;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;

18
outputs/default.nix
View File

@@ -18,11 +18,12 @@ let
inherit mylib myvars; inherit mylib myvars;
# use unstable branch for some packages to get the latest updates # use unstable branch for some packages to get the latest updates
pkgs-unstable = import inputs.nixpkgs-unstable { # pkgs-unstable = import inputs.nixpkgs-unstable {
inherit system; # refer the `system` parameter form outer scope recursively # inherit system; # refer the `system` parameter form outer scope recursively
# To use chrome, we need to allow the installation of non-free software # # To use chrome, we need to allow the installation of non-free software
config.allowUnfree = true; # config.allowUnfree = true;
}; # };
pkgs-stable = import inputs.nixpkgs-stable { pkgs-stable = import inputs.nixpkgs-stable {
inherit system; inherit system;
# To use chrome, we need to allow the installation of non-free software # To use chrome, we need to allow the installation of non-free software
@@ -30,7 +31,12 @@ let
}; };
pkgs-patched = import inputs.nixpkgs-patched { pkgs-patched = import inputs.nixpkgs-patched {
inherit system; inherit system;
# To use chrome, we need to allow the installation of non-free software # to use chrome, we need to allow the installation of non-free software
config.allowUnfree = true;
};
pkgs-master = import inputs.nixpkgs-master {
inherit system;
# to use chrome, we need to allow the installation of non-free software
config.allowUnfree = true; config.allowUnfree = true;
}; };