From 5dc6c8a77c96752ef0bb7145b7b5458e9802463a Mon Sep 17 00:00:00 2001 From: afoucaultc Date: Fri, 7 Aug 2026 09:49:17 +0200 Subject: [PATCH] quick update host --- flake.nix | 30 +++++++++------- home/afoucaultc/dotfiles_apps.nix | 6 ++++ home/afoucaultc/packages/niri.nix | 22 ++++++++++++ .../config/{ => basesystem}/bluetooth.nix | 0 .../config/{ => basesystem}/boot.nix | 0 .../config/{ => basesystem}/drivers_video.nix | 0 .../config/{ => basesystem}/language.nix | 0 hosts/nixos-home/config/basesystem/memory.nix | 8 +++++ .../system.nix} | 0 .../config/{ => basesystem}/system_saves.nix | 0 .../config/{user.nix => basesystem/users.nix} | 0 hosts/nixos-home/config/extra-services.nix | 30 ---------------- .../nixos-home/config/programs/gamescope.nix | 8 +++++ hosts/nixos-home/config/programs/steam.nix | 8 +++++ hosts/nixos-home/config/services/kde.nix | 8 +++++ hosts/nixos-home/config/services/mullvad.nix | 7 ++++ .../{ => services}/power_management.nix | 0 .../config/{ => services}/sound.nix | 0 hosts/nixos-home/config/services/zramswap.nix | 4 +++ hosts/nixos-home/config/{ => style}/fonts.nix | 0 .../nixos-home/config/{ => style}/stylix.nix | 0 hosts/nixos-home/configuration.nix | 34 ++++++++++++------- 22 files changed, 109 insertions(+), 56 deletions(-) create mode 100644 home/afoucaultc/packages/niri.nix rename hosts/nixos-home/config/{ => basesystem}/bluetooth.nix (100%) rename hosts/nixos-home/config/{ => basesystem}/boot.nix (100%) rename hosts/nixos-home/config/{ => basesystem}/drivers_video.nix (100%) rename hosts/nixos-home/config/{ => basesystem}/language.nix (100%) create mode 100644 hosts/nixos-home/config/basesystem/memory.nix rename hosts/nixos-home/config/{system_services.nix => basesystem/system.nix} (100%) rename hosts/nixos-home/config/{ => basesystem}/system_saves.nix (100%) rename hosts/nixos-home/config/{user.nix => basesystem/users.nix} (100%) delete mode 100644 hosts/nixos-home/config/extra-services.nix create mode 100644 hosts/nixos-home/config/programs/gamescope.nix create mode 100644 hosts/nixos-home/config/programs/steam.nix create mode 100644 hosts/nixos-home/config/services/kde.nix create mode 100644 hosts/nixos-home/config/services/mullvad.nix rename hosts/nixos-home/config/{ => services}/power_management.nix (100%) rename hosts/nixos-home/config/{ => services}/sound.nix (100%) create mode 100644 hosts/nixos-home/config/services/zramswap.nix rename hosts/nixos-home/config/{ => style}/fonts.nix (100%) rename hosts/nixos-home/config/{ => style}/stylix.nix (100%) diff --git a/flake.nix b/flake.nix index c176a9c..04f1954 100644 --- a/flake.nix +++ b/flake.nix @@ -50,13 +50,15 @@ stylix.nixosModules.stylix home-manager.nixosModules.home-manager { - # default config - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs; }; - # emplacement de la config - home-manager.users.afoucaultc = import ./home/afoucaultc/home.nix; - home-manager.backupFileExtension = "backup"; + home-manager = { + # default config + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs; }; + # emplacement de la config + users.afoucaultc = import ./home/afoucaultc/home.nix; + backupFileExtension = "backup"; + }; } ]; }; @@ -71,12 +73,14 @@ home-manager.nixosModules.home-manager { # default config - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs; }; - # emplacement de la config - home-manager.users.afoucaultc = import ./home/afoucaultc/home-laptop.nix; - home-manager.backupFileExtension = "backup"; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs; }; + # emplacement de la config + users.afoucaultc = import ./home/afoucaultc/home-laptop.nix; + backupFileExtension = "backup"; + }; } ]; }; diff --git a/home/afoucaultc/dotfiles_apps.nix b/home/afoucaultc/dotfiles_apps.nix index 9bd75a3..76561ff 100644 --- a/home/afoucaultc/dotfiles_apps.nix +++ b/home/afoucaultc/dotfiles_apps.nix @@ -16,3 +16,9 @@ xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-config/dotfiles/nvim"; } + +# xdg.configFile."i3blocks/config".source = ./i3blocks.conf; +# home.file.".gdbinit".text = '' +# set auto-load safe-path /nix/store +# ''; +# create symlink $XDG_CONFIG_HOME/i3blocks/config and ~/.gdbinit diff --git a/home/afoucaultc/packages/niri.nix b/home/afoucaultc/packages/niri.nix new file mode 100644 index 0000000..f3c9cc9 --- /dev/null +++ b/home/afoucaultc/packages/niri.nix @@ -0,0 +1,22 @@ +{ ... }: +{ + programs.niri = { + enable = true; + settings = { + prefer-no-csd = true; + input.keyboard.xkb = { + layout = "us"; + variant = "intl"; + }; + layout = { + gaps = 4; + focus-ring = { + enable = true; + width = 2; + active.color = "#${config.colorScheme.palette.base0D}ff"; + inactive.color = "#${config.colorScheme.palette.base03}ff"; + }; + }; + }; + }; +} diff --git a/hosts/nixos-home/config/bluetooth.nix b/hosts/nixos-home/config/basesystem/bluetooth.nix similarity index 100% rename from hosts/nixos-home/config/bluetooth.nix rename to hosts/nixos-home/config/basesystem/bluetooth.nix diff --git a/hosts/nixos-home/config/boot.nix b/hosts/nixos-home/config/basesystem/boot.nix similarity index 100% rename from hosts/nixos-home/config/boot.nix rename to hosts/nixos-home/config/basesystem/boot.nix diff --git a/hosts/nixos-home/config/drivers_video.nix b/hosts/nixos-home/config/basesystem/drivers_video.nix similarity index 100% rename from hosts/nixos-home/config/drivers_video.nix rename to hosts/nixos-home/config/basesystem/drivers_video.nix diff --git a/hosts/nixos-home/config/language.nix b/hosts/nixos-home/config/basesystem/language.nix similarity index 100% rename from hosts/nixos-home/config/language.nix rename to hosts/nixos-home/config/basesystem/language.nix diff --git a/hosts/nixos-home/config/basesystem/memory.nix b/hosts/nixos-home/config/basesystem/memory.nix new file mode 100644 index 0000000..547e9a0 --- /dev/null +++ b/hosts/nixos-home/config/basesystem/memory.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + zramSwap = { + enable = true; + algorithm = "zstd"; + memoryPercent = 50; + }; +} diff --git a/hosts/nixos-home/config/system_services.nix b/hosts/nixos-home/config/basesystem/system.nix similarity index 100% rename from hosts/nixos-home/config/system_services.nix rename to hosts/nixos-home/config/basesystem/system.nix diff --git a/hosts/nixos-home/config/system_saves.nix b/hosts/nixos-home/config/basesystem/system_saves.nix similarity index 100% rename from hosts/nixos-home/config/system_saves.nix rename to hosts/nixos-home/config/basesystem/system_saves.nix diff --git a/hosts/nixos-home/config/user.nix b/hosts/nixos-home/config/basesystem/users.nix similarity index 100% rename from hosts/nixos-home/config/user.nix rename to hosts/nixos-home/config/basesystem/users.nix diff --git a/hosts/nixos-home/config/extra-services.nix b/hosts/nixos-home/config/extra-services.nix deleted file mode 100644 index ffef875..0000000 --- a/hosts/nixos-home/config/extra-services.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, ... }: -{ - # mullvad VPN - services.mullvad-vpn.gui = { - enable = true; - package = pkgs.mullvad-vpn; - }; - # steam - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = false; - }; - programs.gamemode.enable = true; - programs.gamescope = { - enable = true; - capSysNice = true; - }; - zramSwap = { - enable = true; - algorithm = "zstd"; - memoryPercent = 50; - }; - # ajouts pour KDE/dolphin - services.gvfs.enable = true; - services.tumbler.enable = true; - environment.sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; -} diff --git a/hosts/nixos-home/config/programs/gamescope.nix b/hosts/nixos-home/config/programs/gamescope.nix new file mode 100644 index 0000000..24bc52d --- /dev/null +++ b/hosts/nixos-home/config/programs/gamescope.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + programs.gamemode.enable = true; + programs.gamescope = { + enable = true; + capSysNice = true; + }; +} diff --git a/hosts/nixos-home/config/programs/steam.nix b/hosts/nixos-home/config/programs/steam.nix new file mode 100644 index 0000000..7c3be17 --- /dev/null +++ b/hosts/nixos-home/config/programs/steam.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = false; + }; +} diff --git a/hosts/nixos-home/config/services/kde.nix b/hosts/nixos-home/config/services/kde.nix new file mode 100644 index 0000000..c87e2fb --- /dev/null +++ b/hosts/nixos-home/config/services/kde.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + services.gvfs.enable = true; + services.tumbler.enable = true; + environment.sessionVariables = { + NIXOS_OZONE_WL = "1"; + }; +} diff --git a/hosts/nixos-home/config/services/mullvad.nix b/hosts/nixos-home/config/services/mullvad.nix new file mode 100644 index 0000000..f5e9692 --- /dev/null +++ b/hosts/nixos-home/config/services/mullvad.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + services.mullvad-vpn.gui = { + enable = true; + package = pkgs.mullvad-vpn; + }; +} diff --git a/hosts/nixos-home/config/power_management.nix b/hosts/nixos-home/config/services/power_management.nix similarity index 100% rename from hosts/nixos-home/config/power_management.nix rename to hosts/nixos-home/config/services/power_management.nix diff --git a/hosts/nixos-home/config/sound.nix b/hosts/nixos-home/config/services/sound.nix similarity index 100% rename from hosts/nixos-home/config/sound.nix rename to hosts/nixos-home/config/services/sound.nix diff --git a/hosts/nixos-home/config/services/zramswap.nix b/hosts/nixos-home/config/services/zramswap.nix new file mode 100644 index 0000000..c62047c --- /dev/null +++ b/hosts/nixos-home/config/services/zramswap.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + +} diff --git a/hosts/nixos-home/config/fonts.nix b/hosts/nixos-home/config/style/fonts.nix similarity index 100% rename from hosts/nixos-home/config/fonts.nix rename to hosts/nixos-home/config/style/fonts.nix diff --git a/hosts/nixos-home/config/stylix.nix b/hosts/nixos-home/config/style/stylix.nix similarity index 100% rename from hosts/nixos-home/config/stylix.nix rename to hosts/nixos-home/config/style/stylix.nix diff --git a/hosts/nixos-home/configuration.nix b/hosts/nixos-home/configuration.nix index 20326b5..693b843 100644 --- a/hosts/nixos-home/configuration.nix +++ b/hosts/nixos-home/configuration.nix @@ -5,21 +5,29 @@ # à copier dans le dossier courant depuis /etc/nixos ./hardware-configuration.nix # ensemble de packages et configurations système - ./config/bluetooth.nix - ./config/boot.nix - ./config/drivers_video.nix - ./config/extra-services.nix - ./config/fonts.nix + ./config/basesystem/bluetooth.nix + ./config/basesystem/boot.nix + ./config/basesystem/drivers_video.nix + ./config/basesystem/language.nix + ./config/basesystem/memory.nix + ./config/basesystem/system.nix + ./config/basesystem/system_saves.nix + ./config/basesystem/users.nix + # style + ./config/style/fonts.nix + ./config/style/stylix.nix + # additional services + ./config/services/kde.nix + ./config/services/mullvad.nix + ./config/services/power_management.nix + ./config/services/sound.nix + # programs + ./config/programs/gamescope.nix + ./config/programs/steam.nix + # packages & others ./config/hyprland.nix - ./config/language.nix - ./config/power_management.nix - ./config/sound.nix - ./config/stylix.nix ./config/system_packages.nix - ./config/system_saves.nix - ./config/system_services.nix - ./config/user.nix - # profil nixos pour mon ordi portable + # profil nixos pour mon ordi portable maison # nécessite l'input nixos-hardware dans flake.nix. inputs.nixos-hardware.nixosModules.common-cpu-intel # active le microcode intel, KMS pour GPU intégré, etc... inputs.nixos-hardware.nixosModules.common-pc-laptop # active tlp