From 26fb9da7378f0d9302c33156bb748d99d28bd05b Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Fri, 27 Feb 2026 10:39:53 +0800 Subject: [PATCH] downgrade R --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + home/programs/coding/R.nix | 10 +++++----- home/programs/desktop/niri/autostart.nix | 3 ++- nix/nixpkgs.nix | 1 + 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 769099b..cf1c7aa 100644 --- a/flake.lock +++ b/flake.lock @@ -962,6 +962,22 @@ "type": "github" } }, + "nixpkgs-r": { + "locked": { + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1771419570, @@ -1523,6 +1539,7 @@ "nixGL": "nixGL", "nixd": "nixd", "nixpkgs": "nixpkgs_14", + "nixpkgs-r": "nixpkgs-r", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", "nixvim": "nixvim", diff --git a/flake.nix b/flake.nix index 96f08bf..84e9fae 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,7 @@ inputs = { nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nixpkgs-r.url = "github:NixOS/nixpkgs/nixos-25.05"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/programs/coding/R.nix b/home/programs/coding/R.nix index 85c0c5b..841c159 100644 --- a/home/programs/coding/R.nix +++ b/home/programs/coding/R.nix @@ -5,11 +5,11 @@ ... }: let - pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; + pkgs-r = inputs.nixpkgs-r.legacyPackages.${pkgs.stdenv.hostPlatform.system}; colors = config.lib.stylix.colors.withHashtag; rPkgs = - with pkgs-stable.rPackages; - with pkgs-stable; + with pkgs-r.rPackages; + with pkgs-r; [ ggplot2 dplyr @@ -99,10 +99,10 @@ let ]; }) ]; - myR = pkgs-stable.rWrapper.override { + myR = pkgs-r.rWrapper.override { packages = rPkgs; }; - myRstudio = pkgs-stable.rstudioWrapper.override { + myRstudio = pkgs-r.rstudioWrapper.override { packages = rPkgs; }; in diff --git a/home/programs/desktop/niri/autostart.nix b/home/programs/desktop/niri/autostart.nix index 6c998fd..ba73779 100644 --- a/home/programs/desktop/niri/autostart.nix +++ b/home/programs/desktop/niri/autostart.nix @@ -33,6 +33,7 @@ let # awww restore --namespace "backdrop" mihomo -d ~/.config/clash & wlsunset -s 00:00 -S 00:00 -t 5000 -T 5001 & + sleep 0.2 '' + ( builtins.attrNames config.monitors @@ -54,7 +55,7 @@ let caelestia scheme set -n dynamic -m dark '' else - '''' + "" ); }; in diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index 61f9be6..6ea5c88 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -6,6 +6,7 @@ permittedInsecurePackages = [ "openssl-1.1.1w" "electron-19.1.9" + "electron-36.9.5" ]; allowUnsupportedSystem = true; };