update flake, rofi changes, start powerManagement scripts with sudo

.sops.yaml

@@ -0,0 +1,7 @@
+keys:
+  - &primary age1sjzkhwr8ycdsmuj8xg8y4v2hcpuq9vethnhytxtwzeury692dsxqf80fwv
+creation_rules:
+  - path_regex: secrets/secrets.yaml$
+    key_groups:
+    - age:
+      - *primary

Makefile

@@ -1,7 +1,7 @@
 HOST ?= $(file < /etc/nixosFlakeName)
 THREADS ?= $(shell nproc)
 FLAKE ?= .
-MODE = switch 
+MODE ?= boot
 
 FLAGS = --impure --cores $(THREADS) -j $(THREADS) 
 
@@ -22,4 +22,10 @@ iso :
 	rm -rf result
 
 cleanup :
+	sudo nix-env --delete-generations +1 --profile /nix/var/nix/profiles/system
+	nix-env --delete-generations +1 --profile ~/.local/state/nix/profiles/home-manager
+	nix-env --delete-generations +1
 	sudo nix-collect-garbage -d
+
+optimise :
+	nix-store --optimize -vv

flake.lock

@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1758270360,
+        "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "firefox-addons": {
       "inputs": {
         "nixpkgs": [
@@ -8,11 +26,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1745222277,
+        "lastModified": 1758254611,
-        "narHash": "sha256-zkUx4CzgqRS8bUT1hyEGol3w6/iv+tk0axMpdzTB7Mw=",
+        "narHash": "sha256-5oMrmEG8A5FopmDZJ5QlskhLyf2SsdipGmKpT7n1JCE=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "da88304c0a5113485bd36a498ee05516cace8ec9",
+        "rev": "c451ce9fe2c5e0b46b221bb485a7b1e1ca8a3484",
         "type": "gitlab"
       },
       "original": {
@@ -29,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745256380,
+        "lastModified": 1758288820,
-        "narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=",
+        "narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac",
+        "rev": "e38751933802481b37fee1f9251cbb86e63df381",
         "type": "github"
       },
       "original": {
@@ -44,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1744633460,
+        "lastModified": 1757943327,
-        "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
+        "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
+        "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
         "type": "github"
       },
       "original": {
@@ -60,11 +78,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744932701,
+        "lastModified": 1758035966,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1758198701,
+        "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
         "type": "github"
       },
       "original": {
@@ -74,50 +108,34 @@
         "type": "github"
       }
     },
-    "pkgs-docker-2750": {
+    "root": {
-      "locked": {
+      "inputs": {
-        "lastModified": 1737525964,
+        "catppuccin": "catppuccin",
-        "narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=",
+        "firefox-addons": "firefox-addons",
-        "owner": "NixOS",
+        "home-manager": "home-manager",
-        "repo": "nixpkgs",
+        "nixos-hardware": "nixos-hardware",
-        "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
+        "nixpkgs": "nixpkgs_2",
-        "type": "github"
+        "sops-nix": "sops-nix"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
-        "type": "github"
       }
     },
-    "plymouth-theme-ycontre-glow": {
+    "sops-nix": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1731939263,
+        "lastModified": 1758007585,
-        "narHash": "sha256-mLwLR5dEJTvtqJU/lvo9f8c3/xIFPOpXlPF3JsJtnHo=",
+        "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
-        "ref": "refs/heads/master",
+        "owner": "Mic92",
-        "rev": "702e7b014ef6cf748252e797724e4096bafcaafa",
+        "repo": "sops-nix",
-        "revCount": 1,
+        "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
-        "type": "git",
+        "type": "github"
-        "url": "file:///home/tom/desktop/bordel/ycontre-glow"
       },
       "original": {
-        "type": "git",
+        "owner": "Mic92",
-        "url": "file:///home/tom/desktop/bordel/ycontre-glow"
+        "repo": "sops-nix",
-      }
+        "type": "github"
-    },
-    "root": {
-      "inputs": {
-        "firefox-addons": "firefox-addons",
-        "home-manager": "home-manager",
-        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
-        "pkgs-docker-2750": "pkgs-docker-2750",
-        "plymouth-theme-ycontre-glow": "plymouth-theme-ycontre-glow"
       }
     }
   },

flake.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:24 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/13 13:35:56 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/06 00:58:57 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -15,6 +15,13 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+	catppuccin.url = "github:catppuccin/nix";
+
+	sops-nix = {
+	  url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+	};
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -26,21 +33,20 @@
 	  inputs.nixpkgs.follows = "nixpkgs";
 	};
 
-	plymouth-theme-ycontre-glow = {
+	#plymouth-theme-ycontre-glow = {
-      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, catppuccin, home-manager, nixos-hardware, ... }@inputs:
 	let
 	  pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
 
       osConfig = {flakeName, extraModules ? []}: nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; flakeName = flakeName; };
         modules = nixpkgs.lib.concatLists [
-		  [./osConfigs/global.nix ./osConfigs/hosts/${flakeName}.nix ]
+		  [./osConfigs/os.nix ./osConfigs/hosts/${flakeName}.nix catppuccin.nixosModules.catppuccin]
 		  extraModules
 		];
       };
@@ -49,14 +55,20 @@
         inherit pkgs;
 	    extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; };
         modules = nixpkgs.lib.concatLists [
-		  [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}.nix]
+		  [
+		    ./homeConfigs/home.nix
+			./homeConfigs/hosts/${flakeName}.nix
+			catppuccin.homeModules.catppuccin
+			inputs.sops-nix.homeManagerModules.sops
+		  ]
 		  extraModules
 		];
 	  };
 
 	in {
 
-      nixosConfigurations = { server = osConfig {flakeName = "server";};
+      nixosConfigurations = {
+	    server = osConfig {flakeName = "server";};
 	    vbox = osConfig {flakeName = "vbox";};
 		laptop = osConfig {flakeName = "laptop"; extraModules = [ nixos-hardware.nixosModules.asus-zephyrus-ga401 ];};
 		desktop = osConfig {flakeName = "desktop";};
@@ -67,8 +79,6 @@
           modules = [
             (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
             ./osConfigs/hosts/iso.nix
-			inputs.home-manager.nixosModules.default
-
           ];
 		};
       };
@@ -76,10 +86,11 @@
 
       homeConfigurations = {
 	    vbox = homeConfig { flakeName = "vbox"; };
-	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/nfs/homes/tomoron";};
+	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron";};
 	    laptop = homeConfig { flakeName = "laptop"; };
 	    desktop = homeConfig { flakeName = "desktop"; };
 	    server = homeConfig { flakeName = "server"; };
 	  };
+
     };
 }

homeConfigs/dotfiles/local/bin/brightness

@@ -1,21 +0,0 @@
-#!/bin/sh
-FILE=/sys/class/backlight/amdgpu_bl1/brightness
-if ! ( test -w "$FILE" ); then
-	xterm +cm -cr RED -bg BLACK -selbg WHITE -selfg BLACK -fg WHITE -fa Monospace -fs 14 -e "sudo chmod 777 $FILE"
-fi
-new=$(cat $FILE)
-
-
-if [ "$1" = "up" ]; then
-	new=$((new + 13))
-elif [ "$1" = "down" ];then
-	new=$((new - 13))
-fi
-
-if [ $new -gt 255 ]; then
-	new=255
-elif [ $new -lt 0 ]; then
-	new=0
-fi
-
-echo $new > $FILE

homeConfigs/dotfiles/local/bin/desk_sync

@@ -1,3 +0,0 @@
-#!/bin/sh
-unison /home/tom/Desktop ssh://tom@tmoron.fr:1880//home/tom/Desktop_sync/Desktop $@
-

homeConfigs/dotfiles/local/bin/hibernate

@@ -1,2 +0,0 @@
-xtrlock&
-systemctl hibernate

homeConfigs/dotfiles/local/bin/kbd_brightness

@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ "$1" = "up" ]; then
-	asusctl -n
-elif [ "$1" = "down" ];then
-	asusctl -p
-fi

homeConfigs/dotfiles/local/bin/scan

@@ -1,4 +0,0 @@
-#!/bin/bash
-until sudo iwctl station wlan0 show | grep iPhone > /dev/null;do
-	sudo iwctl station wlan0 scan 2>&1 > /dev/null
-done

homeConfigs/home.nix

@@ -6,11 +6,11 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/25 00:08:54 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/19 19:23:28 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-{lib, pkgs, username ? "tom" ,homeDir ? "/home/tom", isOs ? false, ... }:
+{lib, pkgs, config, username ? "tom" ,homeDir ? "/home/tom", isOs ? false, ... }:
 
 {
   imports = lib.concatLists [
@@ -23,6 +23,28 @@
 
   home.stateVersion = "24.05";
 
+  sops.defaultSopsFile = ../secrets/secrets.yaml;
+  sops.age.keyFile = "${homeDir}/.config/sops/age/keys.txt";
+  sops.secrets."nextcloud_fuse/password" = {};
+
+  programs.rclone.enable = true;
+  programs.rclone.remotes.nextcloud = {
+    config = {
+	  type = "webdav";
+	  url = "https://nc.tmoron.fr/remote.php/dav/files/tom";
+	  vendor = "nextcloud";
+	  user = "tom";
+    };
+	secrets.pass = config.sops.secrets."nextcloud_fuse/password".path;
+	mounts = {
+	  "/" = {
+	    enable = true;
+		mountPoint = "${homeDir}/nextcloud";
+		options.vfs-cache-mode = "writes";
+	  };
+	};
+  };
+
 #  programs.ghostty.enable = true;
 #  programs.ghostty.settings = {
 #    theme = "catppuccin-mocha";
@@ -39,7 +61,7 @@
   gtk = {
     enable = true;
     theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; };
-    iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; };
+#    iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; };
     font = { name = "Sans"; size = 11; };
   };
 
@@ -50,8 +72,8 @@
     vi = "nvim";
     hl = "Hyprland";
     clr = "clear";
-    tagueule = "asusctl profile -P Quiet";
+#    tagueule = "asusctl profile -P Quiet";
-    parle = "asusctl profile -P performance";
+#    parle = "asusctl profile -P performance";
 	noidle = "systemctl --user stop hypridle";
   };
   
@@ -64,11 +86,17 @@
 
   home.sessionPath = [ "~/.local/bin" ];
 
+  
+  programs.rofi = {
+    enable = true;
+	theme = "rounded-nord-dark";
+  };
+
 
   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_test.png;
     ".config/pc.jpg".source = lib.mkDefault utils/pc.jpg;
-  	".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\"";
+  	#".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\"";
 
 	".local/share/rofi/themes".source = "${builtins.fetchGit {
 		url = "https://github.com/newmanls/rofi-themes-collection";
@@ -76,7 +104,20 @@
 		ref = "master";
     }}/themes";
 
-#	".local/bin/desk_sync".source = dotfiles/local/bin/desk_sync;
   };
+  services.dunst.enable = true;
+
   programs.home-manager.enable = true;
+
+  qt.style.name = "kvantum";
+  catppuccin.kvantum.apply = true;
+  catppuccin.rofi.enable = false;
+
+  catppuccin = {
+  	enable = true;
+	flavor = "mocha";
+
+	dunst.enable = true;
+	dunst.flavor="frappe";
+  };
 }

homeConfigs/hosts/desktop.nix

@@ -20,7 +20,8 @@
 		"LIBVA_DRIVER_NAME,nvidia"
 		"__GLX_VENDOR_LIBRARY_NAME,nvidia"
 	];
-    cursor.no_hardware_cursors = 1;
+    cursor.no_hardware_cursors = true;
+	misc.vrr = 1;
   };
 
   mods.hyprland.autoSuspend = false;

homeConfigs/hosts/ft.nix

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

homeConfigs/hosts/laptop.nix

@@ -1,7 +1,6 @@
 { lib, pkgs, ... }:
 
 {
-  home.file.".config/wallpaper.png".source = ../utils/wallpaper_test.png;
   programs.waybar.settings.mainBar = {
     modules-right = lib.mkBefore ["custom/fans" "custom/dgpu"];
     "custom/dgpu" = {
@@ -37,10 +36,82 @@
   };
 
   home.packages = with pkgs; [
-    stremio
     blender
 	wireshark
+	localsend
   ];
 
-#mods.sync.syncedAdditions = ["VirtualBox VMs"];
+#  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" ""];
+#
+#	};
+#  };
+
 }

homeConfigs/hosts/vbox.nix

@@ -1,6 +1,11 @@
 { ... }:
 
 {
+  mods.game.enable = false;
+  mods.hyprland.enable = false;
+  mods.x11.enable = true;
+  programs.firefox.enable = false;
+
   services.picom = {
     backend = "xrender";
     settings = {

homeConfigs/modules/alacritty.nix

@@ -8,10 +8,11 @@
   };
 
   config = lib.mkIf config.mods.alacritty.enable {
+	catppuccin.alacritty.enable = true;
     programs.alacritty = {
       enable = true;
       settings = {
-        window.opacity = 0.95;
+#        window.opacity = 0.95;
         env.XTERM = "xterm-256color";
         font.size = 9;
       };

homeConfigs/modules/firefox.nix

@@ -8,11 +8,13 @@
   };
 
   config = lib.mkIf config.mods.firefox.enable {
+  	catppuccin.firefox.enable = true;
     programs.firefox = {
       enable = lib.mkDefault true;
       profiles.default = {
         extensions.packages = with inputs.firefox-addons.packages."x86_64-linux"; 
 	    [vimium ublock-origin];
+		extensions.force = true;
 	  };
     };
   };

homeConfigs/modules/git.nix

@@ -18,6 +18,7 @@
       	pull.rebase = true;
       	push.autoSetupRemote = true;
 		rerere.enabled = true;
+		help.autocorrect = 1;
       };
       aliases = {
         fuck = "!f() { git reset --hard \"@{upstream}\" && git restore . && git clean -f .; };f";

homeConfigs/modules/vim.nix

@@ -18,7 +18,7 @@
     home.packages = with pkgs; [
       clang-tools
       nixd
-      nodejs_23
+      nodejs_24
 	  glsl_analyzer
     ];
 
@@ -28,7 +28,6 @@
       autocmd BufWinLeave *.* mkview
       autocmd BufWinEnter *.* silent! loadview
       set tabstop=4
-	  set shiftwidth=4
       set scrolloff=10
       set preserveindent
       map <silent> <C-N> :bnext<CR>
@@ -70,7 +69,7 @@
       lua require'lspconfig'.nixd.setup{}
       lua require'lspconfig'.glsl_analyzer.setup{}
       set signcolumn=no
-      
+
       nnoremap <leader>ff <cmd>Telescope find_files<cr>
       nnoremap <leader>fg <cmd>Telescope live_grep<cr>
       nnoremap <leader>fb <cmd>Telescope buffers<cr>
@@ -93,7 +92,7 @@
       #install stdheader 42
       ".config/nvim/plugin/stdheader.vim".source = "${builtins.fetchGit {
         url = "https://github.com/42Paris/42header";
-        rev = "71e6a4df6d72ae87a080282bf45bb993da6146b2";
+        rev = "e6e6b191871545e0d43f1aad817070bc806b8fa7";
         ref = "master";
       }}/plugin/stdheader.vim";
 

homeConfigs/modules/wayland/hyprland.nix

@@ -8,6 +8,7 @@
   };
 
   config = lib.mkIf config.mods.hyprland.enable {
+    wayland.windowManager.hyprland.systemd.variables = [ "--all" ];
 
     wayland.windowManager.hyprland.enable = true;
     wayland.windowManager.hyprland.settings = {
@@ -16,9 +17,12 @@
   	  " , 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"
         "CTRL_ALT, Q, killactive,"
+        "CTRL_ALT_SHIFT, Q, forcekillactive,"
         "SUPER_ALT, Q, exit,"
         "$mainMod, S, togglefloating,"
+        "$mainMod, I, pin,"
         "$mainMod, D, exec, rofi -show drun -show-icons"
+        "$mainMod SHIFT, D, exec, rofi -show run -show-icons"
         "$mainMod, M, fullscreen, 1"
         "$mainMod, F, fullscreen, 0"
   
@@ -63,12 +67,12 @@
         "$mainMod, mouse_up, workspace, e-1"
       ];
   
-      bindm = [
+      bindm = [ #bind mouse
         "$mainMod, mouse:272, movewindow"
         "$mainMod, mouse:273, resizewindow"
       ];
   
-      bindel = [
+      bindel = [ #repeat and locked
         " ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
         " ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
         " ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
@@ -79,7 +83,7 @@
         " ,XF86KbdBrightnessDown, exec, asusctl -p"
       ];
   
-      bindl = [
+      bindl = [ #repeat
         " , XF86AudioNext, exec, playerctl next"
         " , XF86AudioPrev, exec, playerctl previous"
         " , XF86AudioPause, exec, playerctl play-pause"
@@ -142,18 +146,18 @@
   	      color = "rgba(1a1a1aee)";
   	    };
       
-        blur = {
+        #blur = {
-          enabled = true;
+        #  enabled = true;
-          size = 3;
+        #  size = 3;
-          passes = 1;
+        #  passes = 1;
-          vibrancy = 0.1696;
+        #  vibrancy = 0.1696;
-        };
+        #};
       };
   
       general = {
-        gaps_in = 3;
+        gaps_in = 2;
-        gaps_out = 7;
+        gaps_out = 5;
-        border_size = 2;
+        border_size = 1;
         "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
         "col.inactive_border" = "rgba(595959aa)";
         resize_on_border = false;

homeConfigs/modules/wayland/packages.nix

@@ -3,7 +3,6 @@
 {
   config = lib.mkIf config.mods.hyprland.enable {
     home.packages = with pkgs; [
-      rofi-wayland
 	  grim
 	  slurp
 	  wl-clipboard

homeConfigs/modules/x11/bspwm.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/10 00:21:11 by tomoron           #+#    #+#              #
-#    Updated: 2025/02/12 09:36:07 by tomoron          ###   ########.fr        #
+#    Updated: 2025/06/18 15:49:03 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 {lib, config, ... }:
@@ -34,7 +34,7 @@
       setxkbmap fr us&
       nitrogen --restore &
       pgrep activate-linux >/dev/null  || (sleep 2;activate-linux -d)&
-	''; # this is messy but i don't care, x11 isn't my default now.
+	''; # this is messy but i don't care, x11 is just a fallback now
     
   };
 }

homeConfigs/modules/x11/polybar.nix

@@ -6,13 +6,19 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/10 02:51:32 by tomoron           #+#    #+#              #
-#    Updated: 2025/02/10 17:28:27 by tomoron          ###   ########.fr        #
+#    Updated: 2025/08/07 15:30:07 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 { lib, config, ... }:
 
 {
+  options.mods.polybar.fspath = lib.mkOption {
+	type = lib.types.str;
+	default = "/";
+	description = "set the filesystem path for the remaining disk space";
+  };
+
   config = lib.mkIf config.mods.x11.enable {
     services.polybar.enable = true;
     services.polybar.script = "pgrep polybar >/dev/null || polybar -q main -c \"$HOME/.config/polybar/config.ini\"&";
@@ -44,8 +50,8 @@
 
       "module/filesystem" = {
         type = "internal/fs";
-        mount-0 = "/";
+        mount-0 = config.mods.polybar.fspath;
-        interval = 30;
+        interval = 10;
         fixed-values = true;
         format-mounted = "<label-mounted>";
         format-mounted-prefix = "󰋊";

homeConfigs/packages.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 22:01:56 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/15 15:58:07 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/05 19:28:45 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -14,22 +14,36 @@
 
 {
   home.packages = with pkgs;[
-	ripgrep
+    lrzip
-
+    pigz
-	activate-linux
+    htop
-	unison
+    gnumake
-	brightnessctl	
+    git
-	playerctl
+    neofetch
-	python3
+    clang
-	vlc
+    ninja
+    gdb
+    valgrind
+    wget
+    cmake
+    man-pages
+    stress
+    ffmpeg-full
+    ripgrep
+    activate-linux
+    unison
+    brightnessctl  
+    playerctl
+    python3
+    vlc
+    nix-index
+    yubikey-manager
+    bibata-cursors
+    libcaca
+    nasm
     nerd-fonts.iosevka
-
+	compiledb
-	nix-index
+	yubikey-personalization
-	yubikey-manager
+	sops
-	yubico-pam
-	dunst
-	bibata-cursors
-	libcaca
-	nasm
   ];
 }

osConfigs/global/boot.nix

@@ -0,0 +1,29 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    boot.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:37:58 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:38 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{lib, pkgs, ... } :
+
+{
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+
+  boot.loader = {
+    systemd-boot.enable = true;
+    systemd-boot.memtest86.enable = true;
+    efi.canTouchEfiVariables = true;
+    timeout = 1;
+  };
+
+  services.journald.extraConfig = ''
+    SystemMaxUse=100M
+    SystemMaxFileSize=50M
+  '';
+}

osConfigs/global/nix.nix

@@ -0,0 +1,18 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    nix.nix                                            :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:42:17 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/05 23:42:20 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ ... }:
+
+{
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nixpkgs.config.allowUnfree = true;
+}

osConfigs/global/other.nix

@@ -1,63 +1,35 @@
 # **************************************************************************** #
 #                                                                              #
 #                                                         :::      ::::::::    #
-#    global.nix                                         :+:      :+:    :+:    #
+#    other.nix                                          :+:      :+:    :+:    #
 #                                                     +:+ +:+         +:+      #
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/02/09 01:43:46 by tomoron           #+#    #+#              #
-#    Updated: 2025/04/23 20:31:46 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/06 00:51:46 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-{ lib, pkgs, flakeName, ... }:
+{ lib, ... }:
 
 { 
-  imports = lib.concatLists [[
+  networking.hostName = lib.mkDefault "unnamed-nixos";
-  	  ./hardware-configuration.nix
-	  ./packages.nix
-    ]
-    (lib.fileset.toList ./modules)
-  ];
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-  nixpkgs.config.allowUnfree = true;
-
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-
-  boot.loader = {
-    systemd-boot.enable = true;
-	systemd-boot.memtest86.enable = true;
-    efi.canTouchEfiVariables = true;
-    timeout = 1;
-  };
-
   networking.networkmanager.enable = lib.mkDefault true;
 
+  programs.fuse.enable = true;
+
   time.timeZone = "Europe/Paris";
 
   services.xserver.enable = lib.mkDefault true;
   services.xserver.displayManager.startx.enable = true;
 
+  programs.hyprland.enable = lib.mkDefault true;
+
   services.pipewire = {
     enable = true;
     pulse.enable = true;
   };
 
-  users.users.tom = {
-     isNormalUser = true;
-     extraGroups = [ "wheel" "docker" "libvirtd" "dialout" "wireshark"];
-     initialPassword = "password";
-   };
-
-  virtualisation.docker.enable = true;
-  virtualisation.docker.enableOnBoot = lib.mkDefault false;
-
-  programs.hyprland.enable = lib.mkDefault true;
-
-  system.stateVersion = "24.05";
-  environment.etc.nixosFlakeName.text = "${flakeName}";
-
   hardware.logitech.wireless.enable = true;
   hardware.logitech.wireless.enableGraphical = true;
 }

osConfigs/global/packages.nix

@@ -0,0 +1,25 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    packages.nix                                       :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:57:21 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:57:26 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    home-manager
+    vim
+    pciutils
+    usbutils
+    ntfs3g
+    cryptsetup
+    acpi
+  ];
+}

osConfigs/global/user.nix

@@ -0,0 +1,28 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    user.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:42:18 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:57:32 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ ... }:
+
+{
+  users.users.tom = {
+     isNormalUser = true;
+     extraGroups = [
+     "wheel" # can sudo
+     "docker" # can use docker
+     "libvirtd" # can use libvirtd
+     "dialout" # can use serial devices
+     "wireshark" # can use wireshask
+     ];
+
+     initialPassword = "password";
+   };
+}

osConfigs/hosts/desktop.nix

@@ -1,16 +1,22 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    desktop.nix                                        :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:57:04 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:57:05 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
 
 { config, lib, inputs, pkgs, ... }:
 
 {
-  imports = [
+  boot.kernelParams = [ "nvidia-drm-modset=1" ];
-    ../modules/game.nix
-	../modules/nvidia.nix
-	../modules/vboxHost.nix
-  ];
-
   environment.systemPackages = with pkgs; [
-  	cudatoolkit
+      lm_sensors # can be user (and global)
-  	lm_sensors
   ];
 
   networking.hostName = "nixos-fixe";
@@ -18,16 +24,17 @@
   hardware.cpu.intel.updateMicrocode = true;
 
   boot.kernelModules = [ "kvm-intel" "nvidia" ];
-
+  mods.displayManager.enable = true;
 
   hardware.nvidia = {
-	open = true;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
+    open = true;
 
-	prime.nvidiaBusId = "PCI:1:0:0";
+    prime.nvidiaBusId = "PCI:1:0:0";
-	prime.intelBusId = "PCI:0:2:0";
+    prime.intelBusId = "PCI:0:2:0";
-	prime.sync.enable = true;
+    prime.sync.enable = true;
 
-	modesetting.enable = true;
+    modesetting.enable = true;
   };
 
   services.openssh.enable = true;

osConfigs/hosts/iso.nix

@@ -1,8 +1,20 @@
-{lib, inputs, pkgs, ... }:
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    iso.nix                                            :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:57:02 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:57:03 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{lib, ... }:
 
 {
   imports = [
-    ../packages.nix 
+    ../global/packages.nix 
   ];
 
   users.users.tom = {
@@ -13,13 +25,4 @@
   
   services.getty.autologinUser = lib.mkForce "tom";
   services.getty.helpLine = lib.mkForce "";
-  programs.hyprland.enable = true;
-
-  home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
-  home-manager.users.tom = {
-    imports = [
-	  ../../homeConfigs/home.nix 
-	  ../../homeConfigs/hosts/iso.nix
-	];
-  };
 }

osConfigs/hosts/laptop.nix

@@ -1,66 +1,129 @@
-{ pkgs, ... }:
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    laptop.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:56:57 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/17 18:46:28 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, pkgs, ... }:
 
 {
-  boot.kernelParams = [ "kvm.enable_virt_at_load=0" ];
+  boot.initrd.luks.yubikeySupport = true;
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+  boot.initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ];
+  boot.initrd.luks.devices.cryptroot = {
+      device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
+      allowDiscards = true;
+    #set up initial : https://wiki.nixos.org/wiki/Yubikey_based_Full_Disk_Encryption_(FDE)_on_NixOS
+    yubikey = {
+        twoFactor = false;
+        keyLength = 64;
+        saltLength = 32;
+        storage = {
+            device = "/dev/disk/by-uuid/BA5C-F216";
+            path = "/default";
+        };
+    };
+  };
 
-  boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f";
+  boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup
 
-  services.displayManager.enable = true;
+  mods.displayManager.enable = true;
-  services.displayManager.ly.enable = true;
+  mods.virtualHost.enable = true;
+  mods.yubikey.pam.enable = true;
   networking.firewall.enable = false;
 
   networking.hostName = "patate-douce";
   networking.wireless.enable = true;
   networking.networkmanager.enable = false;
 
+  specialisation.vfio_ready.configuration = {
+    boot.kernel.sysctl."vm.nr_hugepages" = 5120;
+    boot.extraModulePackages = with config.boot.kernelPackages; [ kvmfr ];
+    boot.kernelModules = [ "kvmfr" ];
+    boot.extraModprobeConfig = ''
+        options kvmfr static_size_mb=128
+        blacklist xpad
+    '';
+    virtualisation.libvirtd.qemu.verbatimConfig = ''
+        cgroup_device_acl = [
+            "/dev/kvmfr0", "/dev/null", "/dev/full", "/dev/zero",
+            "/dev/random", "/dev/urandom",
+            "/dev/ptmx", "/dev/kvm",
+            "/dev/rtc","/dev/hpet",
+            "/dev/input/by-id/[some_mouse_device]-event-mouse",
+            "/dev/input/by-id/[some_keyboard_device]-event-kbd"
+        ]
+    '';
+    services.udev.extraRules = ''
+        SUBSYSTEM=="kvmfr", OWNER="tom", GROUP="kvm", MODE="0660"
+    '';
+    environment.systemPackages = with pkgs; [ looking-glass-client ];
+  };
+
   networking.dhcpcd.enable = false;
   systemd.network.enable = true;
   networking.useNetworkd = true;
 
-  environment.systemPackages = with pkgs; [
-    acpi
-	tlp
-	looking-glass-client
-	fprintd
-  ];
-
-  hardware.nvidia.prime.offload = {
-    enable = true;
-	enableOffloadCmd = true;
-  };
-
-  services.libinput.enable = true;
-  services.libinput.touchpad.clickMethod = "clickfinger";
-  services.libinput.touchpad.tapping = false;
-
   hardware.bluetooth.enable = true;
 
-  #power management
+  environment.systemPackages = with pkgs; [
-  powerManagement.enable = true;
+    acpi # can be user (global)
-  powerManagement.cpuFreqGovernor = "powersave";
+  ];
-  services.auto-cpufreq.enable = true;
-  services.auto-cpufreq.settings = {
-    battery = {
-      governor = "powersave";
-      turbo = "never";
-    };
-    charger = {
-      governor = "performance";
-      turbo = "auto";
-    };
-  };
-  services.upower.enable = true;
 
-  services.udev.packages = [ pkgs.yubikey-personalization ];
+
+  mods.touchpad.enable = true;
+
+  mods.powerSave.enable = true;
+  mods.powerSave.powahCommandAdditions = [
+    "supergfxctl -m Hybrid"
+    "if asusctl profile -p | grep Balanced ; then asusctl profile -P Performance; fi"
+    "if asusctl profile -p | grep Quiet ; then asusctl profile -P Balanced; fi"
+  ];
+  mods.powerSave.tagueuleCommandAdditions = [
+    "echo \"can't safely turn off the GPU\""
+	"asusctl profile -P Quiet"
+  ];
+
+  services.asusd = {
+    enable = true;
+    enableUserService = true;
+  };
+
+  services.supergfxd.enable = true;
+  services.supergfxd.settings = {
+    mode = "Integrated";
+    vfio_enable = true;
+    vfio_save = true;
+    always_reboot = false;
+    no_logind = true;
+    logout_timeout_s = 180;
+    hotplug_type = "None";
+  };
 
   programs.wireshark.enable = true;
   programs.wireshark.usbmon.enable = true;
 
+  mods.docker.enable = true;
+  mods.gayming.enable = true;
+  mods.nvidia.enable = true;
+  mods.nvidia.prime = true;
+
+
+#  services.usbmuxd.enable = true; #hangs when shutting down
+
 #  boot.plymouth = {
 #    enable = true;
-#	theme = "ycontre-glow";
+#    theme = "ycontre-glow";
-#	themePackages = [
+#    themePackages = [
-#		inputs.plymouth-theme-ycontre-glow.defaultPackage.x86_64-linux
+#        inputs.plymouth-theme-ycontre-glow.defaultPackage.x86_64-linux
-#	];
+#    ];
 #  };
+
+  services.flatpak.enable = true;
 }

osConfigs/hosts/server.nix

@@ -1,98 +1,75 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    server.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:57:09 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:26:26 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
 
-{ config, lib, inputs, pkgs, ... }:
+{ config, pkgs, ... }:
 
-{
+let
-  imports = [
+  ports = [
-  	../modules/game.nix
+    22 #git ssh
-	../modules/vboxHost.nix
+    80 443 #http server
-	../modules/nvidia.nix
+    5000 #frigate
+    8083 137 138 139 445 548 3702 5357 #prob some samba shit
+    24454 #minecraft voice chat
+    25565 # minecraft server
   ];
+  portRanges = [
+    {from = 47950; to = 49000;} #moonlight (wolf)
+  ];
+in
+{
   boot.kernelPackages = pkgs.linuxPackages;
-  boot.extraModulePackages = [ config.boot.kernelPackages.gasket ];
+  boot.extraModulePackages = [
+    config.boot.kernelPackages.gasket #driver for google coral edge tpu
+  ];
 
-  networking.hostName = "server";
   services.openssh.enable = true;
+  services.openssh.settings.PasswordAuthentication = false;
   services.openssh.ports = [ 1880 ];
 
-  services.xserver.videoDrivers = [ "nvidia" ];
-
   boot.extraModprobeConfig = ''
     options amdgpu virtual_display=1
-  '';
+  ''; #create dummy display to be able to start x11
-
-  environment.systemPackages = with pkgs; [
-  	zfs
-	nvidia-docker
-	libnvidia-container
-	screen
-  ];
-
 
   boot.supportedFilesystems = [ "zfs" ];
 
-#  services.cron.enable = false;
+  environment.systemPackages = with pkgs; [
-#  services.cron.systemCronJobs = [
+    zfs
-#    # m h dom m dow
+    screen #can be user (and global)
-#	# https://crontab.guru <3
-#  ];
-
-  networking.firewall.allowedTCPPorts = [
-    22 #git ssh
-  	80 443 #http server
-	5000 #frigate
-	8083 137 138 139 445 548 3702 5357 #prob some samba shit
-	24454 #minecraft voice chat
-	25565 # minecraft server
-  ];
-  networking.firewall.allowedUDPPorts = [
-    22 #git ssh
-  	80 443 #http server
-	5000 #frigate
-	8083 137 138 139 445 548 3702 5357 #prob some samba shit
-	24454 #minecraft voice chat
-	25565 # minecraft server
-  ];
-
-  networking.firewall.allowedUDPPortRanges = [
-	{from = 47950; to = 49000;}
-  ];
-  networking.firewall.allowedTCPPortRanges = [
-	{from = 47950; to = 49000;}
   ];
 
   networking = {
+    hostName = "server";
+
     interfaces.eth0.ipv4.addresses = [ {
       address = "192.168.1.24";
-	  prefixLength = 24;
+      prefixLength = 24;
-    } ];
+      }
-	defaultGateway.address = "192.168.1.254";
+    ];
-	defaultGateway.interface = "eth0";
+    defaultGateway.address = "192.168.1.254";
-	nameservers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"];
+    defaultGateway.interface = "eth0";
-  	hostId = "68290da7";
+    nameservers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"];
-  };
+      hostId = "68290da7";
-  virtualisation.docker = {
-    liveRestore = false;
-    enableOnBoot = true;
-	package = inputs.pkgs-docker-2750.legacyPackages."x86_64-linux".docker;
-#    daemon.settings = {
-#      runtimes.nvidia.path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime";
-#      exec-opts = ["native.cgroupdriver=cgroupfs"];
-#    };
 
+    firewall.allowedTCPPorts = ports;
+    firewall.allowedUDPPorts = ports;
+    firewall.allowedUDPPortRanges = portRanges;
+    firewall.allowedTCPPortRanges = portRanges;
   };
 
   services.fail2ban.enable = true;
-  services.fail2ban.bantime = "2h";
+  services.fail2ban.bantime = "5h";
 
-  hardware.nvidia-container-toolkit.enable = true;
+  mods.docker = {
-
+    enable = true;
-  hardware.nvidia = {
+    boot = true;
-	open = true;
-
-#	prime.nvidiaBusId = "PCI:1:0:0";
-#	prime.amdgpuBusId = "PCI:13:0:0";
-#	prime.sync.enable = true;
-
-#	modesetting.enable = true;
   };
 }

osConfigs/hosts/vbox.nix

@@ -1,4 +1,16 @@
-{ config, lib, inputs, pkgs, ... }:
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    vbox.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:56:42 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:52 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ ... }:
 
 {
   virtualisation.virtualbox.guest.enable = true;

osConfigs/modules/displayManager.nix

@@ -0,0 +1,36 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    displayManager.nix                                 :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:16 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:38 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{config, lib, ... }:
+
+{
+  options.mods.displayManager.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+    description = "enable the ly display manager";
+  };
+
+  config = lib.mkIf config.mods.displayManager.enable {
+      services.displayManager.enable = true;
+      services.displayManager.ly.enable = true;
+    services.displayManager.ly.settings = 
+    {
+      animation = "doom";
+      min_refresh_delta = 50;
+      bigclock = "en";
+      sleep_cmd = "systemctl sleep";
+      asterisk = "A";
+      auth_fails= 3;
+    };
+  };
+}
+

osConfigs/modules/docker.nix

@@ -0,0 +1,36 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    docker.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:10:58 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:06:23 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, ... }:
+
+{
+  options.mods.docker = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable docker";
+    };
+    boot = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "start docker with the system (if false, trigered by docker.socket)";
+    };
+  };
+
+  config = lib.mkIf config.mods.docker.enable {
+    virtualisation.docker = {
+      enable = true;
+      liveRestore = false;
+      enableOnBoot = config.mods.docker.boot;
+    };
+  };
+}

osConfigs/modules/game.nix

@@ -1,10 +1,22 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    game.nix                                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:09 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/05 23:54:57 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
 {config, lib, ... }:
 
 {
   options.mods.gayming.enable = lib.mkOption {
     type = lib.types.bool;
-    default = true;
+    default = false;
-    description = "enable games on the host";
+    description = "enable steam and other";
   };
 
   config = lib.mkIf config.mods.gayming.enable {

osConfigs/modules/nvidia.nix

@@ -1,19 +1,65 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    nvidia.nix                                         :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:19 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:12:34 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
 
-{ config, lib, inputs, pkgs, ... }:
+
+{ config, lib, ... }:
 
 {
-  options.mods.nvidia-graphics.enable = lib.mkOption {
+  options.mods.nvidia = {
-    type = lib.types.bool;
+    enable = lib.mkOption {
-    default = true;
+      type = lib.types.bool;
-    description = "enable my nvidia graphics settings";
+      default = false;
+      description = "enable nvidia drivers";
+    };
+    beta = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "use beta version of the drivers";
+    };
+    open = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "use beta version of the drivers";
+    };
+    containerToolkit = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable the nvidia container toolkit (gpu in docker)";
+    };
+    prime = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable nvidia prime offload (saves battery)";
+    };
   };
   
-  config = lib.mkIf config.mods.nvidia-graphics.enable {
+  config = lib.mkIf config.mods.nvidia.enable {
     hardware.graphics = {
       enable = true;
       enable32Bit = true;
     };
 
+    hardware.nvidia = {
+      package = lib.mkIf config.mods.nvidia.beta config.boot.kernelPackages.nvidiaPackages.beta;
+      open = config.mods.nvidia.open;
+
+      prime.offload = lib.mkIf config.mods.nvidia.prime {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+    };
+
+    hardware.nvidia-container-toolkit.enable = config.mods.nvidia.containerToolkit;
+
     services.xserver.videoDrivers = ["nvidia"];
   };
 

osConfigs/modules/powerSave.nix

@@ -0,0 +1,83 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    powerSave.nix                                      :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:45:04 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/21 00:51:55 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, pkgs, ... }:
+
+{
+  options.mods.powerSave = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable services and settings to save power";
+    };
+    powahCommandAdditions = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [];
+      description = "commands the `powah` script runs";
+    };
+    tagueuleCommandAdditions = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [];
+      description = "commands the `tagueule` script runs";
+    };
+  };
+
+
+  config = lib.mkIf config.mods.powerSave.enable {
+    services.tlp = {
+      enable = true;
+      settings = {
+        TLP_DEFAULT_MODE = "BAT";
+        TLP_PERSISTENT_DEFAULT = 1;
+
+		CPU_SCALING_GOVERNOR_ON_AC = "performance";
+        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+    
+        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+    
+        CPU_MIN_PERF_ON_AC = 0;
+        CPU_MAX_PERF_ON_AC = 100;
+        CPU_MIN_PERF_ON_BAT = 0;
+        CPU_MAX_PERF_ON_BAT = 20;
+      };
+    };
+
+	environment.systemPackages = [
+	  (pkgs.writeShellApplication {
+	    name = "powah";
+	    runtimeInputs = with pkgs; [ tlp ];
+	    text = ''
+	      if [[ $EUID -ne 0 ]]; then
+            exec sudo bash "$0" "$@"
+          fi
+		  tlp ac
+        '' + lib.concatStringsSep "\n" config.mods.powerSave.powahCommandAdditions;
+        })
+
+	  (pkgs.writeShellApplication {
+	    name = "tagueule";
+	    runtimeInputs = with pkgs; [ tlp ];
+	    text = ''
+	      if [[ $EUID -ne 0 ]]; then
+            exec sudo bash "$0" "$@"
+          fi
+		  tlp bat
+        '' + lib.concatStringsSep "\n" config.mods.powerSave.tagueuleCommandAdditions;
+        })
+    ];
+
+    powerManagement.enable = true;
+    services.upower.enable = true;
+    mods.nvidia.prime = true;
+  };
+}

osConfigs/modules/touchpad.nix

@@ -0,0 +1,29 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    touchpad.nix                                       :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:39:41 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:02:41 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, ... }:
+
+{
+  options.mods.touchpad = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "enable touchpad support";
+    };
+  };
+  
+  config = lib.mkIf config.mods.touchpad.enable {
+    services.libinput.enable = true;
+    services.libinput.touchpad.clickMethod = "clickfinger";
+    services.libinput.touchpad.tapping = false;
+  };
+}

osConfigs/modules/vboxHost.nix

@@ -1,14 +0,0 @@
-{ config, lib, inputs, pkgs, ... }:
-
-{
-  options.mods.virtualbox.enable = lib.mkOption {
-    type = lib.types.bool;
-	default = true;
-	description = "enable virtualbox as host";
-  };
-
-  config = lib.mkIf config.mods.virtualbox.enable {
-    virtualisation.virtualbox.host.enable = true;
-    users.users.tom.extraGroups = [ "vboxusers" ];
-  };
-}

osConfigs/modules/virtualHost.nix

@@ -0,0 +1,31 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    virtualHost.nix                                    :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:19 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:03:07 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, pkgs, ... }:
+
+{
+  options.mods.virtualHost.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+    description = "enable virtual manager as host";
+  };
+
+  config = lib.mkIf config.mods.virtualHost.enable {
+      programs.virt-manager.enable = true;
+      virtualisation.libvirtd.enable = true;
+      virtualisation.libvirtd.qemu.runAsRoot = true;
+      virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
+    virtualisation.spiceUSBRedirection.enable = true;
+
+    environment.systemPackages = with pkgs; [ spice-gtk ];
+  };
+}

osConfigs/modules/yubikey.nix

@@ -1,20 +1,32 @@
-{ config, lib, inputs, pkgs, ... }:
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    yubikey.nix                                        :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/05 23:47:20 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 01:03:54 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ config, lib, pkgs, ... }:
 
 {
-  options.mods.yubikey = {
+  options.mods.yubikey.pam = {
     enable = lib.mkOption {
       type = lib.types.bool;
-	  default = true;
+      default = false;
-	  description = "enable yubikey";
+      description = "enable yubikey pam module\nuse `ykpamcfg` to configure";
-	};
+    };
 
-	id = lib.mkOption {
+    id = lib.mkOption {
-		type = lib.str;
+        type = lib.str;
-		description = "yubikey id";
+        description = "id of the yubikey written under connector";
-	};
+    };
   };
 
-   config = lib.mkIf config.mods.yubikey.enable {
+  config = lib.mkIf config.mods.yubikey.pam.enable {
     programs.gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
@@ -22,8 +34,12 @@
 
     security.pam.yubico = {
       enable = true;
-      id =  config.mods.yubikey.id;
+      id =  config.mods.yubikey.pam.id;
       mode = "challenge-response";
     };
+
+    environment.systemPackages = with pkgs; [
+      yubico-pam
+    ];
   };
 }

osConfigs/os.nix

@@ -0,0 +1,24 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    os.nix                                             :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2025/09/06 00:56:36 by tomoron           #+#    #+#              #
+#    Updated: 2025/09/06 00:56:37 by tomoron          ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+{ lib, flakeName, ... }:
+
+{
+  imports = lib.concatLists [
+    [ ./hardware-configuration.nix ]
+    (lib.fileset.toList ./global)
+    (lib.fileset.toList ./modules)
+  ];
+
+  system.stateVersion = "25.05";
+  environment.etc.nixosFlakeName.text = "${flakeName}";
+}

osConfigs/packages.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-	home-manager
-   	vim
-	pciutils
-	pigz
-	htop
-	gnumake
-	git
-	neofetch
-	neovim
-	ntfs3g
-	clang
-	ninja
-	gdb
-	valgrind
-	wget
-	cmake
-	usbutils
-	man-pages
-	stress
-	ffmpeg
-	cryptsetup
-	acpi
-	dconf
-  ];
-}

secrets/secrets.yaml

@@ -0,0 +1,18 @@
+#ENC[AES256_GCM,data:1NcFm2XqZzmSSlr8wH4aXHDBhf+lOaZ/gUeK2T/U/hIBbqtfKtw=,iv:yS5iogRp6e3We/7wZnGy0XJzqLVfRVKlDhUs+tamcJ0=,tag:+z/qqF9n6/hQfv9aWXkCDQ==,type:comment]
+nextcloud_fuse:
+    password: ENC[AES256_GCM,data:Rlyc9wO3rXJ97AAMzM+vJclEJ+eaSPtHkitqRL0=,iv:yuS2Tyo2HZGVb9tbWmmgOEwkyzLhlvq8iZ2YjGD0u9E=,tag:pf8n4pTvseh1pd12w8w4tw==,type:str]
+sops:
+    age:
+        - recipient: age1sjzkhwr8ycdsmuj8xg8y4v2hcpuq9vethnhytxtwzeury692dsxqf80fwv
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPRXNiNG9vRzJraERMSytl
+            Qkc4SVluRWQ1bE5Dc2FpaHQ2WGkxeHF2TWdjCml3OXpockc0NFJ6dDJTVzNjLzNU
+            cWxHTzhBVno1TlVDaXplR2tuN2wzN0kKLS0tIG5pWmcxYlhlb1lCN3RqNG5hRFJS
+            clZaazZQdW5wYUhUNmM0QW91K0NLOTAKB6z7cKg54QmJo0U03u6RQkSCfJOAdeJa
+            DiyPYjm02BNe8YPFbBFRpyT7G++j3h0yG+/Nr2zcQFyMMEpMv5QJvg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2025-09-05T17:58:05Z"
+    mac: ENC[AES256_GCM,data:96G7VqaG8A46tQ1L7I2asiYtNZF7K3Wf+SzbwPrNV8zQio2jInawtD4WSzHmLs4Nv7M1TBHug/ho8mfYq6auXgpathiSzvj0Tzs/IEKXiTYa86tM3szwAepavMYWOl6OYJ7S39ku6BOMo3qC2BK/gpT5iy4c84ashn2wFd1n41A=,iv:6TShIsqnhCf/3uoAaz/R+Cwr2HrorROOXodXluTKM8M=,tag:BA9rQ73scKgetW3orV0HdQ==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.10.2