Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
7deb3fe8d9
|
@ -1,13 +1,8 @@
|
||||
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:
|
||||
@ -21,11 +16,3 @@ jobs:
|
||||
|
||||
- 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
|
||||
|
||||
4
Makefile
4
Makefile
@ -4,8 +4,7 @@ FLAKE ?= .
|
||||
MODE ?= switch
|
||||
|
||||
|
||||
EXTRAFLAGS ?=
|
||||
FLAGS = --impure -j 1 -L $(EXTRAFLAGS)
|
||||
FLAGS = --impure --cores $(THREADS) -j $(THREADS)
|
||||
|
||||
ifdef OFFLINE
|
||||
FLAGS += --option binary-caches ''
|
||||
@ -15,6 +14,7 @@ all: os home
|
||||
|
||||
update:
|
||||
cd $(FLAKE);nix flake update
|
||||
$(MAKE) all
|
||||
|
||||
os:
|
||||
sudo nixos-rebuild $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST)
|
||||
|
||||
48
flake.lock
generated
48
flake.lock
generated
@ -5,16 +5,15 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768256610,
|
||||
"narHash": "sha256-IyL6nZo242nDLoLQVwkqAZXp8FO5kBfjL6Fuh+gZO10=",
|
||||
"lastModified": 1775994227,
|
||||
"narHash": "sha256-4VKeWtl9dEubrgpy9fSXkXbjBZlNXPNlQQM5l1ppHv4=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "0734ad8c91342df34f1a1e5c183d053d70ba87c7",
|
||||
"rev": "d0a9a21ed8e235956a768fc624242ec9a3e15575",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "catppuccin",
|
||||
"ref": "release-25.11",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
@ -27,11 +26,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1778558563,
|
||||
"narHash": "sha256-pT6KVIDxQYymtHC9ix6U/NTBUYJhYRX81Ou/9nAUSgc=",
|
||||
"lastModified": 1776139376,
|
||||
"narHash": "sha256-rBykvCL5GRT6VmiY39XnxAR10cohBsLeAENP0+3JM/0=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "f52067bf63247b39b81917d34d74f7c0a9344f05",
|
||||
"rev": "ccfaa2303117e22752bda4e1a1bb07d17f38ea2d",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -48,27 +47,26 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778606796,
|
||||
"narHash": "sha256-P2krpSkFVYJ89bgsnAZ9RtQiGwiTW77sfSJp9SEDscM=",
|
||||
"lastModified": 1776136611,
|
||||
"narHash": "sha256-b2pu3Pb28W0bJzQVP3OJHZC5+dgOOeqjlli2WVakKEU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e1fd7350f4410972bcb8c42a697d8c924ffe642a",
|
||||
"rev": "8a423e444b17dde406097328604a64fc7429e34e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1778593042,
|
||||
"narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=",
|
||||
"lastModified": 1775490113,
|
||||
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "9bd7c80d43e258aaa607d83b43661df11444d808",
|
||||
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -80,32 +78,32 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1764521362,
|
||||
"narHash": "sha256-M101xMtWdF1eSD0xhiR8nG8CXRlHmv6V+VoY65Smwf4=",
|
||||
"lastModified": 1775423009,
|
||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "871b9fd269ff6246794583ce4ee1031e1da71895",
|
||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "25.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1778622285,
|
||||
"narHash": "sha256-rbrDpSBh7/YGdl8N21MGBQV7Fz/gOFRGec0N7LA6mE8=",
|
||||
"lastModified": 1775710090,
|
||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8b56d63df6a03dd62269270228941e18ae580a95",
|
||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "release-25.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@ -127,11 +125,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777944972,
|
||||
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
|
||||
"lastModified": 1776119890,
|
||||
"narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
|
||||
"rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
13
flake.nix
13
flake.nix
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# 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";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
|
||||
catppuccin.url = "github:catppuccin/nix/release-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
@ -23,13 +23,10 @@
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
|
||||
firefox-addons = {
|
||||
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
programs.rclone.remotes.nextcloud = {
|
||||
config = {
|
||||
type = "webdav";
|
||||
url = "https://dnc.tmoron.fr/remote.php/dav/files/tom";
|
||||
url = "https://nc.tmoron.fr/remote.php/dav/files/tom";
|
||||
vendor = "nextcloud";
|
||||
user = "tom";
|
||||
};
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# 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.homeDirectory = lib.mkIf (!isOs) "${homeDir}";
|
||||
|
||||
home.stateVersion = "26.05";
|
||||
home.stateVersion = "24.05";
|
||||
|
||||
sops = lib.mkIf configSops{
|
||||
defaultSopsFile = ../secrets/secrets.yaml;
|
||||
|
||||
@ -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) / 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-if = 1;
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
config = lib.mkIf config.mods.game.enable {
|
||||
home.packages = with pkgs;[
|
||||
# lutris (broken)
|
||||
lutris
|
||||
mangohud
|
||||
moonlight-qt
|
||||
prismlauncher
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
home.packages = with pkgs; [
|
||||
clang-tools
|
||||
nixd
|
||||
rust-analyzer
|
||||
nodejs_24
|
||||
glsl_analyzer
|
||||
(pkgs.python3.withPackages (ps: with ps; [
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# 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 #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# 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;
|
||||
};
|
||||
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
boot.consoleLogLevel = 3;
|
||||
boot.initrd.verbose = false;
|
||||
boot.kernelParams = [
|
||||
|
||||
12
osConfigs/global/nix-alien.nix
Normal file
12
osConfigs/global/nix-alien.nix
Normal 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
|
||||
];
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# 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 ];
|
||||
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";
|
||||
@ -35,7 +34,6 @@
|
||||
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;
|
||||
@ -88,11 +86,8 @@
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
acpi # can be user (global)
|
||||
openvr
|
||||
];
|
||||
|
||||
# programs.alvr.enable = true;
|
||||
|
||||
|
||||
mods.touchpad.enable = true;
|
||||
|
||||
@ -162,5 +157,4 @@
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# 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.zfs.forceImportRoot = false;
|
||||
boot.zfs.extraPools = [ "raid_vol" ];
|
||||
|
||||
services.zfs = {
|
||||
autoScrub.enable = true;
|
||||
|
||||
Reference in New Issue
Block a user