tom/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 38 Wiki Activity

add desktop entry to flake, disable bspwm follow mouse and add --impure flag to commands in makefile

Browse Source
This commit is contained in:
tomoron
2024-10-17 19:05:53 +02:00
parent d655ae76ad
commit 59348a96ac
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -3,6 +3,8 @@ THREADS ?= $(shell nproc)
FLAKE ?= /home/tom/home FLAKE ?= /home/tom/home
MODE = switch MODE = switch
FLAGS = --impure --cores $(THREADS) -j $(THREADS)
all: os home all: os home
update: update:
@ -10,6 +12,6 @@ update:
$(MAKE) all $(MAKE) all
os: os:
sudo nixos-rebuild $(MODE) --cores $(THREADS) -j $(THREADS) --flake $(FLAKE)#$(HOST) sudo nixos-rebuild $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST)
home : home :
home-manager $(MODE) --cores $(THREADS) -j $(THREADS) --flake $(FLAKE)#$(HOST) home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST)

1
dotfiles/config/bspwm/bspwmrc
View File

@ -25,7 +25,6 @@ bspc config window_gap 10
bspc config split_ratio 0.52 bspc config split_ratio 0.52
bspc config borderless_monocle true bspc config borderless_monocle true
bspc config focus_follows_pointer true
bspc config gapless_monocle true bspc config gapless_monocle true
pgrep -x alacritty > /dev/null || alacritty & pgrep -x alacritty > /dev/null || alacritty &

6
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729165983, "lastModified": 1729171802,
"narHash": "sha256-gtcodl79t5ZbbX4TSx4RNyggasEvLdVnc/IM+RyxqJw=", "narHash": "sha256-Eip3uI+XeyAfBoQXpkm/F7eG3M7AgvzSyhyJdzxVt74=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "78a7a070bbcc3b37cc36080c2a3514207d427b3b", "rev": "9c1a1c7df49a9b28539ccb509b36d0b81e41391c",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
flake.nix
View File

@ -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: 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 ./home.nix
./homes/laptop.nix ./homes/laptop.nix
]; ];
};
desktop = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
username = "${username}";
homeDir = "${homeDir}";
};
modules = [
./home.nix
# ./homes/desktop.nix
];
}; };
}; };
}; };