From cb9e31f03690a1de30f93cf46cb1366909a6a574 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 20 Feb 2025 01:39:31 -0500 Subject: [PATCH 1/4] try newer stuff again --- hosts/ytnix/default.nix | 2 +- overlay/default.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 524804d..a6bf18d 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -54,7 +54,7 @@ }; tmp.cleanOnBoot = true; # upgrade after https://github.com/tomaspinho/rtl8821ce/issues/356 is fixed - kernelPackages = pkgs.linuxKernel.packages.linux_6_12; + kernelPackages = pkgs.linuxKernel.packages.linux_zen; extraModulePackages = with config.boot.kernelPackages; [ rtl8821ce ]; diff --git a/overlay/default.nix b/overlay/default.nix index 5695d30..6d532cf 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -15,12 +15,12 @@ importedOverlays stable = inputs.nixpkgs-stable; in { - bitwarden-cli = pkgFrom stable "bitwarden-cli"; - roundcube = pkgFrom stable "roundcube"; - lldb = pkgFrom stable "lldb"; - calibre = pkgFrom stable "calibre"; - nil = inputs.nil.packages.${prev.system}.nil; - anki = pkgFrom inputs.anki "anki-bin"; + # bitwarden-cli = pkgFrom stable "bitwarden-cli"; + # roundcube = pkgFrom stable "roundcube"; + # lldb = pkgFrom stable "lldb"; + # calibre = pkgFrom stable "calibre"; + # nil = inputs.nil.packages.${prev.system}.nil; + # anki = pkgFrom inputs.anki "anki-bin"; } ) ] From abd29749f894b9f2bbd356cc215a0073dcd2de52 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 20 Feb 2025 01:41:21 -0500 Subject: [PATCH 2/4] flake update Signed-off-by: cy --- flake.lock | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 77c6ac6..ccdd5a6 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ }, "crane_2": { "locked": { - "lastModified": 1739815359, - "narHash": "sha256-mjB72/7Fgk5bsIIKA4G9LkIb/u0Ci+VdOyQSgBuQtjo=", + "lastModified": 1739936662, + "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", "owner": "ipetkov", "repo": "crane", - "rev": "282159b2b0588b87a9dbcc40decc91dd5bed5c89", + "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", "type": "github" }, "original": { @@ -578,11 +578,11 @@ ] }, "locked": { - "lastModified": 1739845242, - "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", + "lastModified": 1739992710, + "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", + "rev": "1c189f011447810af939a886ba7bee33532bb1f9", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1739846668, - "narHash": "sha256-B0+90JxZ7m+NVTb82Y8/R5OvKJrJhFDO2LtIxM7JNfw=", + "lastModified": 1740025708, + "narHash": "sha256-TQ8EQoulNFD2nP94Aw3W17cjlV3F+fMpDsV6LOrrkbY=", "ref": "refs/heads/main", - "rev": "0069c59eda80e89ef4e42f7629cb15b051b6cadd", - "revCount": 17430, + "rev": "e335a26d5cd8371ea836d1166b627eaf17427299", + "revCount": 17439, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -779,11 +779,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739852863, - "narHash": "sha256-z26CrSpjFXVVa5RU2ORpfqcUpO1Uow4V7KV+pM/5Gok=", + "lastModified": 1740007509, + "narHash": "sha256-U8ln+d0ganReAnGlLIeztx0cMnlAPgzzZb/AzOMNAmw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c045be9425cfdd7769a4e96cab35a7f8b9db7468", + "rev": "99ce4a9c380052c384243b3d4e47a8aaf149cb3a", "type": "github" }, "original": { @@ -812,11 +812,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739820990, - "narHash": "sha256-v+MmVqFyjzL9xzyRzfX+1qMIGgoHcW73P9b8RrM922k=", + "lastModified": 1739940569, + "narHash": "sha256-r624MtdcINkMlyXvvizg8b6Ig1fv4lLvjdgKM2ejaS0=", "owner": "YaLTeR", "repo": "niri", - "rev": "44c9797844ca7ce8a708d5034f1259ce3fc6bd2a", + "rev": "74787843430cff26c5308e95051b7e9f5dc4252c", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739822428, - "narHash": "sha256-eVH9Ggf0eojNMoRkksP7SfOMpI8ITLNfmoZrKyfQ8hU=", + "lastModified": 1739928959, + "narHash": "sha256-ZroNoSIYC1trtuUpWlWGRCrvYt9QBEiut7DC1GHKmT4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3a07ac733f5aa4a1b1800d4a4042b65c6a9865f", + "rev": "9228994eca7cc0e00f8318e015d4dfbbf7ad41e2", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ ] }, "locked": { - "lastModified": 1739751913, - "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", + "lastModified": 1739902813, + "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", + "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ ] }, "locked": { - "lastModified": 1739845646, - "narHash": "sha256-UGQVBU/yDn6u0kAE4z1PYrOaaf3wl+gAAv5rui2TkFQ=", + "lastModified": 1740018520, + "narHash": "sha256-mU6H0Q1WPn0XuwBO9SLZb/1yeVMfvsifBJcXNlhB+Ts=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab2cd2b8b25ab3f65b8ce4aa701a6d69fbb0210f", + "rev": "7f6ecf3b7c5bfcc4730943a767630122efd09dc8", "type": "github" }, "original": { @@ -1426,11 +1426,11 @@ ] }, "locked": { - "lastModified": 1739843309, - "narHash": "sha256-BLsy1soiTtyN3nKH3dgpwFJ31a29Njpi6+xD6tsVBo4=", + "lastModified": 1739976354, + "narHash": "sha256-jYHJZ0XbEQ7WD4pktOhT40LYDd3OizKs59AZZpAMY10=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6f6ffc8ebcfd2d48477ec2e78d9767a7bfdd9d79", + "rev": "f06125d30041b21ade968ef8e53400aec8863e96", "type": "github" }, "original": { From 322b594936d8d0e653ab947d420a52bf731f9e03 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 20 Feb 2025 01:39:31 -0500 Subject: [PATCH 3/4] try newer stuff again --- home/codium.nix | 21 +++++++++------------ hosts/ytnix/default.nix | 2 +- overlay/default.nix | 12 ++++++------ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/home/codium.nix b/home/codium.nix index b35231a..2da9ffc 100644 --- a/home/codium.nix +++ b/home/codium.nix @@ -8,18 +8,15 @@ mutableExtensionsDir = false; extensions = # if unfree - # (with pkgs.vscode-marketplace; [ - ( - with pkgs.open-vsx; - [ - vscodevim.vim - jnoortheen.nix-ide - editorconfig.editorconfig - github.github-vscode-theme - rust-lang.rust-analyzer - shd101wyy.markdown-preview-enhanced - ] - ); + # with pkgs.vscode-marketplace; + with pkgs.open-vsx; [ + vscodevim.vim + jnoortheen.nix-ide + editorconfig.editorconfig + github.github-vscode-theme + rust-lang.rust-analyzer + shd101wyy.markdown-preview-enhanced + ]; userSettings = { "workbench.colorTheme" = "GitHub Dark Default"; "files.autoSave" = "afterDelay"; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 524804d..a6bf18d 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -54,7 +54,7 @@ }; tmp.cleanOnBoot = true; # upgrade after https://github.com/tomaspinho/rtl8821ce/issues/356 is fixed - kernelPackages = pkgs.linuxKernel.packages.linux_6_12; + kernelPackages = pkgs.linuxKernel.packages.linux_zen; extraModulePackages = with config.boot.kernelPackages; [ rtl8821ce ]; diff --git a/overlay/default.nix b/overlay/default.nix index 5695d30..6d532cf 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -15,12 +15,12 @@ importedOverlays stable = inputs.nixpkgs-stable; in { - bitwarden-cli = pkgFrom stable "bitwarden-cli"; - roundcube = pkgFrom stable "roundcube"; - lldb = pkgFrom stable "lldb"; - calibre = pkgFrom stable "calibre"; - nil = inputs.nil.packages.${prev.system}.nil; - anki = pkgFrom inputs.anki "anki-bin"; + # bitwarden-cli = pkgFrom stable "bitwarden-cli"; + # roundcube = pkgFrom stable "roundcube"; + # lldb = pkgFrom stable "lldb"; + # calibre = pkgFrom stable "calibre"; + # nil = inputs.nil.packages.${prev.system}.nil; + # anki = pkgFrom inputs.anki "anki-bin"; } ) ] From 2c6963c7bec933323d075c2a6fcc85da519fbd6b Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 20 Feb 2025 15:03:52 -0500 Subject: [PATCH 4/4] flake update Signed-off-by: cy --- flake.lock | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 77c6ac6..7931572 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ }, "crane_2": { "locked": { - "lastModified": 1739815359, - "narHash": "sha256-mjB72/7Fgk5bsIIKA4G9LkIb/u0Ci+VdOyQSgBuQtjo=", + "lastModified": 1739936662, + "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", "owner": "ipetkov", "repo": "crane", - "rev": "282159b2b0588b87a9dbcc40decc91dd5bed5c89", + "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", "type": "github" }, "original": { @@ -578,11 +578,11 @@ ] }, "locked": { - "lastModified": 1739845242, - "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", + "lastModified": 1740060750, + "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", "owner": "nix-community", "repo": "home-manager", - "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", + "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1739846668, - "narHash": "sha256-B0+90JxZ7m+NVTb82Y8/R5OvKJrJhFDO2LtIxM7JNfw=", + "lastModified": 1740025708, + "narHash": "sha256-TQ8EQoulNFD2nP94Aw3W17cjlV3F+fMpDsV6LOrrkbY=", "ref": "refs/heads/main", - "rev": "0069c59eda80e89ef4e42f7629cb15b051b6cadd", - "revCount": 17430, + "rev": "e335a26d5cd8371ea836d1166b627eaf17427299", + "revCount": 17439, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -779,11 +779,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739852863, - "narHash": "sha256-z26CrSpjFXVVa5RU2ORpfqcUpO1Uow4V7KV+pM/5Gok=", + "lastModified": 1740045415, + "narHash": "sha256-dLg4Re8AdmlTYWu6FHR60cem9fErXnWXRJi6/Du5L3M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c045be9425cfdd7769a4e96cab35a7f8b9db7468", + "rev": "a622f76d3f97ce289f2103b6999f80a3732d629b", "type": "github" }, "original": { @@ -812,11 +812,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739820990, - "narHash": "sha256-v+MmVqFyjzL9xzyRzfX+1qMIGgoHcW73P9b8RrM922k=", + "lastModified": 1740042509, + "narHash": "sha256-Yk1DXv4oRdbi2P8v4b7GV6wXJaAa5jOK0femtfxlGAg=", "owner": "YaLTeR", "repo": "niri", - "rev": "44c9797844ca7ce8a708d5034f1259ce3fc6bd2a", + "rev": "8885233c7e036a1e279c09e4fd96c1a1669156c3", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739822428, - "narHash": "sha256-eVH9Ggf0eojNMoRkksP7SfOMpI8ITLNfmoZrKyfQ8hU=", + "lastModified": 1740048735, + "narHash": "sha256-YUXPBZPacnc5IykkIiDN7Lz/Ka0boLM72z+JJV1YUVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3a07ac733f5aa4a1b1800d4a4042b65c6a9865f", + "rev": "e493a167e1e3b7c1de669ce78dad0bd93295a83f", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ ] }, "locked": { - "lastModified": 1739751913, - "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", + "lastModified": 1739902813, + "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", + "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50", "type": "github" }, "original": { @@ -1330,11 +1330,11 @@ ] }, "locked": { - "lastModified": 1739845646, - "narHash": "sha256-UGQVBU/yDn6u0kAE4z1PYrOaaf3wl+gAAv5rui2TkFQ=", + "lastModified": 1740074384, + "narHash": "sha256-T2eO9ognlph94/TyAu1uILo38fZG1G4S5FQxG+YBDv0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab2cd2b8b25ab3f65b8ce4aa701a6d69fbb0210f", + "rev": "d291a120b6524911249b198baf3ec3e07ff57e04", "type": "github" }, "original": { @@ -1426,11 +1426,11 @@ ] }, "locked": { - "lastModified": 1739843309, - "narHash": "sha256-BLsy1soiTtyN3nKH3dgpwFJ31a29Njpi6+xD6tsVBo4=", + "lastModified": 1740040284, + "narHash": "sha256-srYId+69Z0dltiqdf2hFPZ6MmqVSF+RoHmiW93YIq1E=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6f6ffc8ebcfd2d48477ec2e78d9767a7bfdd9d79", + "rev": "5c9a119496c2d56ef2fcd248ea5c5651f3e9a2bf", "type": "github" }, "original": {