Compare commits

..

1 Commits
stable ... iso

Author SHA1 Message Date
7deb3fe8d9 add autoupdate (test probably broken)
All checks were successful
Build iso when a new version is pushed / test (push) Successful in 2m28s
2026-04-23 17:24:13 +02:00
14 changed files with 52 additions and 66 deletions

View File

@ -1,13 +1,8 @@
name: update the nix flake lock automatically every week name: update the nix flake lock automatically every week
run-name: update run-name: update
permissions:
contents: write
on: on:
schedule: schedule:
- cron: "0 4 * * 1" - cron: "0 4 * * 1"
workflow_dispatch:
jobs: jobs:
update: update:
@ -21,11 +16,3 @@ jobs:
- name: run the update - name: run the update
run: nix flake 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

View File

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

48
flake.lock generated
View File

@ -5,16 +5,15 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1768256610, "lastModified": 1775994227,
"narHash": "sha256-IyL6nZo242nDLoLQVwkqAZXp8FO5kBfjL6Fuh+gZO10=", "narHash": "sha256-4VKeWtl9dEubrgpy9fSXkXbjBZlNXPNlQQM5l1ppHv4=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "0734ad8c91342df34f1a1e5c183d053d70ba87c7", "rev": "d0a9a21ed8e235956a768fc624242ec9a3e15575",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "catppuccin", "owner": "catppuccin",
"ref": "release-25.11",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@ -27,11 +26,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1778558563, "lastModified": 1776139376,
"narHash": "sha256-pT6KVIDxQYymtHC9ix6U/NTBUYJhYRX81Ou/9nAUSgc=", "narHash": "sha256-rBykvCL5GRT6VmiY39XnxAR10cohBsLeAENP0+3JM/0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "f52067bf63247b39b81917d34d74f7c0a9344f05", "rev": "ccfaa2303117e22752bda4e1a1bb07d17f38ea2d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -48,27 +47,26 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1778606796, "lastModified": 1776136611,
"narHash": "sha256-P2krpSkFVYJ89bgsnAZ9RtQiGwiTW77sfSJp9SEDscM=", "narHash": "sha256-b2pu3Pb28W0bJzQVP3OJHZC5+dgOOeqjlli2WVakKEU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1fd7350f4410972bcb8c42a697d8c924ffe642a", "rev": "8a423e444b17dde406097328604a64fc7429e34e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1778593042, "lastModified": 1775490113,
"narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=", "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9bd7c80d43e258aaa607d83b43661df11444d808", "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,32 +78,32 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764521362, "lastModified": 1775423009,
"narHash": "sha256-M101xMtWdF1eSD0xhiR8nG8CXRlHmv6V+VoY65Smwf4=", "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "871b9fd269ff6246794583ce4ee1031e1da71895", "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "25.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1778622285, "lastModified": 1775710090,
"narHash": "sha256-rbrDpSBh7/YGdl8N21MGBQV7Fz/gOFRGec0N7LA6mE8=", "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b56d63df6a03dd62269270228941e18ae580a95", "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-25.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -127,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777944972, "lastModified": 1776119890,
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/17 18:15:24 by tomoron #+# #+# # # Created: 2024/10/17 18:15:24 by tomoron #+# #+# #
# Updated: 2026/05/13 00:04:14 by tomoron ### ########.fr # # Updated: 2025/12/16 19:01:21 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -14,8 +14,8 @@
description = "Nixos and home-manager config flake"; description = "Nixos and home-manager config flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
catppuccin.url = "github:catppuccin/nix/release-25.11"; catppuccin.url = "github:catppuccin/nix";
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
@ -23,13 +23,10 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-hardware = {
url = "github:NixOS/nixos-hardware/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
firefox-addons = { firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";

View File

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

View File

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

View File

@ -12,7 +12,7 @@
"custom/fans" = { "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-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) / 100)).$(($(cat /sys/class/hwmon/hwmon6/fan2_input) / 100)) |\""; exec = "echo \" \" \"$(cat /sys/class/hwmon/hwmon6/fan1_input).$(cat /sys/class/hwmon/hwmon6/fan2_input) |\"";
interval = 1; interval = 1;
interval-if = 1; interval-if = 1;
}; };

View File

@ -9,7 +9,7 @@
config = lib.mkIf config.mods.game.enable { config = lib.mkIf config.mods.game.enable {
home.packages = with pkgs;[ home.packages = with pkgs;[
# lutris (broken) lutris
mangohud mangohud
moonlight-qt moonlight-qt
prismlauncher prismlauncher

View File

@ -18,6 +18,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
clang-tools clang-tools
nixd nixd
rust-analyzer
nodejs_24 nodejs_24
glsl_analyzer glsl_analyzer
(pkgs.python3.withPackages (ps: with ps; [ (pkgs.python3.withPackages (ps: with ps; [

View File

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

View File

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

View File

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

View File

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

View File

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