set flake to master, changes in Makefile, vim and home

.gitea/workflows/auto_update.yaml

@@ -0,0 +1,31 @@
+name: update the nix flake lock automatically every week
+run-name: update
+
+permissions:
+  contents: write
+
+on:
+  schedule:
+    - cron: "0 4 * * 1"
+  workflow_dispatch:
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: get repo
+        uses: actions/checkout@v4.2.2
+
+      - name: install nix
+        uses: https://github.com/cachix/install-nix-action@v31
+
+      - name: run the update
+        run: nix flake update
+
+      - name: Commit and push
+        run: |
+          git config user.name "Update action"
+          git config user.email "update-action@no-one.com"
+          git add .
+          git commit -m "Auto update"
+          git push

Makefile

@@ -4,7 +4,8 @@ FLAKE ?= .
 MODE ?= switch
 
 
-FLAGS = --impure --cores $(THREADS) -j $(THREADS) 
+EXTRAFLAGS ?= 
+FLAGS = --impure -j 1 -L $(EXTRAFLAGS)
 
 ifdef OFFLINE
 	FLAGS += --option binary-caches ''
@@ -14,7 +15,6 @@ all: os home
 
 update:
 	cd $(FLAKE);nix flake update
-	$(MAKE) all
 
 os:
 	sudo nixos-rebuild $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST)

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1775994227,
+        "lastModified": 1778406663,
-        "narHash": "sha256-4VKeWtl9dEubrgpy9fSXkXbjBZlNXPNlQQM5l1ppHv4=",
+        "narHash": "sha256-jGOtlDJAe0MFoOErIxSFs3TQZ7WaCpUt1qnjJ0HhLfw=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "d0a9a21ed8e235956a768fc624242ec9a3e15575",
+        "rev": "a0fa2f1b901473d8aefb2e3026396e3562c1782c",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1776139376,
+        "lastModified": 1778558563,
-        "narHash": "sha256-rBykvCL5GRT6VmiY39XnxAR10cohBsLeAENP0+3JM/0=",
+        "narHash": "sha256-pT6KVIDxQYymtHC9ix6U/NTBUYJhYRX81Ou/9nAUSgc=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "ccfaa2303117e22752bda4e1a1bb07d17f38ea2d",
+        "rev": "f52067bf63247b39b81917d34d74f7c0a9344f05",
         "type": "gitlab"
       },
       "original": {
@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776136611,
+        "lastModified": 1778535464,
-        "narHash": "sha256-b2pu3Pb28W0bJzQVP3OJHZC5+dgOOeqjlli2WVakKEU=",
+        "narHash": "sha256-kkUQYSv70wynJ/DfnGals6r98I6bK3CVNVTN1zbAd7Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8a423e444b17dde406097328604a64fc7429e34e",
+        "rev": "b659c7ffd40fc9e3bb60d420c79c67e769b9f4ab",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1775490113,
+        "lastModified": 1778143761,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775423009,
+        "lastModified": 1777954456,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -94,16 +94,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1775710090,
+        "lastModified": 1778583303,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "narHash": "sha256-jn+drGpaYalIzR0TAsvo2Z2LtBw3b9eIjJtwb0wUPUw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "rev": "6093378e528c5fc6b6e44fb559daed68bc313733",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776119890,
+        "lastModified": 1777944972,
-        "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:24 by tomoron           #+#    #+#              #
-#    Updated: 2025/12/16 19:01:21 by tomoron          ###   ########.fr        #
+#    Updated: 2026/05/10 22:12:11 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -14,7 +14,7 @@
   description = "Nixos and home-manager config flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/master";
 	catppuccin.url = "github:catppuccin/nix";
 
 	sops-nix = {

homeConfigs/global/rclone.nix

@@ -5,7 +5,7 @@
   programs.rclone.remotes.nextcloud = {
     config = {
 	  type = "webdav";
-	  url = "https://nc.tmoron.fr/remote.php/dav/files/tom";
+	  url = "https://dnc.tmoron.fr/remote.php/dav/files/tom";
 	  vendor = "nextcloud";
 	  user = "tom";
     };

homeConfigs/home.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/24 02:08:41 by tomoron          ###   ########.fr        #
+#    Updated: 2026/05/11 13:55:58 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -29,7 +29,7 @@ configSops ? true,
   home.username = lib.mkIf (!isOs) "${username}";
   home.homeDirectory = lib.mkIf (!isOs) "${homeDir}";
 
-  home.stateVersion = "24.05";
+  home.stateVersion = "26.05";
 
   sops = lib.mkIf configSops{
     defaultSopsFile = ../secrets/secrets.yaml;

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;
     };

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

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; [

homeConfigs/packages.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 22:01:56 by tomoron           #+#    #+#              #
-#    Updated: 2026/03/27 12:00:06 by tomoron          ###   ########.fr        #
+#    Updated: 2026/04/25 20:35:24 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 

osConfigs/global/boot.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/05 23:37:58 by tomoron           #+#    #+#              #
-#    Updated: 2026/04/03 11:46:09 by tomoron          ###   ########.fr        #
+#    Updated: 2026/05/07 17:41:52 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -22,6 +22,7 @@
     timeout = 1;
   };
 
+  boot.tmp.cleanOnBoot = true;
   boot.consoleLogLevel = 3;
   boot.initrd.verbose = false;
   boot.kernelParams = [

osConfigs/global/nix-alien.nix

@@ -1,12 +0,0 @@
-{ ... }:
-
-let
-  nix-alien-pkgs = import (
-    builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master"
-  ) { };
-in
-{
-  environment.systemPackages = with nix-alien-pkgs; [
-    nix-alien
-  ];
-}

osConfigs/hosts/laptop.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:56:57 by tomoron           #+#    #+#              #
-#    Updated: 2026/04/10 20:07:49 by tomoron          ###   ########.fr        #
+#    Updated: 2026/04/27 12:53:46 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -15,6 +15,7 @@
 {
   services.udev.packages = [ pkgs.yubikey-personalization ];
   boot.initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
+  boot.initrd.systemd.enable = false;
   boot.initrd.luks.yubikeySupport = true;
   boot.initrd.luks.devices.cryptroot = {
       device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
@@ -34,6 +35,7 @@
   boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup
   programs.droidcam.enable = true;
 
+
   mods.displayManager.enable = true;
   mods.yubikey.pam.enable = true;
   networking.firewall.enable = false;
@@ -86,8 +88,11 @@
 
   environment.systemPackages = with pkgs; [
     acpi # can be user (global)
+	openvr
   ];
 
+#  programs.alvr.enable = true;
+  
 
   mods.touchpad.enable = true;
 
@@ -157,4 +162,5 @@
       Enable = "Source,Sink,Media,Socket";
     };
   };
+
 }

osConfigs/hosts/server.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:57:09 by tomoron           #+#    #+#              #
-#    Updated: 2026/04/09 13:21:07 by tomoron          ###   ########.fr        #
+#    Updated: 2026/05/12 15:05:44 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -64,6 +64,8 @@ in
   ''; 
 
   boot.supportedFilesystems = [ "zfs" ];
+  boot.zfs.forceImportRoot = false;
+  boot.zfs.extraPools = [ "raid_vol" ];
 
   services.zfs = {
 	  autoScrub.enable = true;