aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhongheng Liu <z.liu@outlook.com.gr>2024-11-14 14:10:21 +0200
committerZhongheng Liu <z.liu@outlook.com.gr>2024-11-14 14:10:21 +0200
commit932fa37cfac220a6fa071ab742d3acdf08c34c0a (patch)
tree43dc9f073827afd5254534085cb97679043272c9
parent9475ec1a21b55d46b880c8d0d7138b0b9ff24c8e (diff)
downloadnixos-configuration-932fa37cfac220a6fa071ab742d3acdf08c34c0a.tar.gz
nixos-configuration-932fa37cfac220a6fa071ab742d3acdf08c34c0a.tar.bz2
nixos-configuration-932fa37cfac220a6fa071ab742d3acdf08c34c0a.zip
chore: bump flake.lock
-rw-r--r--flake.lock75
-rw-r--r--home-manager/stvnliu/wechat/default.nix2
-rw-r--r--nixos/bootloader.nix72
-rw-r--r--nixos/services/pipewire.service.nix2
4 files changed, 104 insertions, 47 deletions
diff --git a/flake.lock b/flake.lock
index e59b6d1..a35fefc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,11 +141,11 @@
]
},
"locked": {
- "lastModified": 1727826117,
- "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+ "lastModified": 1730504689,
+ "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+ "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@@ -259,11 +259,11 @@
]
},
"locked": {
- "lastModified": 1730302582,
- "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
+ "lastModified": 1730814269,
+ "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
+ "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github"
},
"original": {
@@ -318,11 +318,11 @@
]
},
"locked": {
- "lastModified": 1730450782,
- "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=",
+ "lastModified": 1731235328,
+ "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "8ca921e5a806b5b6171add542defe7bdac79d189",
+ "rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github"
},
"original": {
@@ -339,11 +339,11 @@
]
},
"locked": {
- "lastModified": 1730016908,
- "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+ "lastModified": 1731235328,
+ "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e83414058edd339148dc142a8437edb9450574c8",
+ "rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github"
},
"original": {
@@ -387,16 +387,16 @@
]
},
"locked": {
- "lastModified": 1729544999,
- "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
+ "lastModified": 1729958008,
+ "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
- "rev": "65c207c92befec93e22086da9456d3906a4e999c",
+ "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
- "ref": "v0.0.5",
+ "ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
@@ -444,11 +444,11 @@
]
},
"locked": {
- "lastModified": 1730184279,
- "narHash": "sha256-6OB+WWR6gnaWiqSS28aMJypKeK7Pjc2Wm6L0MtOrTuA=",
+ "lastModified": 1731153869,
+ "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "b379bd4d872d159e5189053ce9a4adf86d56db4b",
+ "rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
"type": "github"
},
"original": {
@@ -459,11 +459,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1730200266,
- "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+ "lastModified": 1731139594,
+ "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+ "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@@ -504,11 +504,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1730368298,
- "narHash": "sha256-5z4pDqRSSovXPPtN1BNEJOkGoCd/XSYuCWh8AsvoTio=",
+ "lastModified": 1731504310,
+ "narHash": "sha256-R20OKYJcDcEqjQGI2/Z/kmaTMoBVSLd5ESR8fbW79Rk=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "42ea1626cb002fa759a6b1e2841bfc80a4e59615",
+ "rev": "e552c984a24c88017f8bfe6807527b7a9c77e22c",
"type": "github"
},
"original": {
@@ -527,11 +527,11 @@
]
},
"locked": {
- "lastModified": 1730337772,
- "narHash": "sha256-uTxvqDohfG85+zldO5Tf1B+fuAF8ZhMouNwG5S6OAnA=",
+ "lastModified": 1731060242,
+ "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=",
"owner": "NuschtOS",
"repo": "search",
- "rev": "4e0a7a95a3df3333771abc4df6a656e7baf67106",
+ "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e",
"type": "github"
},
"original": {
@@ -558,11 +558,11 @@
]
},
"locked": {
- "lastModified": 1730434620,
- "narHash": "sha256-TRMTZ9nAU31tGTPQpf4ylUYDW+JfpYFbBQrZYf1/xj4=",
+ "lastModified": 1731471404,
+ "narHash": "sha256-xrqZLeXOI5qm90iN5sgyINMU2621jf+WBMJivpTNEWc=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
- "rev": "defcdbfdf0890df65685e25e8920d68035cb7720",
+ "rev": "c80ea8541d55731f143828a574e00d50553e9c7c",
"type": "github"
},
"original": {
@@ -588,11 +588,11 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
- "lastModified": 1729963473,
- "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
+ "lastModified": 1731090365,
+ "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=",
"owner": "danth",
"repo": "stylix",
- "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
+ "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68",
"type": "github"
},
"original": {
@@ -649,16 +649,17 @@
"tinted-foot": {
"flake": false,
"locked": {
- "lastModified": 1696725948,
- "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+ "lastModified": 1726913040,
+ "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
- "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+ "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
+ "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
diff --git a/home-manager/stvnliu/wechat/default.nix b/home-manager/stvnliu/wechat/default.nix
index c20e301..c0126db 100644
--- a/home-manager/stvnliu/wechat/default.nix
+++ b/home-manager/stvnliu/wechat/default.nix
@@ -3,6 +3,6 @@
"openssl-1.1.1w"
];
home.packages = with pkgs; [
- (wechat-uos.override {uosLicense = ./license.tar.gz;})
+ wechat-uos
];
}
diff --git a/nixos/bootloader.nix b/nixos/bootloader.nix
index ef40bf5..061791d 100644
--- a/nixos/bootloader.nix
+++ b/nixos/bootloader.nix
@@ -72,18 +72,74 @@ in {
device = "nodev";
fsIdentifier = "label";
devices = ["nodev"];
+ extraConfig = ''
+ function load_video {
+ if [ x$feature_all_video_module = xy ]; then
+ insmod all_video
+ else
+ insmod efi_gop
+ insmod efi_uga
+ insmod ieee1275_fb
+ insmod vbe
+ insmod vga
+ insmod video_bochs
+ insmod video_cirrus
+ fi
+ }'';
extraEntries = ''
- menuentry "UEFI Firmware Settings" {
- fwsetup
+ ### BEGIN /etc/grub.d/10_linux ###
+ menuentry 'Arch Linux' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-996df93f-0794-450a-9315-38f188e85878' {
+ load_video
+ set gfxpayload=keep
+ insmod gzio
+ insmod part_gpt
+ insmod fat
+ search --no-floppy --fs-uuid --set=root 2E4F-3060
+ echo 'Loading Linux linux ...'
+ linux /vmlinuz-linux root=UUID=996df93f-0794-450a-9315-38f188e85878 rw loglevel=3 quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /amd-ucode.img /initramfs-linux.img
}
- menuentry "Reboot" {
- reboot
- }
- menuentry "Poweroff" {
- halt
+ submenu 'Advanced options for Arch Linux' $menuentry_id_option 'gnulinux-advanced-996df93f-0794-450a-9315-38f188e85878' {
+ menuentry 'Arch Linux, with Linux linux' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-linux-advanced-996df93f-0794-450a-9315-38f188e85878' {
+ load_video
+ set gfxpayload=keep
+ insmod gzio
+ insmod part_gpt
+ insmod fat
+ search --no-floppy --fs-uuid --set=root 2E4F-3060
+ echo 'Loading Linux linux ...'
+ linux /vmlinuz-linux root=UUID=996df93f-0794-450a-9315-38f188e85878 rw loglevel=3 quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /amd-ucode.img /initramfs-linux.img
+ }
+ menuentry 'Arch Linux, with Linux linux (fallback initramfs)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-linux-fallback-996df93f-0794-450a-9315-38f188e85878' {
+ load_video
+ set gfxpayload=keep
+ insmod gzio
+ insmod part_gpt
+ insmod fat
+ search --no-floppy --fs-uuid --set=root 2E4F-3060
+ echo 'Loading Linux linux ...'
+ linux /vmlinuz-linux root=UUID=996df93f-0794-450a-9315-38f188e85878 rw loglevel=3 quiet
+ echo 'Loading initial ramdisk ...'
+ initrd /amd-ucode.img /initramfs-linux-fallback.img
+ }
}
+
+ ### END /etc/grub.d/10_linux ###
+
+ menuentry "UEFI Firmware Settings" {
+ fwsetup
+ }
+ menuentry "Reboot" {
+ reboot
+ }
+ menuentry "Poweroff" {
+ halt
+ }
'';
- useOSProber = true;
+ #useOSProber = true;
configurationLimit = 10;
fontSize = 32;
theme = xenlism-grub-themes;
diff --git a/nixos/services/pipewire.service.nix b/nixos/services/pipewire.service.nix
index 8878903..03e82ef 100644
--- a/nixos/services/pipewire.service.nix
+++ b/nixos/services/pipewire.service.nix
@@ -50,6 +50,6 @@ in {
}
'')
];
- extraConfig.pipewire."99-input-denoising" = pw_rnnoise_config;
+ #extraConfig.pipewire."99-input-denoising" = pw_rnnoise_config;
};
}