From bb4e9b94c5addccfceb1f15213a7d6efbf6cf7dc Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Wed, 8 Nov 2023 06:44:21 -0700 Subject: [PATCH 1/5] Add gtk3 for gdk and other packages --- shell/COSMIC/shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/COSMIC/shell.nix b/shell/COSMIC/shell.nix index ce61ba5..4b594be 100644 --- a/shell/COSMIC/shell.nix +++ b/shell/COSMIC/shell.nix @@ -11,6 +11,7 @@ desktop-file-utils egl-wayland glib + gtk3 gtk4 lld llvm From b92eef7b78cd5dcff2be7703c1b40c281c792b81 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Wed, 8 Nov 2023 15:02:47 +0000 Subject: [PATCH 2/5] Add bash aliases --- configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configuration.nix b/configuration.nix index e416a06..955eb3b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -68,6 +68,13 @@ neofetch ]; }; + + programs.bash = { + shellAliases = { + generations = "sudo nix-env -p /nix/var/nix/profiles/system --list-generations"; + nix-upgrade = "sudo nixos-rebuild switch --upgrade"; + }; + }; # Allow Unfree nixpkgs.config.allowUnfree = true; From 1d8fd41d266be04d99d1a09498824dc61b8126fe Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Wed, 8 Nov 2023 15:15:01 +0000 Subject: [PATCH 3/5] Update configuration.nix --- configuration.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/configuration.nix b/configuration.nix index 955eb3b..9e8c8ec 100644 --- a/configuration.nix +++ b/configuration.nix @@ -75,6 +75,26 @@ nix-upgrade = "sudo nixos-rebuild switch --upgrade"; }; }; + + programs.git = { + lfs.enable = true; + config = { + color = { + ui = "auto"; + }; + color.status = { + added = "green bold"; + changed = "yellow bold"; + untracked = "red bold"; + }; + push = { + autoSetupRemote = "true"; + }; + init = { + defaultBranch = "main"; + }; + }; + }; # Allow Unfree nixpkgs.config.allowUnfree = true; From cab13d001beeb488bed90f800c0cfccc48d70812 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 10 Nov 2023 19:42:59 +0000 Subject: [PATCH 4/5] Update vm.nix --- systems/vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/vm.nix b/systems/vm.nix index 512fc0e..9057e1c 100644 --- a/systems/vm.nix +++ b/systems/vm.nix @@ -26,7 +26,7 @@ }; }; - nix.settings.auto-optimise-store = true; + #nix.settings.auto-optimise-store = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.gc = { From c5d2a15b05634cf388e0ee186883a7f5753f6e4b Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 10 Nov 2023 19:43:23 +0000 Subject: [PATCH 5/5] Update configuration.nix --- configuration.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9e8c8ec..4a36bfb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -25,10 +25,7 @@ }; }; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - - nix.settings.extra-platforms = [ "aarch64-linux" ]; - nix.settings.auto-optimise-store = true; + #nix.settings.auto-optimise-store = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.gc = {