Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
86719c309a
|
|||
| bdc61737cb | |||
| 05861081ce | |||
|
724f5361e6
|
|||
|
c0223fdd09
|
|||
|
0e8dfb98c5
|
|||
|
26c4bb6495
|
|||
|
ef6d5cedb0
|
|||
|
a70786d0bb
|
|||
|
ca5538c4d1
|
|||
|
b0fe851dec
|
|||
|
c631965709
|
|||
|
a5134e71b8
|
2
Makefile
2
Makefile
@ -27,5 +27,5 @@ cleanup :
|
|||||||
nix-env --delete-generations +1
|
nix-env --delete-generations +1
|
||||||
sudo nix-collect-garbage -d
|
sudo nix-collect-garbage -d
|
||||||
|
|
||||||
optimise :
|
optimize :
|
||||||
nix-store --optimize -vv
|
nix-store --optimize -vv
|
||||||
|
|||||||
42
flake.lock
generated
42
flake.lock
generated
@ -5,11 +5,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759572023,
|
"lastModified": 1768575137,
|
||||||
"narHash": "sha256-2fzYq/m2PXie5WZO5LhyiZrTIUdUFp1SCLZAwvPL5xo=",
|
"narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "eeada12912d80d04733383d231a9d66172858718",
|
"rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -26,11 +26,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1759637032,
|
"lastModified": 1768622624,
|
||||||
"narHash": "sha256-tJPZLTwVT6D8JCASuRmDov1yu9XIdC0btRlQCzCU688=",
|
"narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "eff82f4fb13a381248ba1432a641894b6c0e4442",
|
"rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -47,11 +47,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759573136,
|
"lastModified": 1768598210,
|
||||||
"narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=",
|
"narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43",
|
"rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -62,11 +62,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759582739,
|
"lastModified": 1768584846,
|
||||||
"narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
|
"narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "3441b5242af7577230a78ffb03542add264179ab",
|
"rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -78,11 +78,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759381078,
|
"lastModified": 1768305791,
|
||||||
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
|
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
|
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -94,11 +94,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759381078,
|
"lastModified": 1768564909,
|
||||||
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
|
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
|
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -125,11 +125,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759635238,
|
"lastModified": 1768481291,
|
||||||
"narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
|
"narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
|
"rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
|
||||||
"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:24 by tomoron #+# #+# #
|
# Created: 2024/10/17 18:15:24 by tomoron #+# #+# #
|
||||||
# Updated: 2025/09/24 02:10:00 by tomoron ### ########.fr #
|
# Updated: 2025/12/16 19:01:21 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -46,7 +46,12 @@
|
|||||||
osConfig = {flakeName, extraModules ? []}: nixpkgs.lib.nixosSystem {
|
osConfig = {flakeName, extraModules ? []}: nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit inputs; flakeName = flakeName; };
|
specialArgs = { inherit inputs; flakeName = flakeName; };
|
||||||
modules = nixpkgs.lib.concatLists [
|
modules = nixpkgs.lib.concatLists [
|
||||||
[./osConfigs/os.nix ./osConfigs/hosts/${flakeName}.nix catppuccin.nixosModules.catppuccin]
|
[
|
||||||
|
./osConfigs/os.nix
|
||||||
|
./osConfigs/hosts/${flakeName}.nix
|
||||||
|
catppuccin.nixosModules.catppuccin
|
||||||
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
]
|
||||||
extraModules
|
extraModules
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@ -4,6 +4,8 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
settings.mgr.sort_dir_first=false;
|
settings.mgr.sort_dir_first=false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home.sessionVariables.BROWSER = "yazi";
|
||||||
programs.bash.bashrcExtra = ''
|
programs.bash.bashrcExtra = ''
|
||||||
function y() {
|
function y() {
|
||||||
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
|
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
|
||||||
|
|||||||
@ -4,16 +4,18 @@
|
|||||||
mods.x11.enable = true;
|
mods.x11.enable = true;
|
||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
monitor = [
|
monitor = [
|
||||||
"HDMI-A-1, 1920x1080@60, 0x0, auto"
|
"DP-1, 1280x1024@75.03Hz, -3200x0, auto"
|
||||||
"HDMI-A-3, 1920x1080@60, 1920x0, auto"
|
"HDMI-A-1, 1920x1080@60Hz, -1920x0, auto"
|
||||||
"DP-1, 1280x1024@60, 3840x0, auto"
|
"HDMI-A-3, 1920x1080@60Hz, 0x0, auto"
|
||||||
"DP-3, 1280x1024@60, 5120x0, auto"
|
"DP-3, 1920x1080@60.00Hz, 1920x0, auto"
|
||||||
|
"DP-4, 1280x1024@75.03Hz, 3840x0, auto"
|
||||||
];
|
];
|
||||||
workspace = [
|
workspace = [
|
||||||
"1, monitor:HDMI-A-1"
|
"4, monitor:DP-1"
|
||||||
"2, monitor:HDMI-A-3, default:true"
|
"3, monitor:HDMI-A-1"
|
||||||
"3, monitor:DP-1"
|
"1, monitor:HDMI-A-3, default:true"
|
||||||
"4, monitor:DP-3"
|
"2, monitor:DP-3"
|
||||||
|
"5, monitor:DP-4"
|
||||||
];
|
];
|
||||||
env = [
|
env = [
|
||||||
"AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0"
|
"AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0"
|
||||||
|
|||||||
@ -27,6 +27,11 @@
|
|||||||
", XF86Launch1, exec, hyprlock"
|
", XF86Launch1, exec, hyprlock"
|
||||||
", XF86Launch4, exec, pkill activate-linux"
|
", XF86Launch4, exec, pkill activate-linux"
|
||||||
];
|
];
|
||||||
|
bindl = [
|
||||||
|
",switch:off:Lid Switch,exec,hyprctl keyword monitor \"eDP-1, 1920x1080@120, 0x0, 1\""
|
||||||
|
",switch:on:Lid Switch,exec,hyprctl keyword monitor \"eDP-1, disable\""
|
||||||
|
|
||||||
|
];
|
||||||
monitor= [
|
monitor= [
|
||||||
# "eDP-1, modeline 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync, 0x0, 1"
|
# "eDP-1, modeline 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync, 0x0, 1"
|
||||||
"eDP-1, 1920x1080@120, 0x0, 1"
|
"eDP-1, 1920x1080@120, 0x0, 1"
|
||||||
@ -41,77 +46,4 @@
|
|||||||
localsend
|
localsend
|
||||||
];
|
];
|
||||||
|
|
||||||
# programs.superfile = {
|
|
||||||
# enable = true;
|
|
||||||
# hotkeys = {
|
|
||||||
# # global
|
|
||||||
# confirm = ["enter" ""];
|
|
||||||
# quit = ["ctrl+c" ""];
|
|
||||||
#
|
|
||||||
# # movement
|
|
||||||
# list_up = ["k" ""];
|
|
||||||
# list_down = ["j" ""];
|
|
||||||
# page_up = ["pgup"""];
|
|
||||||
# page_down = ["pgdown"""];
|
|
||||||
#
|
|
||||||
# # file panel control
|
|
||||||
# create_new_file_panel = ["n" ""];
|
|
||||||
# close_file_panel = ["q" ""];
|
|
||||||
# next_file_panel = ["tab" ""];
|
|
||||||
# previous_file_panel = ["shift+tab" ""];
|
|
||||||
# toggle_file_preview_panel = ["f" ""];
|
|
||||||
# open_sort_options_menu = ["o" ""];
|
|
||||||
# toggle_reverse_sort = ["R" ""];
|
|
||||||
#
|
|
||||||
# # change focus
|
|
||||||
# focus_on_process_bar = ["ctrl+p" ""];
|
|
||||||
# focus_on_sidebar = ["ctrl+s" ""];
|
|
||||||
# focus_on_metadata = ["ctrl+d" ""];
|
|
||||||
#
|
|
||||||
# # create file/directory and rename
|
|
||||||
# file_panel_item_create = ["a" ""];
|
|
||||||
# file_panel_item_rename = ["r" ""];
|
|
||||||
#
|
|
||||||
# # file operations
|
|
||||||
# copy_items = ["y" ""];
|
|
||||||
# cut_items = ["x" ""];
|
|
||||||
# paste_items = ["p" ""];
|
|
||||||
# delete_items = ["d" ""];
|
|
||||||
#
|
|
||||||
# # compress and extract
|
|
||||||
# extract_file = ["ctrl+e" ""];
|
|
||||||
# compress_file = ["ctrl+a" ""];
|
|
||||||
#
|
|
||||||
# # editor
|
|
||||||
# open_file_with_editor = ["e" ""];
|
|
||||||
# open_current_directory_with_editor = ["E" ""];
|
|
||||||
#
|
|
||||||
# # other
|
|
||||||
# pinned_directory = ["P" ""];
|
|
||||||
# toggle_dot_file = ["." ""];
|
|
||||||
# change_panel_mode = ["m" ""];
|
|
||||||
# open_help_menu = ["?" ""];
|
|
||||||
# open_command_line = [":" ""];
|
|
||||||
# copy_path = ["Y" ""];
|
|
||||||
# copy_present_working_directory = ["c" ""];
|
|
||||||
# toggle_footer = ["ctrl+f" ""];
|
|
||||||
#
|
|
||||||
# # Typing hotkeys (can conflict with all hotkeys)
|
|
||||||
# confirm_typing = ["enter" ""];
|
|
||||||
# cancel_typing = ["esc" ""];
|
|
||||||
#
|
|
||||||
# # =================================================================================================
|
|
||||||
# # Normal mode hotkeys (can conflict with other modes cannot conflict with global hotkeys)
|
|
||||||
# parent_directory = ["-" ""];
|
|
||||||
# search_bar = ["/" ""];
|
|
||||||
#
|
|
||||||
# # =================================================================================================
|
|
||||||
# # Select mode hotkeys (can conflict with other modes cannot conflict with global hotkeys)
|
|
||||||
# file_panel_select_mode_items_select_down = ["J" ""];
|
|
||||||
# file_panel_select_mode_items_select_up = ["K" ""];
|
|
||||||
# file_panel_select_all_items = ["A" ""];
|
|
||||||
#
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,9 +11,9 @@
|
|||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
userEmail = "tomoron@student.42angouleme.fr";
|
settings = {
|
||||||
userName = "tomoron";
|
user.email = "tomoron@student.42angouleme.fr";
|
||||||
extraConfig = {
|
user.name = "tomoron";
|
||||||
init.defaultBranch="master";
|
init.defaultBranch="master";
|
||||||
pull.rebase = true;
|
pull.rebase = true;
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
@ -21,10 +21,10 @@
|
|||||||
help.autocorrect = 1;
|
help.autocorrect = 1;
|
||||||
user.signingkey = "251B4BD73683A8DF13D760A868BFAFE31DF313AD";
|
user.signingkey = "251B4BD73683A8DF13D760A868BFAFE31DF313AD";
|
||||||
commit.gpgsign = true;
|
commit.gpgsign = true;
|
||||||
};
|
aliase = {
|
||||||
aliases = {
|
fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
|
||||||
fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";
|
back = "reset HEAD~";
|
||||||
back = "reset HEAD~";
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -46,7 +46,7 @@ in
|
|||||||
text = (lib.strings.concatStrings [''
|
text = (lib.strings.concatStrings [''
|
||||||
auto=true
|
auto=true
|
||||||
root=${config.mods.sync.homeFolder}
|
root=${config.mods.sync.homeFolder}
|
||||||
root=ssh://tom@tmoron.fr:1880/${config.mods.sync.destFolder}
|
root=ssh://tom@free.tmoron.fr:1880/${config.mods.sync.destFolder}
|
||||||
''
|
''
|
||||||
(lib.strings.concatMapStrings (x: "\npath=" + x) (( if config.mods.sync.defaultSynced then defPathLst else [] ) ++ config.mods.sync.syncedAdditions ))
|
(lib.strings.concatMapStrings (x: "\npath=" + x) (( if config.mods.sync.defaultSynced then defPathLst else [] ) ++ config.mods.sync.syncedAdditions ))
|
||||||
(if !(isNull config.mods.sync.customHostName) then "\nclientHostName=${config.mods.sync.customHostName}" else "")
|
(if !(isNull config.mods.sync.customHostName) then "\nclientHostName=${config.mods.sync.customHostName}" else "")
|
||||||
|
|||||||
@ -10,12 +10,14 @@
|
|||||||
config = lib.mkIf config.mods.hyprland.enable {
|
config = lib.mkIf config.mods.hyprland.enable {
|
||||||
wayland.windowManager.hyprland.systemd.variables = [ "--all" ];
|
wayland.windowManager.hyprland.systemd.variables = [ "--all" ];
|
||||||
|
|
||||||
|
programs.hyprshot.enable = true;
|
||||||
|
|
||||||
wayland.windowManager.hyprland.enable = true;
|
wayland.windowManager.hyprland.enable = true;
|
||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
"$mainMod" = "SUPER";
|
"$mainMod" = "SUPER";
|
||||||
bind = [
|
bind = [
|
||||||
" , Print, exec, grim -t png -g \"$(slurp)\" /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
|
" , Print, exec, hyprshot -m region -o ~/screenshots -f $(date +%Y-%m-%d_%H-%M-%S).png"
|
||||||
" SHIFT, Print, exec, grim -t png /dev/stdout | tee ~/screenshots/$(date +%Y-%m-%d_%H-%m-%s).png | wl-copy -t image/png"
|
" SHIFT, Print, exec, hyprshot -m output -m active -o ~/screenshots -f $(date +%Y-%m-%d_%H-%M-%S).png"
|
||||||
"$mainMod, Return, exec, alacritty"
|
"$mainMod, Return, exec, alacritty"
|
||||||
"CTRL_ALT, Q, killactive,"
|
"CTRL_ALT, Q, killactive,"
|
||||||
"CTRL_ALT_SHIFT, Q, forcekillactive,"
|
"CTRL_ALT_SHIFT, Q, forcekillactive,"
|
||||||
@ -165,6 +167,12 @@
|
|||||||
allow_tearing = false;
|
allow_tearing = false;
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
layerrule = {
|
||||||
|
name = "no_anim_for_selection";
|
||||||
|
no_anim = "on";
|
||||||
|
"match:namespace" = "selection";
|
||||||
|
};
|
||||||
|
|
||||||
cursor.no_warps = true;
|
cursor.no_warps = true;
|
||||||
|
|
||||||
|
|||||||
@ -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/09/05 19:28:45 by tomoron ### ########.fr #
|
# Updated: 2025/11/17 11:55:17 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -45,5 +45,7 @@
|
|||||||
compiledb
|
compiledb
|
||||||
yubikey-personalization
|
yubikey-personalization
|
||||||
sops
|
sops
|
||||||
|
libreoffice
|
||||||
|
doxygen
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
8
osConfigs/global/sops.nix
Normal file
8
osConfigs/global/sops.nix
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{lib, ...}:
|
||||||
|
|
||||||
|
{
|
||||||
|
sops = {
|
||||||
|
defaultSopsFile = ../../secrets/secrets.yaml;
|
||||||
|
age.keyFile = "/home/tom/.config/sops/age/keys.txt";
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -6,7 +6,7 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2025/09/06 00:57:04 by tomoron #+# #+# #
|
# Created: 2025/09/06 00:57:04 by tomoron #+# #+# #
|
||||||
# Updated: 2025/09/06 00:57:05 by tomoron ### ########.fr #
|
# Updated: 2025/12/23 18:41:48 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -22,20 +22,26 @@
|
|||||||
networking.hostName = "nixos-fixe";
|
networking.hostName = "nixos-fixe";
|
||||||
|
|
||||||
hardware.cpu.intel.updateMicrocode = true;
|
hardware.cpu.intel.updateMicrocode = true;
|
||||||
|
mods.yubikey.pam.enable = true;
|
||||||
|
|
||||||
boot.kernelModules = [ "kvm-intel" "nvidia" ];
|
boot.kernelModules = [ "kvm-intel" "nvidia" ];
|
||||||
mods.displayManager.enable = true;
|
mods.displayManager.enable = true;
|
||||||
|
|
||||||
hardware.nvidia = {
|
mods.nvidia.enable = true;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
mods.gayming.enable = true;
|
||||||
open = true;
|
|
||||||
|
|
||||||
prime.nvidiaBusId = "PCI:1:0:0";
|
programs.noisetorch.enable = true;
|
||||||
prime.intelBusId = "PCI:0:2:0";
|
|
||||||
prime.sync.enable = true;
|
|
||||||
|
|
||||||
modesetting.enable = true;
|
# hardware.nvidia = {
|
||||||
};
|
# open = true;
|
||||||
|
#
|
||||||
|
# prime.nvidiaBusId = "PCI:1:0:0";
|
||||||
|
# prime.intelBusId = "PCI:0:2:0";
|
||||||
|
# prime.sync.enable = true;
|
||||||
|
#
|
||||||
|
# modesetting.enable = true;
|
||||||
|
# };
|
||||||
|
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
programs.droidcam.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,11 +6,11 @@
|
|||||||
# 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: 2025/10/04 22:23:34 by tomoron ### ########.fr #
|
# Updated: 2025/11/21 10:40:19 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ lib, config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.initrd.luks.yubikeySupport = true;
|
boot.initrd.luks.yubikeySupport = true;
|
||||||
@ -71,6 +71,8 @@
|
|||||||
systemd.network.enable = true;
|
systemd.network.enable = true;
|
||||||
networking.useNetworkd = true;
|
networking.useNetworkd = true;
|
||||||
|
|
||||||
|
programs.noisetorch.enable = true;
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
@ -80,7 +82,6 @@
|
|||||||
|
|
||||||
mods.touchpad.enable = true;
|
mods.touchpad.enable = true;
|
||||||
|
|
||||||
programs.gamescope.enable = true;
|
|
||||||
# programs.gamescope.capSysNice = true;
|
# programs.gamescope.capSysNice = true;
|
||||||
|
|
||||||
mods.powerSave = {
|
mods.powerSave = {
|
||||||
@ -98,6 +99,7 @@
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
services.asusd = {
|
services.asusd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableUserService = true;
|
enableUserService = true;
|
||||||
@ -105,7 +107,7 @@
|
|||||||
|
|
||||||
services.supergfxd.enable = true;
|
services.supergfxd.enable = true;
|
||||||
services.supergfxd.settings = {
|
services.supergfxd.settings = {
|
||||||
mode = "Integrated";
|
mode = lib.mkDefault "Integrated";
|
||||||
vfio_enable = true;
|
vfio_enable = true;
|
||||||
vfio_save = true;
|
vfio_save = true;
|
||||||
always_reboot = false;
|
always_reboot = false;
|
||||||
@ -134,4 +136,15 @@
|
|||||||
# };
|
# };
|
||||||
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
|
||||||
|
|
||||||
|
services.dnsmasq.enable = true;
|
||||||
|
services.dnsmasq.settings = {
|
||||||
|
"dhcp-range" = ["192.168.1.150,192.168.1.250"];
|
||||||
|
"dhcp-option" = [
|
||||||
|
"3,192.168.1.254"
|
||||||
|
"6,1.1.1.1,8.8.8.8,8.8.4.4"
|
||||||
|
];
|
||||||
|
"interface" = "enp4s0f4u1";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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: 2025/09/06 01:26:26 by tomoron ### ########.fr #
|
# Updated: 2025/12/16 20:00:04 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -31,13 +31,32 @@ in
|
|||||||
config.boot.kernelPackages.gasket #driver for google coral edge tpu
|
config.boot.kernelPackages.gasket #driver for google coral edge tpu
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
services.openssh.settings.PasswordAuthentication = false;
|
services.openssh.settings.PasswordAuthentication = false;
|
||||||
services.openssh.ports = [ 1880 ];
|
services.openssh.ports = [ 1880 ];
|
||||||
|
|
||||||
|
sops.secrets."cloudflared/token" = {};
|
||||||
|
systemd.services.cloudflared = {
|
||||||
|
after = [
|
||||||
|
"network.target"
|
||||||
|
"network-online.target"
|
||||||
|
];
|
||||||
|
wants = [
|
||||||
|
"network.target"
|
||||||
|
"network-online.target"
|
||||||
|
];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = ''${pkgs.bash}/bin/bash -c '${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate run --token "$(cat ${config.sops.secrets."cloudflared/token".path})"' '';
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
boot.extraModprobeConfig = ''
|
boot.extraModprobeConfig = ''
|
||||||
options amdgpu virtual_display=1
|
options amdgpu virtual_display=1
|
||||||
''; #create dummy display to be able to start x11
|
# create dummy display to be able to start x11
|
||||||
|
'';
|
||||||
|
|
||||||
boot.supportedFilesystems = [ "zfs" ];
|
boot.supportedFilesystems = [ "zfs" ];
|
||||||
|
|
||||||
@ -68,6 +87,10 @@ in
|
|||||||
services.fail2ban.enable = true;
|
services.fail2ban.enable = true;
|
||||||
services.fail2ban.bantime = "5h";
|
services.fail2ban.bantime = "5h";
|
||||||
|
|
||||||
|
mods.nvidia.enable = true;
|
||||||
|
mods.nvidia.beta = true;
|
||||||
|
mods.nvidia.containerToolkit = true;
|
||||||
|
|
||||||
mods.docker = {
|
mods.docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
boot = true;
|
boot = true;
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2025/09/05 23:47:16 by tomoron #+# #+# #
|
# Created: 2025/09/05 23:47:16 by tomoron #+# #+# #
|
||||||
# Updated: 2025/09/06 00:56:38 by tomoron ### ########.fr #
|
# Updated: 2025/11/17 14:32:13 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -24,7 +24,7 @@
|
|||||||
services.displayManager.ly.enable = true;
|
services.displayManager.ly.enable = true;
|
||||||
services.displayManager.ly.settings =
|
services.displayManager.ly.settings =
|
||||||
{
|
{
|
||||||
animation = "doom";
|
animation = "gameoflife";
|
||||||
min_refresh_delta = 50;
|
min_refresh_delta = 50;
|
||||||
bigclock = "en";
|
bigclock = "en";
|
||||||
sleep_cmd = "systemctl sleep";
|
sleep_cmd = "systemctl sleep";
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2025/09/05 23:47:09 by tomoron #+# #+# #
|
# Created: 2025/09/05 23:47:09 by tomoron #+# #+# #
|
||||||
# Updated: 2025/09/05 23:54:57 by tomoron ### ########.fr #
|
# Updated: 2025/10/27 00:50:29 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -22,5 +22,6 @@
|
|||||||
config = lib.mkIf config.mods.gayming.enable {
|
config = lib.mkIf config.mods.gayming.enable {
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
programs.steam.protontricks.enable = true;
|
programs.steam.protontricks.enable = true;
|
||||||
|
programs.gamescope.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2025/09/05 23:47:19 by tomoron #+# #+# #
|
# Created: 2025/09/05 23:47:19 by tomoron #+# #+# #
|
||||||
# Updated: 2025/09/06 01:12:34 by tomoron ### ########.fr #
|
# Updated: 2025/12/23 18:42:01 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -28,7 +28,7 @@
|
|||||||
open = lib.mkOption {
|
open = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
description = "use beta version of the drivers";
|
description = "use open version of the drivers (on newer gpu)";
|
||||||
};
|
};
|
||||||
containerToolkit = lib.mkOption {
|
containerToolkit = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
@ -38,7 +38,7 @@
|
|||||||
prime = lib.mkOption {
|
prime = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
description = "enable nvidia prime offload (saves battery)";
|
description = "enable nvidia prime offload (saves battery). prime ?";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
#ENC[AES256_GCM,data:1NcFm2XqZzmSSlr8wH4aXHDBhf+lOaZ/gUeK2T/U/hIBbqtfKtw=,iv:yS5iogRp6e3We/7wZnGy0XJzqLVfRVKlDhUs+tamcJ0=,tag:+z/qqF9n6/hQfv9aWXkCDQ==,type:comment]
|
#ENC[AES256_GCM,data:1NcFm2XqZzmSSlr8wH4aXHDBhf+lOaZ/gUeK2T/U/hIBbqtfKtw=,iv:yS5iogRp6e3We/7wZnGy0XJzqLVfRVKlDhUs+tamcJ0=,tag:+z/qqF9n6/hQfv9aWXkCDQ==,type:comment]
|
||||||
nextcloud_fuse:
|
nextcloud_fuse:
|
||||||
password: ENC[AES256_GCM,data:Rlyc9wO3rXJ97AAMzM+vJclEJ+eaSPtHkitqRL0=,iv:yuS2Tyo2HZGVb9tbWmmgOEwkyzLhlvq8iZ2YjGD0u9E=,tag:pf8n4pTvseh1pd12w8w4tw==,type:str]
|
password: ENC[AES256_GCM,data:Rlyc9wO3rXJ97AAMzM+vJclEJ+eaSPtHkitqRL0=,iv:yuS2Tyo2HZGVb9tbWmmgOEwkyzLhlvq8iZ2YjGD0u9E=,tag:pf8n4pTvseh1pd12w8w4tw==,type:str]
|
||||||
|
cloudflared:
|
||||||
|
token: ENC[AES256_GCM,data:LS1VIwbbVsJxZ90p+kK4xJhzrBRJ51XL2j8mGLDVj5JjYJKXKBDIXtlb0x8A9WDIVyBuLBkE9pfSfQXtvfvZdUeyXswVJFUNW0mX3yC/WaeNQdPYy7UgyGjorqk31aNJ6b9XqtdfV0++qPvXQDvwn44UY0juuiIJ5KcLZEskRcqVTilG5WYi/nInhGbSqtzniRNvrbsynIq0CVQDhi3haCHNpCJMQUIyXM/g6Xsc9b++GYlHjgrtHQ==,iv:DbvJfbMblgr6+dYBJqDSzECKK90Nkq8Eci5dC8fMIXQ=,tag:bjAs8p5dAkh2Adon0JDNqg==,type:str]
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age1sjzkhwr8ycdsmuj8xg8y4v2hcpuq9vethnhytxtwzeury692dsxqf80fwv
|
- recipient: age1sjzkhwr8ycdsmuj8xg8y4v2hcpuq9vethnhytxtwzeury692dsxqf80fwv
|
||||||
@ -12,7 +14,7 @@ sops:
|
|||||||
clZaazZQdW5wYUhUNmM0QW91K0NLOTAKB6z7cKg54QmJo0U03u6RQkSCfJOAdeJa
|
clZaazZQdW5wYUhUNmM0QW91K0NLOTAKB6z7cKg54QmJo0U03u6RQkSCfJOAdeJa
|
||||||
DiyPYjm02BNe8YPFbBFRpyT7G++j3h0yG+/Nr2zcQFyMMEpMv5QJvg==
|
DiyPYjm02BNe8YPFbBFRpyT7G++j3h0yG+/Nr2zcQFyMMEpMv5QJvg==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-09-05T17:58:05Z"
|
lastmodified: "2025-12-16T16:16:27Z"
|
||||||
mac: ENC[AES256_GCM,data:96G7VqaG8A46tQ1L7I2asiYtNZF7K3Wf+SzbwPrNV8zQio2jInawtD4WSzHmLs4Nv7M1TBHug/ho8mfYq6auXgpathiSzvj0Tzs/IEKXiTYa86tM3szwAepavMYWOl6OYJ7S39ku6BOMo3qC2BK/gpT5iy4c84ashn2wFd1n41A=,iv:6TShIsqnhCf/3uoAaz/R+Cwr2HrorROOXodXluTKM8M=,tag:BA9rQ73scKgetW3orV0HdQ==,type:str]
|
mac: ENC[AES256_GCM,data:2Ju1exddd4qcru1UjXKXUBjugUWT9D2HJjKV03JwMCL4Wssb/H6DNNRJcmD0oXqA9DnEp5NpElhwa93LcogcNVsXL+sKGzQpP5m+/vDVfl2NcwdLyBVIvTQ0dASee/JMwBLcgcYBZuvL00Twv07/ImdvYROIs/fQUSualc6Sgcw=,iv:XsJ1MYLwLuFPLYGJoa/RsfAqs88AQwuH+3ItWc681LU=,tag:8pNSPKnv0yLoNrmxb9l2Xg==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.10.2
|
version: 3.11.0
|
||||||
|
|||||||
Reference in New Issue
Block a user