From 3527a25625fd7b5fcbb75f4c8a24ed13e9aed026 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 10 Oct 2023 21:40:51 +0200 Subject: [PATCH 1/7] Desktop: add commment and fix formatting in configuration.nix --- roles/desktop/configuration.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix index dbff60d..1e59015 100644 --- a/roles/desktop/configuration.nix +++ b/roles/desktop/configuration.nix @@ -1,9 +1,10 @@ { config, pkgs, ... }: { + # Enable scanning hardware.sane = { - enable = true; - extraBackends = [ pkgs.sane-airscan ]; + enable = true; + extraBackends = [ pkgs.sane-airscan ]; }; users.users.toast.extraGroups = [ "scanner" ]; } From 330b2033960320406e7758dd486a524b33076952 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 10 Oct 2023 22:53:10 +0200 Subject: [PATCH 2/7] Desktop: set up fonts --- roles/desktop/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix index 1e59015..b44d58b 100644 --- a/roles/desktop/configuration.nix +++ b/roles/desktop/configuration.nix @@ -7,4 +7,10 @@ extraBackends = [ pkgs.sane-airscan ]; }; users.users.toast.extraGroups = [ "scanner" ]; + + # Set up fonts + fonts.fonts = [ + ( pkgs.nerdfonts.override { fonts = [ "Hack" "JetBrainsMono" ]; } ) + ]; + } From 5e8f1f823214c1cd341dc05547bf29ffcdf3a5ec Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 10 Oct 2023 23:11:01 +0200 Subject: [PATCH 3/7] Common: enable starship --- roles/common/programs/default.nix | 1 + roles/common/programs/starship.nix | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 roles/common/programs/starship.nix diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix index 4d89ef0..53af6f3 100755 --- a/roles/common/programs/default.nix +++ b/roles/common/programs/default.nix @@ -10,6 +10,7 @@ ./comma.nix ./bash.nix ./git.nix + ./starship.nix ]; # Some programs dont have a programs.*.enable option, so I install their package here environment.systemPackages = with pkgs; [ diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix new file mode 100644 index 0000000..81340bf --- /dev/null +++ b/roles/common/programs/starship.nix @@ -0,0 +1,7 @@ +{ config, ... }: + +{ + programs.starship = { + enable = true; + }; +} From 5ec3c1c0689f847e72988a5cc0a95fb0f2408ff6 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 11 Oct 2023 00:49:37 +0200 Subject: [PATCH 4/7] Starship: enable and configure nix_shell module --- roles/common/programs/starship.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix index 81340bf..7b33a20 100644 --- a/roles/common/programs/starship.nix +++ b/roles/common/programs/starship.nix @@ -3,5 +3,12 @@ { programs.starship = { enable = true; + settings = { + nix_shell = { + disabled = false; + heuristic = true; + symbol = ""; + }; + }; }; } From c5642afeb0b13625a3cf0c0350b4121eabb9c2d7 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 11 Oct 2023 01:03:39 +0200 Subject: [PATCH 5/7] Starship: add space after nix symbol --- roles/common/programs/starship.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix index 7b33a20..c99d5c8 100644 --- a/roles/common/programs/starship.nix +++ b/roles/common/programs/starship.nix @@ -7,7 +7,7 @@ nix_shell = { disabled = false; heuristic = true; - symbol = ""; + symbol = " "; }; }; }; From 46433b513db78fd90d4685ddd100d2154ce25e79 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 11 Oct 2023 01:06:04 +0200 Subject: [PATCH 6/7] Starship: enable and configure os module --- roles/common/programs/starship.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix index c99d5c8..897f159 100644 --- a/roles/common/programs/starship.nix +++ b/roles/common/programs/starship.nix @@ -9,6 +9,10 @@ heuristic = true; symbol = " "; }; + os = { + disabled = false; + symbols.NixOS = " "; + }; }; }; } From 4aeb6d4d537b7e73cf03cfbdbd12fea620e2ba5e Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 11 Oct 2023 01:15:35 +0200 Subject: [PATCH 7/7] Starship: enable and configure directory module --- roles/common/programs/starship.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/common/programs/starship.nix b/roles/common/programs/starship.nix index 897f159..9c9cd3b 100644 --- a/roles/common/programs/starship.nix +++ b/roles/common/programs/starship.nix @@ -13,6 +13,10 @@ disabled = false; symbols.NixOS = " "; }; + directory = { + disabled = false; + read_only = " 󰌾"; + }; }; }; }