Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
9a95e511e4 | |||
5e54902447 | |||
074dff48ca |
42
flake.lock
generated
42
flake.lock
generated
@ -5,11 +5,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756741629,
|
"lastModified": 1758270360,
|
||||||
"narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=",
|
"narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382",
|
"rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -26,11 +26,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1756958609,
|
"lastModified": 1758254611,
|
||||||
"narHash": "sha256-1nRGsnPZjOubRTsXEsnJqWlLsgo/Xq7tN7PWK57dFDQ=",
|
"narHash": "sha256-5oMrmEG8A5FopmDZJ5QlskhLyf2SsdipGmKpT7n1JCE=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "b2a4e1bc62946403f82594ab9550ac13a1afa4df",
|
"rev": "c451ce9fe2c5e0b46b221bb485a7b1e1ca8a3484",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -47,11 +47,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756954499,
|
"lastModified": 1758288820,
|
||||||
"narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=",
|
"narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25",
|
"rev": "e38751933802481b37fee1f9251cbb86e63df381",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -62,11 +62,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756925795,
|
"lastModified": 1757943327,
|
||||||
"narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
|
"narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "ba6fab29768007e9f2657014a6e134637100c57d",
|
"rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -78,11 +78,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756266583,
|
"lastModified": 1758035966,
|
||||||
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
|
"narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
|
"rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -94,11 +94,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756787288,
|
"lastModified": 1758198701,
|
||||||
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
|
"narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
|
"rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -125,11 +125,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754988908,
|
"lastModified": 1758007585,
|
||||||
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
|
"narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
|
"rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
10
flake.nix
10
flake.nix
@ -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/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;
|
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 [
|
modules = nixpkgs.lib.concatLists [
|
||||||
[
|
[
|
||||||
./homeConfigs/home.nix
|
./homeConfigs/home.nix
|
||||||
@ -85,8 +85,8 @@
|
|||||||
|
|
||||||
|
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
vbox = homeConfig { flakeName = "vbox"; };
|
vbox = homeConfig { flakeName = "vbox";};
|
||||||
ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron";};
|
ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron"; sops = false;};
|
||||||
laptop = homeConfig { flakeName = "laptop"; };
|
laptop = homeConfig { flakeName = "laptop"; };
|
||||||
desktop = homeConfig { flakeName = "desktop"; };
|
desktop = homeConfig { flakeName = "desktop"; };
|
||||||
server = homeConfig { flakeName = "server"; };
|
server = homeConfig { flakeName = "server"; };
|
||||||
|
@ -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
|
|
@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
unison /home/tom/Desktop ssh://tom@tmoron.fr:1880//home/tom/Desktop_sync/Desktop $@
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
|||||||
xtrlock&
|
|
||||||
systemctl hibernate
|
|
@ -1,6 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
if [ "$1" = "up" ]; then
|
|
||||||
asusctl -n
|
|
||||||
elif [ "$1" = "down" ];then
|
|
||||||
asusctl -p
|
|
||||||
fi
|
|
@ -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
|
|
33
homeConfigs/global/appearance.nix
Normal file
33
homeConfigs/global/appearance.nix
Normal file
@ -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;
|
||||||
|
};
|
||||||
|
}
|
13
homeConfigs/global/catppuccin.nix
Normal file
13
homeConfigs/global/catppuccin.nix
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
catppuccin = {
|
||||||
|
enable = true;
|
||||||
|
flavor = "mocha";
|
||||||
|
|
||||||
|
dunst.enable = true;
|
||||||
|
dunst.flavor="frappe";
|
||||||
|
|
||||||
|
kvantum.apply = true;
|
||||||
|
rofi.enable = false;
|
||||||
|
};
|
||||||
|
}
|
16
homeConfigs/global/fileManager.nix
Normal file
16
homeConfigs/global/fileManager.nix
Normal file
@ -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"
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
21
homeConfigs/global/rclone.nix
Normal file
21
homeConfigs/global/rclone.nix
Normal file
@ -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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
13
homeConfigs/global/rofi.nix
Normal file
13
homeConfigs/global/rofi.nix
Normal file
@ -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";
|
||||||
|
}
|
20
homeConfigs/global/shell.nix
Normal file
20
homeConfigs/global/shell.nix
Normal file
@ -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"];
|
||||||
|
};
|
||||||
|
}
|
@ -6,16 +6,24 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2024/10/17 18:15:38 by tomoron #+# #+# #
|
# Created: 2024/10/17 18:15:38 by tomoron #+# #+# #
|
||||||
# Updated: 2025/09/05 19:55:21 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 [
|
imports = lib.concatLists [
|
||||||
[ ./packages.nix ]
|
[ ./packages.nix ]
|
||||||
(lib.fileset.toList ./modules)
|
(lib.fileset.toList ./modules)
|
||||||
|
(lib.fileset.toList ./global)
|
||||||
];
|
];
|
||||||
|
|
||||||
home.username = lib.mkIf (!isOs) "${username}";
|
home.username = lib.mkIf (!isOs) "${username}";
|
||||||
@ -23,95 +31,11 @@
|
|||||||
|
|
||||||
home.stateVersion = "24.05";
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
sops.defaultSopsFile = ../secrets/secrets.yaml;
|
sops = lib.mkIf configSops{
|
||||||
sops.age.keyFile = "${homeDir}/.config/sops/age/keys.txt";
|
defaultSopsFile = ../secrets/secrets.yaml;
|
||||||
sops.secrets."nextcloud_fuse/password" = {};
|
age.keyFile = "${homeDir}/.config/sops/age/keys.txt";
|
||||||
|
|
||||||
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";
|
|
||||||
# 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";
|
|
||||||
|
|
||||||
# ".local/bin/desk_sync".source = dotfiles/local/bin/desk_sync;
|
|
||||||
};
|
|
||||||
services.dunst.enable = true;
|
services.dunst.enable = true;
|
||||||
|
|
||||||
programs.home-manager.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";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -41,5 +41,77 @@
|
|||||||
localsend
|
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" ""];
|
||||||
|
#
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -8,12 +8,14 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.mods.hyprland.enable {
|
config = lib.mkIf config.mods.hyprland.enable {
|
||||||
|
wayland.windowManager.hyprland.systemd.variables = [ "--all" ];
|
||||||
|
|
||||||
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, 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"
|
"$mainMod, Return, exec, alacritty"
|
||||||
"CTRL_ALT, Q, killactive,"
|
"CTRL_ALT, Q, killactive,"
|
||||||
"CTRL_ALT_SHIFT, Q, forcekillactive,"
|
"CTRL_ALT_SHIFT, Q, forcekillactive,"
|
||||||
@ -21,6 +23,7 @@
|
|||||||
"$mainMod, S, togglefloating,"
|
"$mainMod, S, togglefloating,"
|
||||||
"$mainMod, I, pin,"
|
"$mainMod, I, pin,"
|
||||||
"$mainMod, D, exec, rofi -show drun -show-icons"
|
"$mainMod, D, exec, rofi -show drun -show-icons"
|
||||||
|
"$mainMod SHIFT, D, exec, rofi -show run -show-icons"
|
||||||
"$mainMod, M, fullscreen, 1"
|
"$mainMod, M, fullscreen, 1"
|
||||||
"$mainMod, F, fullscreen, 0"
|
"$mainMod, F, fullscreen, 0"
|
||||||
|
|
||||||
@ -144,12 +147,12 @@
|
|||||||
color = "rgba(1a1a1aee)";
|
color = "rgba(1a1a1aee)";
|
||||||
};
|
};
|
||||||
|
|
||||||
blur = {
|
#blur = {
|
||||||
enabled = true;
|
# enabled = true;
|
||||||
size = 3;
|
# size = 3;
|
||||||
passes = 1;
|
# passes = 1;
|
||||||
vibrancy = 0.1696;
|
# vibrancy = 0.1696;
|
||||||
};
|
#};
|
||||||
};
|
};
|
||||||
|
|
||||||
general = {
|
general = {
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
{
|
{
|
||||||
config = lib.mkIf config.mods.hyprland.enable {
|
config = lib.mkIf config.mods.hyprland.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
rofi-wayland
|
|
||||||
grim
|
grim
|
||||||
slurp
|
slurp
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 145 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.1 MiB After Width: | Height: | Size: 797 KiB |
Binary file not shown.
Before Width: | Height: | Size: 797 KiB |
@ -6,7 +6,7 @@
|
|||||||
# 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/09/06 01:11:42 by tomoron ### ########.fr #
|
# Updated: 2025/09/23 04:08:25 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
@ -34,7 +34,7 @@
|
|||||||
boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup
|
boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup
|
||||||
|
|
||||||
mods.displayManager.enable = true;
|
mods.displayManager.enable = true;
|
||||||
mods.virtualHost.enable = false;
|
mods.virtualHost.enable = true;
|
||||||
mods.yubikey.pam.enable = true;
|
mods.yubikey.pam.enable = true;
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
@ -79,7 +79,20 @@
|
|||||||
|
|
||||||
mods.touchpad.enable = true;
|
mods.touchpad.enable = true;
|
||||||
|
|
||||||
mods.powerSave.enable = true;
|
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"
|
||||||
|
];
|
||||||
|
tagueuleCommandAdditions = [
|
||||||
|
"echo \"can't safely turn off the GPU\""
|
||||||
|
"asusctl profile -P Quiet"
|
||||||
|
];
|
||||||
|
cpuMaxFreq = 4465261;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
services.asusd = {
|
services.asusd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -105,6 +118,7 @@
|
|||||||
mods.nvidia.enable = true;
|
mods.nvidia.enable = true;
|
||||||
mods.nvidia.prime = true;
|
mods.nvidia.prime = true;
|
||||||
|
|
||||||
|
|
||||||
# services.usbmuxd.enable = true; #hangs when shutting down
|
# services.usbmuxd.enable = true; #hangs when shutting down
|
||||||
|
|
||||||
# boot.plymouth = {
|
# boot.plymouth = {
|
||||||
@ -114,4 +128,6 @@
|
|||||||
# inputs.plymouth-theme-ycontre-glow.defaultPackage.x86_64-linux
|
# inputs.plymouth-theme-ycontre-glow.defaultPackage.x86_64-linux
|
||||||
# ];
|
# ];
|
||||||
# };
|
# };
|
||||||
|
|
||||||
|
services.flatpak.enable = true;
|
||||||
}
|
}
|
||||||
|
@ -6,11 +6,11 @@
|
|||||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2025/09/06 00:45:04 by tomoron #+# #+# #
|
# Created: 2025/09/06 00:45:04 by tomoron #+# #+# #
|
||||||
# Updated: 2025/09/06 01:02:29 by tomoron ### ########.fr #
|
# Updated: 2025/09/23 04:25:20 by tomoron ### ########.fr #
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
{ config, lib, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options.mods.powerSave = {
|
options.mods.powerSave = {
|
||||||
@ -19,13 +19,107 @@
|
|||||||
default = false;
|
default = false;
|
||||||
description = "enable services and settings to save power";
|
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";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
config = lib.mkIf config.mods.powerSave.enable {
|
config = lib.mkIf config.mods.powerSave.enable {
|
||||||
services.tlp.enable = true;
|
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";
|
||||||
|
}
|
||||||
|
// 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 = [
|
||||||
|
(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;
|
powerManagement.enable = true;
|
||||||
powerManagement.cpuFreqGovernor = "powersave";
|
|
||||||
services.upower.enable = true;
|
|
||||||
mods.nvidia.prime = true;
|
mods.nvidia.prime = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user