pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add build target to Makefile, reorganise some definitions

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-06-28 13:33:12 +01:00
parent 7b5fd0570c
commit 151c317845
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -1,13 +1,15 @@
.PHONY: default test lock .PHONY: default test build lock
default: default:
sudo nixos-rebuild switch --flake . sudo nixos-rebuild switch --flake .
test: test:
git -C . add .
sudo nixos-rebuild test --flake . sudo nixos-rebuild test --flake .
build:
sudo nixos-rebuild build --flake .
lock: lock:
nix flake lock --update-input nixpkgs --update-input home-manager nix flake lock --update-input nixpkgs --update-input home-manager
git -C . add flake.lock git add flake.lock
nix flake archive nix flake archive

1
flake.nix
View file

@ -74,7 +74,6 @@
./home/desktop/hyprland.nix ./home/desktop/hyprland.nix
./home/gui ./home/gui
]; ];
programs.firefox.package = pkgs.firefox-wayland;
xdg.configFile."hypr/hyprpaper.conf".text = '' xdg.configFile."hypr/hyprpaper.conf".text = ''
preload = ${wallpapers.outputs.default} preload = ${wallpapers.outputs.default}
wallpaper = ,${wallpapers.outputs.default} wallpaper = ,${wallpapers.outputs.default}

1
home/desktop/hyprland.nix
View file

@ -10,6 +10,7 @@
./dunst.nix ./dunst.nix
./rofi.nix ./rofi.nix
]; ];
programs.firefox.package = pkgs.firefox-wayland;
programs.rofi.package = pkgs.rofi-wayland; programs.rofi.package = pkgs.rofi-wayland;
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;

9
users/elitherl/Ronin.nix
View file

@ -7,14 +7,7 @@
in { in {
imports = [./default.nix]; imports = [./default.nix];
home-manager.users.elitherl = { home-manager.users.elitherl = {
home.packages = with pkgs; [ home.packages = [laptop-state];
zotero
openfortivpn
nomachine-client
teams-for-linux
zoom-us
laptop-state
];
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
source=./common.conf source=./common.conf
monitor = eDP-1,1920x1080,0x0,1.0 monitor = eDP-1,1920x1080,0x0,1.0

7
users/elitherl/default.nix
View file

@ -11,6 +11,13 @@
username = "elitherl"; username = "elitherl";
homeDirectory = "/home/elitherl"; homeDirectory = "/home/elitherl";
stateVersion = "22.11"; stateVersion = "22.11";
packages = with pkgs; [
zotero
openfortivpn
nomachine-client
teams-for-linux
zoom-us
];
}; };
}; };
} }