WIP: refactor homeeConfigs

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1756741629,
-        "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=",
+        "lastModified": 1758270360,
+        "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382",
+        "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1756958609,
-        "narHash": "sha256-1nRGsnPZjOubRTsXEsnJqWlLsgo/Xq7tN7PWK57dFDQ=",
+        "lastModified": 1758254611,
+        "narHash": "sha256-5oMrmEG8A5FopmDZJ5QlskhLyf2SsdipGmKpT7n1JCE=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "b2a4e1bc62946403f82594ab9550ac13a1afa4df",
+        "rev": "c451ce9fe2c5e0b46b221bb485a7b1e1ca8a3484",
         "type": "gitlab"
       },
       "original": {
@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756954499,
-        "narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
+        "lastModified": 1758288820,
+        "narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
+        "rev": "e38751933802481b37fee1f9251cbb86e63df381",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1756925795,
-        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
+        "lastModified": 1757943327,
+        "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
+        "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1756266583,
-        "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
+        "lastModified": 1758035966,
+        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
+        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1756787288,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "lastModified": 1758198701,
+        "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754988908,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "lastModified": 1758007585,
+        "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:24 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/06 00:58:57 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/24 02:10:00 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -51,9 +51,9 @@
 		];
       };
 
-	  homeConfig = {flakeName, extraModules ? [], username ? "tom", homeDir ? "/home/tom"}: home-manager.lib.homeManagerConfiguration {
+	  homeConfig = {flakeName, sops ? true, extraModules ? [], username ? "tom", homeDir ? "/home/tom"}: home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
-	    extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; };
+	    extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; configSops = sops; };
         modules = nixpkgs.lib.concatLists [
 		  [
 		    ./homeConfigs/home.nix
@@ -86,7 +86,7 @@
 
       homeConfigurations = {
 	    vbox = homeConfig { flakeName = "vbox";};
-	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron";};
+	    ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron"; sops = false;};
 	    laptop = homeConfig { flakeName = "laptop"; };
 	    desktop = homeConfig { flakeName = "desktop"; };
 	    server = homeConfig { flakeName = "server"; };

homeConfigs/global/appearance.nix

@@ -0,0 +1,33 @@
+{ lib, pkgs, ... }:
+{
+  catppuccin = {
+  	enable = true;
+	flavor = "mocha";
+
+	dunst.enable = true;
+	dunst.flavor="frappe";
+
+    kvantum.apply = true;
+    rofi.enable = false;
+  };
+
+  gtk = {
+    enable = true;
+    theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; };
+    font = { name = "Sans"; size = 11; };
+  };
+
+  qt.style.name = "kvantum";
+
+  home.pointerCursor = {
+    gtk.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 16;
+  };
+
+  home.file = {
+    ".config/wallpaper.png".source = lib.mkDefault utils/wallpaper.png;
+    ".config/lock_screen.jpg".source = lib.mkDefault utils/lock_screen.jpg;
+  };
+}

homeConfigs/global/catppuccin.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  catppuccin = {
+  	enable = true;
+	flavor = "mocha";
+
+	dunst.enable = true;
+	dunst.flavor="frappe";
+
+    kvantum.apply = true;
+    rofi.enable = false;
+  };
+}

homeConfigs/global/fileManager.nix

@@ -0,0 +1,16 @@
+{ ... }: 
+{
+  programs.yazi = {
+    enable = true;
+	settings.mgr.sort_dir_first=false;
+    programs.bash.bashExtra = ''
+      function y() {
+        local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
+        yazi "$@" --cwd-file="$tmp"
+        IFS= read -r -d "" cwd < "$tmp"
+        [ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
+        rm -f -- "$tmp"
+      }
+    '';
+  };
+}

homeConfigs/global/rclone.nix

@@ -0,0 +1,21 @@
+{ config, homeDir, ... }:
+{
+  programs.rclone.enable = true;
+  sops.secrets."nextcloud_fuse/password" = {};
+  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";
+	  };
+	};
+  };
+}

homeConfigs/global/rofi.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  programs.rofi = {
+    enable = true;
+	theme = "rounded-nord-dark";
+  };
+
+  home.file.".local/share/rofi/themes".source = "${builtins.fetchGit {
+  	url = "https://github.com/newmanls/rofi-themes-collection";
+  	rev = "c8239a45edced3502894e1716a8b661fdea8f1c9";
+  	ref = "master";
+  }}/themes";
+}

homeConfigs/global/shell.nix

@@ -0,0 +1,20 @@
+{ ... }:
+{
+  home.shell.enableBashIntegration = true;
+  home.shellAliases = {
+    ls= "ls --color=auto";
+    grep = "grep --color=auto";
+    vim = "nvim";
+    vi = "nvim";
+    hl = "Hyprland";
+    clr = "clear";
+	noidle = "systemctl --user stop hypridle";
+  };
+  
+  programs.bash = {
+	enable = true;
+    historyControl = ["ignoreboth"];
+	historyIgnore = [ "ls" "cd" "exit" ];
+	shellOptions = [ "cdspell" "autocd"];
+  };
+}

homeConfigs/home.nix

@@ -6,16 +6,24 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/17 18:15:38 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/17 18:18:51 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/24 02:08:41 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-{lib, pkgs, config, username ? "tom" ,homeDir ? "/home/tom", isOs ? false, ... }:
+{
+lib,
+username ? "tom",
+homeDir ? "/home/tom",
+isOs ? false,
+configSops ? true,
+... 
+}:
 
 {
   imports = lib.concatLists [
     [ ./packages.nix ]
     (lib.fileset.toList ./modules)
+    (lib.fileset.toList ./global)
   ];
 
   home.username = lib.mkIf (!isOs) "${username}";
@@ -23,94 +31,11 @@
 
   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";
-	  };
-	};
+  sops = lib.mkIf configSops{
+    defaultSopsFile = ../secrets/secrets.yaml;
+    age.keyFile = "${homeDir}/.config/sops/age/keys.txt";
   };
 
-#  programs.ghostty.enable = true;
-#  programs.ghostty.settings = {
-#    theme = "catppuccin-mocha";
-#	font-size = 9;
-#  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 16;
-  };
-
-  gtk = {
-    enable = true;
-    theme = { package = pkgs.flat-remix-gtk; name = "Flat-Remix-GTK-Grey-Darkest"; };
-#    iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; };
-    font = { name = "Sans"; size = 11; };
-  };
-
-  home.shellAliases = {
-    ls= "ls --color=auto";
-    grep = "grep --color=auto";
-    vim = "nvim";
-    vi = "nvim";
-    hl = "Hyprland";
-    clr = "clear";
-#    tagueule = "asusctl profile -P Quiet";
-#    parle = "asusctl profile -P performance";
-	noidle = "systemctl --user stop hypridle";
-  };
-  
-  programs.bash = {
-	enable = true;
-    historyControl = ["ignoreboth"];
-	historyIgnore = [ "ls" "cd" "exit" ];
-	shellOptions = [ "cdspell" "autocd"];
-  };
-
-  home.sessionPath = [ "~/.local/bin" ];
-
-
-  home.file = { #should be able to make most of these in nix configs 
-    ".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\"";
-
-	".local/share/rofi/themes".source = "${builtins.fetchGit {
-		url = "https://github.com/newmanls/rofi-themes-collection";
-		rev = "c8239a45edced3502894e1716a8b661fdea8f1c9";
-		ref = "master";
-    }}/themes";
-
-  };
   services.dunst.enable = true;
-
   programs.home-manager.enable = true;
-
-  qt.style.name = "kvantum";
-  catppuccin.kvantum.apply = true;
-
-  catppuccin = {
-  	enable = true;
-	flavor = "mocha";
-
-	dunst.enable = true;
-	dunst.flavor="frappe";
-  };
 }

homeConfigs/modules/wayland/hyprland.nix

@@ -15,6 +15,7 @@
       "$mainMod" = "SUPER";
       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"
+  	    " SHIFT, Print, exec, grim -t png /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,"
@@ -22,6 +23,7 @@
         "$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"
   

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

osConfigs/hosts/laptop.nix

@@ -6,7 +6,7 @@
 #    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        #
+#    Updated: 2025/09/23 04:08:25 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -79,16 +79,20 @@
 
   mods.touchpad.enable = true;
 
-  mods.powerSave.enable = true;
-  mods.powerSave.powahCommandAdditions = [
+  mods.powerSave = {
+    enable = true;
+    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 = [
+    tagueuleCommandAdditions = [
       "echo \"can't safely turn off the GPU\""
       "asusctl profile -P Quiet"
     ];
+	cpuMaxFreq = 4465261;
+
+  };
 
   services.asusd = {
     enable = true;

osConfigs/modules/powerSave.nix

@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/09/06 00:45:04 by tomoron           #+#    #+#              #
-#    Updated: 2025/09/17 18:47:27 by tomoron          ###   ########.fr        #
+#    Updated: 2025/09/23 04:25:20 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -19,6 +19,7 @@
       default = false;
       description = "enable services and settings to save power";
     };
+
     powahCommandAdditions = lib.mkOption {
       type = lib.types.listOf lib.types.str;
       default = [];
@@ -29,6 +30,41 @@
       default = [];
       description = "commands the `tagueule` script runs";
     };
+
+    pStateCompatible = lib.mkOption {
+	  type = lib.types.bool;
+	  default = false;
+	  description = "is the cpu p-state compatible. only most of intel cpu's";
+	};
+
+    cpuMaxFreq = lib.mkOption {
+	  type = lib.types.ints.positive;
+	  default = 5000000;
+	  description = "the max frequency of the cpu (in KHz)";
+	};
+
+	governorPowers = {
+      ac.min = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 30;
+	    description = "min frequency on AC";
+	  };
+      ac.max = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 100;
+	    description = "max frequency on AC";
+	  };
+      bat.min = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 0;
+	    description = "min frequency on BAT";
+	  };
+      bat.max = lib.mkOption {
+	    type = lib.types.ints.unsigned;
+	    default = 40;
+	    description = "max frequency on BAT";
+	  };
+	};
   };
 
 
@@ -44,12 +80,19 @@
     
         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;
-      };
+      }
+	  // lib.optionalAttrs (!config.mods.powerSave.pStateCompatible) (with config.mods.powerSave; {
+        CPU_SCALING_MIN_FREQ_ON_AC  = (cpuMaxFreq * governorPowers.ac.min) / 100;
+        CPU_SCALING_MAX_FREQ_ON_AC  = (cpuMaxFreq * governorPowers.ac.max) / 100;
+        CPU_SCALING_MIN_FREQ_ON_BAT = (cpuMaxFreq * governorPowers.bat.min) / 100;
+        CPU_SCALING_MAX_FREQ_ON_BAT = (cpuMaxFreq * governorPowers.bat.max) / 100;
+      }) 
+	  // lib.optionalAttrs config.mods.powerSave.pStateCompatible (with config.mods.powerSave.governorPowers; {
+	    CPU_MIN_PERF_ON_AC = ac.min;
+        CPU_MAX_PERF_ON_AC = ac.max;
+        CPU_MIN_PERF_ON_BAT = bat.min;
+        CPU_MAX_PERF_ON_BAT = bat.max;
+	  });
     };
 
 	environment.systemPackages = [
@@ -58,8 +101,7 @@
 	    runtimeInputs = with pkgs; [ tlp ];
 	    text = ''
 	      if [[ $EUID -ne 0 ]]; then
-           echo "This script must be run as root" 
-           exit 1
+            exec sudo bash "$0" "$@"
           fi
 		  tlp ac
         '' + lib.concatStringsSep "\n" config.mods.powerSave.powahCommandAdditions;
@@ -70,8 +112,7 @@
 	    runtimeInputs = with pkgs; [ tlp ];
 	    text = ''
 	      if [[ $EUID -ne 0 ]]; then
-           echo "This script must be run as root" 
-           exit 1
+            exec sudo bash "$0" "$@"
           fi
 		  tlp bat
         '' + lib.concatStringsSep "\n" config.mods.powerSave.tagueuleCommandAdditions;
@@ -79,7 +120,6 @@
     ];
 
     powerManagement.enable = true;
-    services.upower.enable = true;
     mods.nvidia.prime = true;
   };
 }