Compare commits
20 Commits
fbdc5b8810
...
10c46e1
Author | SHA1 | Date | |
---|---|---|---|
10c46e1e6a | |||
5f64559676 | |||
a82be1df2c | |||
f5ea128df4 | |||
3207899d6c | |||
e2e9a60907 | |||
26448d59d6 | |||
4d140208b3 | |||
d965848b31 | |||
a6eaa69a1c | |||
2eeff79ea0 | |||
7044d1eebb | |||
ca2a2a8e8d | |||
a5762a6a45 | |||
d5df83a046 | |||
1c38dc5686 | |||
b55c6baf47 | |||
7887f3c650 | |||
de34ac63af | |||
64f4635618 |
@ -1,6 +1,9 @@
|
|||||||
name: Build iso when a new version is pushed
|
name: Build iso when a new version is pushed
|
||||||
run-name: iso building
|
run-name: iso building
|
||||||
on: [push]
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- 'master'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@ -14,13 +17,44 @@ jobs:
|
|||||||
|
|
||||||
- name: install go
|
- name: install go
|
||||||
uses: https://github.com/actions/setup-go@v4
|
uses: https://github.com/actions/setup-go@v4
|
||||||
|
with:
|
||||||
|
go-version: '>=1.20.1'
|
||||||
|
|
||||||
#- name: build iso
|
- name: build iso
|
||||||
# run: make iso
|
run: make iso
|
||||||
|
|
||||||
|
- name: get commit tag
|
||||||
|
id: vars
|
||||||
|
run: echo "TAG=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: create tag
|
||||||
|
run: |
|
||||||
|
git config user.name "gitea-actions"
|
||||||
|
git config user.email "actions@gitea.com"
|
||||||
|
git tag ${{steps.vars.outputs.TAG}}
|
||||||
|
git push origin ${{steps.vars.outputs.TAG}}
|
||||||
|
|
||||||
- name: create release
|
- name: create release
|
||||||
uses: https://gitea.com/actions/release-action@main
|
run: |
|
||||||
with:
|
AUTH_TOKEN=${{secrets.RELEASE_TOKEN}}
|
||||||
files: |-
|
TAG_NAME=${{steps.vars.outputs.TAG}}
|
||||||
flake.nix
|
owner=tom
|
||||||
api_key: '${{secrets.RELEASE_TOKEN}}'
|
repo=nix-config
|
||||||
|
set -e
|
||||||
|
release_create_res=$(curl -X POST -H "Authorization: token $AUTH_TOKEN" -H "content-type: application/json" -d "{\"tag_name\":\"$TAG_NAME\",\"name\":\"$TAG_NAME\"}" "https://git.tmoron.fr/api/v1/repos/$owner/$repo/releases" 2>/dev/null)
|
||||||
|
|
||||||
|
release_id=$(echo $release_create_res | jq -r .id)
|
||||||
|
echo $release_id
|
||||||
|
|
||||||
|
if [ $release_id == "null" ]; then
|
||||||
|
echo error
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
file_send_res=$(curl \
|
||||||
|
"https://git.tmoron.fr/api/v1/repos/$owner/$repo/releases/$release_id/assets?name=nixos.iso"\
|
||||||
|
-H "Authorization: token $AUTH_TOKEN"\
|
||||||
|
-H "accept: application/json"\
|
||||||
|
-H "Content-Type: multipart/form-data"\
|
||||||
|
-F "attachment=@nixos.iso" 2>/dev/null)
|
||||||
|
echo $file_send_res
|
||||||
|
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
|||||||
HOST ?= $(file < /etc/nixosFlakeName)
|
HOST ?= $(file < /etc/nixosFlakeName)
|
||||||
THREADS ?= $(shell nproc)
|
THREADS ?= $(shell nproc)
|
||||||
FLAKE ?= .
|
FLAKE ?= .
|
||||||
MODE = boot
|
MODE = switch
|
||||||
|
|
||||||
FLAGS = --impure --cores $(THREADS) -j $(THREADS)
|
FLAGS = --impure --cores $(THREADS) -j $(THREADS)
|
||||||
|
|
||||||
|
24
flake.lock
generated
24
flake.lock
generated
@ -8,11 +8,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1744173435,
|
"lastModified": 1745419403,
|
||||||
"narHash": "sha256-q5cViHmB4k1CdncBUVBY4UUukiKQxgBJ6R18qJ3pHOA=",
|
"narHash": "sha256-pQOOn4UntLSwnL3xZ1JAr3IDhXpL+kTS7Zw8ll59K9Q=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "e7ea586f82360a06ec21f14544bc26b10aa1aea6",
|
"rev": "346899a4b3b651ab447c61e0c8e9d8a1454cda72",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -29,11 +29,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744208565,
|
"lastModified": 1745627989,
|
||||||
"narHash": "sha256-vG3JJOar/r8ognz7wuwMtOJ8Knu1MMlOzHB1N6R2MbY=",
|
"narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "542efdf2dfac351498f534eb71671525b9bd45ed",
|
"rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -44,11 +44,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743420942,
|
"lastModified": 1745503349,
|
||||||
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
|
"narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
|
"rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -60,11 +60,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744098102,
|
"lastModified": 1745526057,
|
||||||
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
|
"narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
|
"rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -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: 2025/03/19 15:45:13 by tomoron ### ########.fr #
|
# Updated: 2025/04/25 00:08:54 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -64,9 +64,11 @@
|
|||||||
|
|
||||||
home.sessionPath = [ "~/.local/bin" ];
|
home.sessionPath = [ "~/.local/bin" ];
|
||||||
|
|
||||||
|
|
||||||
home.file = { #should be able to make most of these in nix configs
|
home.file = { #should be able to make most of these in nix configs
|
||||||
".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.png;
|
".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.png;
|
||||||
".config/pc.jpg".source = lib.mkDefault utils/pc.jpg;
|
".config/pc.jpg".source = lib.mkDefault utils/pc.jpg;
|
||||||
|
".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\"";
|
||||||
|
|
||||||
".local/share/rofi/themes".source = "${builtins.fetchGit {
|
".local/share/rofi/themes".source = "${builtins.fetchGit {
|
||||||
url = "https://github.com/newmanls/rofi-themes-collection";
|
url = "https://github.com/newmanls/rofi-themes-collection";
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
mods.discord.enable = false;
|
mods.nonChromium.enable = false;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
home.file.".config/wallpaper.png".source = ../utils/wallpaper_test.png;
|
||||||
programs.waybar.settings.mainBar = {
|
programs.waybar.settings.mainBar = {
|
||||||
modules-right = lib.mkBefore ["custom/fans" "custom/dgpu"];
|
modules-right = lib.mkBefore ["custom/fans" "custom/dgpu"];
|
||||||
"custom/dgpu" = {
|
"custom/dgpu" = {
|
||||||
@ -38,6 +39,7 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
stremio
|
stremio
|
||||||
blender
|
blender
|
||||||
|
wireshark
|
||||||
];
|
];
|
||||||
|
|
||||||
#mods.sync.syncedAdditions = ["VirtualBox VMs"];
|
#mods.sync.syncedAdditions = ["VirtualBox VMs"];
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
window.opacity = 0.9;
|
window.opacity = 0.95;
|
||||||
env.XTERM = "xterm-256color";
|
env.XTERM = "xterm-256color";
|
||||||
font.size = 9;
|
font.size = 9;
|
||||||
};
|
};
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
{ 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
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
@ -10,6 +10,7 @@
|
|||||||
config = lib.mkIf config.mods.git.enable {
|
config = lib.mkIf config.mods.git.enable {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
lfs.enable = true;
|
||||||
userEmail = "tomoron@student.42angouleme.fr";
|
userEmail = "tomoron@student.42angouleme.fr";
|
||||||
userName = "tomoron";
|
userName = "tomoron";
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
|
16
homeConfigs/modules/nonChromium.nix
Normal file
16
homeConfigs/modules/nonChromium.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
options.mods.nonChromium.enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "all chromium/electron based application can't be built by act-runner, so they can't be in the iso";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.mods.nonChromium.enable {
|
||||||
|
home.packages = with pkgs;[
|
||||||
|
discord
|
||||||
|
google-chrome
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
@ -13,7 +13,7 @@
|
|||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
"$mainMod" = "SUPER";
|
"$mainMod" = "SUPER";
|
||||||
bind = [
|
bind = [
|
||||||
" , Print, exec, grim -t jpeg -g \"$(slurp)\" ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg"
|
" , Print, exec, grim -t png -g \"$(slurp)\" /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
|
||||||
"$mainMod, Return, exec, alacritty"
|
"$mainMod, Return, exec, alacritty"
|
||||||
"CTRL_ALT, Q, killactive,"
|
"CTRL_ALT, Q, killactive,"
|
||||||
"SUPER_ALT, Q, exit,"
|
"SUPER_ALT, Q, exit,"
|
||||||
|
@ -58,6 +58,9 @@
|
|||||||
#cpu.high {
|
#cpu.high {
|
||||||
color: #ff2222;
|
color: #ff2222;
|
||||||
}
|
}
|
||||||
|
#disk.high {
|
||||||
|
color: #ff2222;
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
programs.waybar.settings.mainBar = {
|
programs.waybar.settings.mainBar = {
|
||||||
@ -141,6 +144,7 @@
|
|||||||
|
|
||||||
disk = {
|
disk = {
|
||||||
format =" {percentage_used}% |";
|
format =" {percentage_used}% |";
|
||||||
|
states.high = "5";
|
||||||
};
|
};
|
||||||
|
|
||||||
"custom/pipe" = {
|
"custom/pipe" = {
|
||||||
|
BIN
homeConfigs/utils/wallpaper_test.png
Normal file
BIN
homeConfigs/utils/wallpaper_test.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 797 KiB |
@ -6,7 +6,7 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2025/02/09 01:43:46 by tomoron #+# #+# #
|
# Created: 2025/02/09 01:43:46 by tomoron #+# #+# #
|
||||||
# Updated: 2025/04/03 13:24:06 by tomoron ### ########.fr #
|
# Updated: 2025/04/23 20:31:46 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
users.users.tom = {
|
users.users.tom = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" "libvirtd" "dialout"];
|
extraGroups = [ "wheel" "docker" "libvirtd" "dialout" "wireshark"];
|
||||||
initialPassword = "password";
|
initialPassword = "password";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
services.displayManager.enable = true;
|
services.displayManager.enable = true;
|
||||||
services.displayManager.ly.enable = true;
|
services.displayManager.ly.enable = true;
|
||||||
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
networking.hostName = "patate-douce";
|
networking.hostName = "patate-douce";
|
||||||
networking.wireless.enable = true;
|
networking.wireless.enable = true;
|
||||||
@ -52,6 +53,9 @@
|
|||||||
|
|
||||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||||
|
|
||||||
|
programs.wireshark.enable = true;
|
||||||
|
programs.wireshark.usbmon.enable = true;
|
||||||
|
|
||||||
# boot.plymouth = {
|
# boot.plymouth = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# theme = "ycontre-glow";
|
# theme = "ycontre-glow";
|
||||||
|
Reference in New Issue
Block a user