7 Commits

Author SHA1 Message Date
9defcf7ad4 temp remove chrome from iso
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 9m15s
2025-04-15 15:59:01 +02:00
e5c52b4bc5 remove discord from iso build
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 2m17s
2025-04-15 15:54:01 +02:00
72f6ae62bc fix workflow file
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 1m49s
2025-04-15 15:21:28 +02:00
1d1af1d929 fix workflow file
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 0s
2025-04-15 15:18:41 +02:00
a97f8c71a6 downgrade docker on server config and change workflow 2025-04-15 15:15:55 +02:00
5db19e9bd4 downgrade docker on server
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 3s
2025-04-13 13:49:15 +02:00
f48ed2c39f update flake
Some checks failed
Build iso when a new version is pushed / test (push) Failing after 4s
2025-04-09 17:00:57 +02:00
9 changed files with 68 additions and 38 deletions

View File

@ -8,9 +8,12 @@ jobs:
steps: steps:
- name: get repo - name: get repo
uses: actions/checkout@v4.2.2 uses: actions/checkout@v4.2.2
# - uses: https://github.com/cachix/install-nix-action@v31
# - name: create iso image - name: install nix
# run: make iso uses: https://github.com/cachix/install-nix-action@v31
- name: build iso
run: make iso
- name: create release - name: create release
uses: https://gitea.com/actions/release-action@main uses: https://gitea.com/actions/release-action@main

57
flake.lock generated
View File

@ -2,18 +2,17 @@
"nodes": { "nodes": {
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1743119709, "lastModified": 1744173435,
"narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=", "narHash": "sha256-q5cViHmB4k1CdncBUVBY4UUukiKQxgBJ6R18qJ3pHOA=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65", "rev": "e7ea586f82360a06ec21f14544bc26b10aa1aea6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -23,21 +22,6 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"flake-utils": {
"locked": {
"lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -45,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743345555, "lastModified": 1744208565,
"narHash": "sha256-Df8PxfWYF/z6RWcsKuXSks/FOCOCA7EiRdlWE2u0rRc=", "narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2760046f34780cc72f67e06240ccf6a7a3ae3765", "rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +44,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1743167577, "lastModified": 1743420942,
"narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,11 +60,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743095683, "lastModified": 1744098102,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,6 +74,22 @@
"type": "github" "type": "github"
} }
}, },
"pkgs-docker-2750": {
"locked": {
"lastModified": 1737525964,
"narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
"type": "github"
}
},
"plymouth-theme-ycontre-glow": { "plymouth-theme-ycontre-glow": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -116,6 +116,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pkgs-docker-2750": "pkgs-docker-2750",
"plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow" "plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
} }
} }

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: 2025/03/19 15:48:10 by tomoron ### ########.fr # # Updated: 2025/04/13 13:35:56 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -30,6 +30,7 @@
url = "git+file:///home/tom/desktop/bordel/ycontre-glow"; url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
pkgs-docker-2750.url = "github:NixOS/nixpkgs?rev=5757bbb8bd7c0630a0cc4bb19c47e588db30b97c";
}; };
outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs: outputs = { nixpkgs, home-manager, nixos-hardware, ... }@inputs:
@ -75,7 +76,7 @@
homeConfigurations = { homeConfigurations = {
vbox = homeConfig { flakeName = "vbox"; }; vbox = homeConfig { flakeName = "vbox"; };
ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron";}; ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/nfs/homes/tomoron";};
laptop = homeConfig { flakeName = "laptop"; }; laptop = homeConfig { flakeName = "laptop"; };
desktop = homeConfig { flakeName = "desktop"; }; desktop = homeConfig { flakeName = "desktop"; };
server = homeConfig { flakeName = "server"; }; server = homeConfig { flakeName = "server"; };

View File

@ -12,7 +12,7 @@
mods.x11.enable = true; mods.x11.enable = true;
programs.firefox.enable = false; programs.firefox.enable = false;
mods.sync.homeFolder = "/home/tomoron/sync"; mods.sync.homeFolder = "/sgoinfre/goinfre/Perso/tomoron";
mods.sync.defaultSynced = false; mods.sync.defaultSynced = false;
mods.sync.syncedAdditions = [ "42_desktop" "Downloads" ]; mods.sync.syncedAdditions = [ "42_desktop" "Downloads" ];
mods.sync.customHostName = "pc42"; mods.sync.customHostName = "pc42";

View File

@ -0,0 +1,5 @@
{ lib, pkgs, ... }:
{
mods.discord.enable = false;
}

View File

@ -0,0 +1,16 @@
{ config, lib, pkgs, ... }:
{
options.mods.discord.enable = lib.mkOption {
type = lib.types.bool;
default = true;
description = "install discord";
};
config = lib.mkIf config.mods.discord.enable {
home.packages = with pkgs;[
discord
google-chrome
];
};
}

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: 2025/03/27 18:53:17 by tomoron ### ########.fr # # Updated: 2025/04/15 15:58:07 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -18,8 +18,6 @@
activate-linux activate-linux
unison unison
discord
google-chrome
brightnessctl brightnessctl
playerctl playerctl
python3 python3

View File

@ -17,6 +17,9 @@
home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;}; home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
home-manager.users.tom = { home-manager.users.tom = {
imports = [ ../../homeConfigs/home.nix ]; imports = [
../../homeConfigs/home.nix
../../homeConfigs/hosts/iso.nix
];
}; };
} }

View File

@ -26,6 +26,8 @@
libnvidia-container libnvidia-container
screen screen
]; ];
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
# services.cron.enable = false; # services.cron.enable = false;
@ -71,6 +73,7 @@
virtualisation.docker = { virtualisation.docker = {
liveRestore = false; liveRestore = false;
enableOnBoot = true; enableOnBoot = true;
package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker;
# daemon.settings = { # daemon.settings = {
# runtimes.nvidia.path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime"; # runtimes.nvidia.path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime";
# exec-opts = ["native.cgroupdriver=cgroupfs"]; # exec-opts = ["native.cgroupdriver=cgroupfs"];