diff --git a/Makefile b/Makefile index bc654ed..c916c9c 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ THREADS ?= $(shell nproc) FLAKE ?= /home/tom/home MODE = switch +FLAGS = --impure --cores $(THREADS) -j $(THREADS) + all: os home update: @@ -10,6 +12,6 @@ update: $(MAKE) all os: - sudo nixos-rebuild $(MODE) --cores $(THREADS) -j $(THREADS) --flake $(FLAKE)#$(HOST) + sudo nixos-rebuild $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST) home : - home-manager $(MODE) --cores $(THREADS) -j $(THREADS) --flake $(FLAKE)#$(HOST) + home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST) diff --git a/dotfiles/config/bspwm/bspwmrc b/dotfiles/config/bspwm/bspwmrc index beffd73..4cfd2fd 100755 --- a/dotfiles/config/bspwm/bspwmrc +++ b/dotfiles/config/bspwm/bspwmrc @@ -25,7 +25,6 @@ bspc config window_gap 10 bspc config split_ratio 0.52 bspc config borderless_monocle true -bspc config focus_follows_pointer true bspc config gapless_monocle true pgrep -x alacritty > /dev/null || alacritty & diff --git a/flake.lock b/flake.lock index d147eee..694c7b8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1729165983, - "narHash": "sha256-gtcodl79t5ZbbX4TSx4RNyggasEvLdVnc/IM+RyxqJw=", + "lastModified": 1729171802, + "narHash": "sha256-Eip3uI+XeyAfBoQXpkm/F7eG3M7AgvzSyhyJdzxVt74=", "owner": "nix-community", "repo": "home-manager", - "rev": "78a7a070bbcc3b37cc36080c2a3514207d427b3b", + "rev": "9c1a1c7df49a9b28539ccb509b36d0b81e41391c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 39dcf58..bf29096 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/17 18:15:24 by tomoron #+# #+# # -# Updated: 2024/10/17 18:45:14 by tomoron ### ########.fr # +# Updated: 2024/10/17 19:03:37 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -102,6 +102,17 @@ ./home.nix ./homes/laptop.nix ]; + }; + desktop = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + extraSpecialArgs = { + username = "${username}"; + homeDir = "${homeDir}"; + }; + modules = [ + ./home.nix +# ./homes/desktop.nix + ]; }; }; };