Merge branch 'waybar-here-i-come' of github.com:anotherhadi/nixy into waybar-here-i-come

This commit is contained in:
Hadi
2026-07-30 16:55:57 +02:00
82 changed files with 1020 additions and 362 deletions
+1 -1
View File
@@ -13,7 +13,7 @@
../../nixos/utils.nix
../../nixos/hyprland.nix
../../nixos/usbguard.nix
../../home/programs/helium/system.nix # I hate browser's configuration..
../../home/programs/gui/helium/system.nix # I hate browser's configuration..
../../nixos/omen.nix # CHANGEME: For my laptop only, remove this (OMEN 16)
+30 -17
View File
@@ -1,25 +1,35 @@
{config, ...}: {
{
config,
inputs,
...
}: {
imports = [
# Programs
../../home/programs/helium
../../home/programs/proton
../../home/programs/proton/auto-start-vpn.nix
../../home/programs/ghostty
../../home/programs/nvf
../../home/programs/shell
../../home/programs/git
../../home/programs/git/lazygit.nix
../../home/programs/git/signing.nix # CHANGEME: Change the key or remove this file
../../home/programs/thunar
../../home/programs/nixy
../../home/programs/nix-utils
../../home/programs/spotatui
../../home/programs/yazi
../../home/programs/group/basic-apps.nix
## GUI
../../home/programs/gui/proton
../../home/programs/gui/proton/auto-start-vpn.nix
../../home/programs/gui/helium
../../home/programs/gui/thunar
../../home/programs/gui/pkgs.nix
## TUI
inputs.nvf-config.homeManagerModules.default
../../home/programs/tui/ghostty
../../home/programs/tui/ilovetui
../../home/programs/tui/shell
../../home/programs/tui/git
../../home/programs/tui/git/lazygit.nix
../../home/programs/tui/git/signing.nix # CHANGEME: Change the key or remove this file
../../home/programs/tui/nixy
../../home/programs/tui/nix-utils
../../home/programs/tui/spotatui
../../home/programs/tui/yazi
../../home/programs/tui/pkgs.nix
## GROUPS
../../home/programs/group/cybersecurity.nix
../../home/programs/group/dev.nix
../../home/programs/group/misc.nix
# System (Desktop environment like stuff)
../../home/system/hyprlock
@@ -28,7 +38,10 @@
../../home/system/swaync
../../home/system/tofi
../../home/system/mime
../../home/system/termfilechooser
../../home/system/udiskie
../../home/system/clipboard
../../home/system/hypridle
./variables.nix # Mostly user-specific configuration
./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
-1
View File
@@ -52,7 +52,6 @@ in {
- *work
'';
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
home.packages = with pkgs; [
sops
age
+2
View File
@@ -26,6 +26,8 @@
autoUpgrade = false;
autoGarbageCollector = true;
hasBattery = true;
};
# DON'T TOUCH THIS
+1 -1
View File
@@ -38,7 +38,7 @@
options = [
"subvol=/"
"compress=zstd"
]; # adapte selon si t'as des subvolumes
]; # adjust depending on whether you use subvolumes
};
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+6 -2
View File
@@ -1,10 +1,14 @@
{config, ...}: {
{
config,
inputs,
...
}: {
imports = [
# Mostly user-specific configuration
./variables.nix
# Programs
../../home/programs/nvf
inputs.nvf-config.homeManagerModules.default
../../home/programs/shell
../../home/programs/git
../../home/programs/git/lazygit.nix
+4 -3
View File
@@ -11,7 +11,8 @@
../../nixos/users.nix
../../nixos/utils.nix
../../nixos/hyprland.nix
../../home/programs/helium/system.nix # I hate browser's configuration..
../../nixos/docker.nix
../../home/programs/gui/helium/system.nix # I hate browser's configuration..
# You should let those lines as is
./hardware-configuration.nix
@@ -28,13 +29,13 @@
services.usbguard.rules = ''
allow id 1d6b:0002 serial "0000:00:14.0" name "xHCI Host Controller" hash "jEP/6WzviqdJ5VSeTUY8PatCNBKeaREvo2OqdplND/o=" parent-hash "rV9bfLq7c2eA4tYjVjwO4bxhm+y6GgZpl9J60L0fBkY=" with-interface 09:00:00 with-connect-type ""
allow id 1d6b:0003 serial "0000:00:14.0" name "xHCI Host Controller" hash "prM+Jby/bFHCn2lNjQdAMbgc6tse3xVx+hZwjOPHSdQ=" parent-hash "rV9bfLq7c2eA4tYjVjwO4bxhm+y6GgZpl9J60L0fBkY=" with-interface 09:00:00 with-connect-type ""
allow id 17ef:608d serial "" name "Lenovo USB Optical Mouse" hash "klpDZuv1jhWGNqZLOl+KXF+75Ir3PfBm6D6ncjoLRBU=" parent-hash "jEP/6WzviqdJ5VSeTUY8PatCNBKeaREvo2OqdplND/o=" via-port "1-7" with-interface 03:01:02 with-connect-type "hotplug"
allow id 17ef:6190 serial "" name "Lenovo Calliope USB Keyboard G2" hash "CfZ9R/aoXGm7BN/ojVEzKQwVoxCUtRWMuACrE7BL/5Y=" parent-hash "jEP/6WzviqdJ5VSeTUY8PatCNBKeaREvo2OqdplND/o=" via-port "1-10" with-interface { 03:01:01 03:00:00 } with-connect-type "hotplug"
allow id 0781:5581 name " SanDisk 3.2Gen1"
allow id 17ef:608d name "Lenovo USB Optical Mouse"
'';
networking.firewall.allowedTCPPorts = [9001];
# Don't touch this
system.stateVersion = "24.05";
system.stateVersion = "26.05";
}
+28 -16
View File
@@ -1,23 +1,32 @@
{config, ...}: {
{
config,
inputs,
...
}: {
imports = [
# Programs
../../home/programs/proton
../../home/programs/helium
../../home/programs/ghostty
../../home/programs/nvf
../../home/programs/shell
../../home/programs/git
../../home/programs/git/lazygit.nix
../../home/programs/thunar
../../home/programs/nixy
../../home/programs/nix-utils
../../home/programs/spotatui
../../home/programs/yazi
../../home/programs/group/basic-apps.nix
## GUI
../../home/programs/gui/proton
../../home/programs/gui/helium
../../home/programs/gui/thunar
../../home/programs/gui/pkgs.nix
## TUI
inputs.nvf-config.homeManagerModules.default
../../home/programs/tui/ghostty
../../home/programs/tui/shell
../../home/programs/tui/git
../../home/programs/tui/git/lazygit.nix
../../home/programs/tui/nixy
../../home/programs/tui/nix-utils
../../home/programs/tui/spotatui
../../home/programs/tui/yazi
../../home/programs/tui/pkgs.nix
## GROUPS
../../home/programs/group/cybersecurity.nix
../../home/programs/group/dev.nix
../../home/programs/group/misc.nix
# System (Desktop environment like stuff)
../../home/system/hyprlock
@@ -26,7 +35,10 @@
../../home/system/swaync
../../home/system/tofi
../../home/system/mime
../../home/system/termfilechooser
../../home/system/udiskie
../../home/system/clipboard
../../home/system/hypridle
./variables.nix # Mostly user-specific configuration
./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
@@ -37,7 +49,7 @@
homeDirectory = "/home/" + config.var.username;
# Don't touch this
stateVersion = "24.05";
stateVersion = "26.05";
};
wayland.windowManager.hyprland.settings.monitor = [
-1
View File
@@ -49,7 +49,6 @@ in {
- *work
'';
systemd.user.services.mbsync.Unit.After = ["sops-nix.service"];
home.packages = with pkgs; [
sops
age
+2
View File
@@ -26,6 +26,8 @@
autoUpgrade = false;
autoGarbageCollector = true;
hasBattery = false;
};
# DON'T TOUCH THIS