From 4598aa9915b7229290257d58eb6a98322b870fed Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 23 Nov 2022 09:32:58 -0600 Subject: [PATCH] updates --- .gitignore | 1 + Makefile | 10 ++++++++-- modules/configuration.nix | 10 ++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fcfc4a1..4e333a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ result* +.task.mk diff --git a/Makefile b/Makefile index 27eb746..aa78481 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,13 @@ +## switch | perform nixos rebuild switch: sudo nixos-rebuild switch --flake . --impure - + +## lint | format *.nix lint: nixpkgs-fmt . -.PHONY: lint +.PHONY: lint switch + +USAGE := {a.style('==>','bold')} {a.style('flakes ftw','header')} {a.style('<==','bold')}\n +-include .task.mk +$(if $(filter help,$(MAKECMDGOALS)),$(if $(wildcard .task.mk),,.task.mk: ; curl -fsSL https://raw.githubusercontent.com/daylinmorgan/task.mk/v22.9.28/task.mk -o .task.mk)) diff --git a/modules/configuration.nix b/modules/configuration.nix index 90d964a..84044aa 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -6,8 +6,9 @@ ]; - nix.package = pkgs.nixUnstable; nixpkgs.config.allowUnfree = true; + + nix.package = pkgs.nixUnstable; nix.extraOptions = '' experimental-features = nix-command flakes ''; @@ -37,8 +38,6 @@ shell = pkgs.zsh; isNormalUser = true; extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ - ]; }; }; @@ -84,11 +83,6 @@ gnome.gnome-settings-daemon catppuccin-gtk - - # (python3.withPackages (p: with p; - # [ pynvim ])) - - # firefox wavebox pciutils