From 91702ec7a3ef44b67e691bfac412d95b1760a22c Mon Sep 17 00:00:00 2001 From: tomoron Date: Tue, 12 May 2026 15:10:03 +0200 Subject: [PATCH] set flake to master, changes in Makefile, vim and home --- Makefile | 2 +- flake.lock | 20 ++++++++++---------- homeConfigs/home.nix | 2 +- homeConfigs/hosts/laptop.nix | 2 +- homeConfigs/modules/game.nix | 2 +- homeConfigs/modules/vim.nix | 1 - 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 288a6ec..21da412 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ MODE ?= switch EXTRAFLAGS ?= -FLAGS = --impure --cores $(THREADS) -j $(THREADS) $(EXTRAFLAGS) +FLAGS = --impure -j 1 -L $(EXTRAFLAGS) ifdef OFFLINE FLAGS += --option binary-caches '' diff --git a/flake.lock b/flake.lock index c37a91c..f062ed5 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1778385775, - "narHash": "sha256-n0MUvWA2SML/qBB4hpShQ7i+i961MX4oPtaQfYo0+uU=", + "lastModified": 1778558563, + "narHash": "sha256-pT6KVIDxQYymtHC9ix6U/NTBUYJhYRX81Ou/9nAUSgc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "268324916742a48cd03b94fd63f2822d6b66d519", + "rev": "f52067bf63247b39b81917d34d74f7c0a9344f05", "type": "gitlab" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1778444552, - "narHash": "sha256-f18pIiR9q/p1vHY93gmAum7aHhQOG49oGvAB9+lptRo=", + "lastModified": 1778535464, + "narHash": "sha256-kkUQYSv70wynJ/DfnGals6r98I6bK3CVNVTN1zbAd7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "dcebe66f958673729896eec2de4abfd86ef22d21", + "rev": "b659c7ffd40fc9e3bb60d420c79c67e769b9f4ab", "type": "github" }, "original": { @@ -94,16 +94,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1778583303, + "narHash": "sha256-jn+drGpaYalIzR0TAsvo2Z2LtBw3b9eIjJtwb0wUPUw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "6093378e528c5fc6b6e44fb559daed68bc313733", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } diff --git a/homeConfigs/home.nix b/homeConfigs/home.nix index c7f903e..bb55020 100644 --- a/homeConfigs/home.nix +++ b/homeConfigs/home.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/17 18:15:38 by tomoron #+# #+# # -# Updated: 2026/04/27 14:18:18 by tomoron ### ########.fr # +# Updated: 2026/05/11 13:55:58 by tomoron ### ########.fr # # # # **************************************************************************** # diff --git a/homeConfigs/hosts/laptop.nix b/homeConfigs/hosts/laptop.nix index 3f7e6a2..cc589e1 100644 --- a/homeConfigs/hosts/laptop.nix +++ b/homeConfigs/hosts/laptop.nix @@ -12,7 +12,7 @@ "custom/fans" = { exec-if = "test \"$(cat /sys/class/hwmon/hwmon6/fan1_input)\" -gt 0 -o \"$(cat /sys/class/hwmon/hwmon6/fan2_input)\" -gt 0"; - exec = "echo \" \" \"$(cat /sys/class/hwmon/hwmon6/fan1_input).$(cat /sys/class/hwmon/hwmon6/fan2_input) |\""; + exec = "echo \" \" \"$(($(cat /sys/class/hwmon/hwmon6/fan1_input) / 100)).$(($(cat /sys/class/hwmon/hwmon6/fan2_input) / 100)) |\""; interval = 1; interval-if = 1; }; diff --git a/homeConfigs/modules/game.nix b/homeConfigs/modules/game.nix index 3459a4d..d7e5bfb 100644 --- a/homeConfigs/modules/game.nix +++ b/homeConfigs/modules/game.nix @@ -9,7 +9,7 @@ config = lib.mkIf config.mods.game.enable { home.packages = with pkgs;[ - lutris +# lutris (broken) mangohud moonlight-qt prismlauncher diff --git a/homeConfigs/modules/vim.nix b/homeConfigs/modules/vim.nix index c4a6fb7..27ed548 100644 --- a/homeConfigs/modules/vim.nix +++ b/homeConfigs/modules/vim.nix @@ -18,7 +18,6 @@ home.packages = with pkgs; [ clang-tools nixd - rust-analyzer nodejs_24 glsl_analyzer (pkgs.python3.withPackages (ps: with ps; [