aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhongheng Liu <z.liu@outlook.com.gr>2024-08-20 16:07:20 +0800
committerZhongheng Liu <z.liu@outlook.com.gr>2024-08-20 16:07:20 +0800
commit44565c51398bf4793684303f5295fd2ecd6f14cf (patch)
tree0c57aa2657888f1fb2a59868c32ae13009fc7b74
parent37674d828e29564778a589f98f396002888317f8 (diff)
downloadnixos-configuration-44565c51398bf4793684303f5295fd2ecd6f14cf.tar.gz
nixos-configuration-44565c51398bf4793684303f5295fd2ecd6f14cf.tar.bz2
nixos-configuration-44565c51398bf4793684303f5295fd2ecd6f14cf.zip
chore: update and Alejandra formatting on devenv
-rw-r--r--devenv.nix12
-rw-r--r--home-manager/stvnliu/hypr/hyprland.nix6
-rw-r--r--home-manager/stvnliu/nixvim/treesitter.nix1
-rw-r--r--nixos/fonts.nix20
4 files changed, 21 insertions, 18 deletions
diff --git a/devenv.nix b/devenv.nix
index e6e1df4..475b359 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -37,10 +37,14 @@
'';
# https://devenv.sh/tests/
- enterTest = ''
- echo "Running tests"
- git --version | grep --color=auto "${pkgs.git.version}"
- '';
+ enterTest =
+ /*
+ shell
+ */
+ ''
+ echo "Running tests"
+ git --version | grep --color=auto "${pkgs.git.version}"
+ '';
# https://devenv.sh/pre-commit-hooks/
# pre-commit.hooks.shellcheck.enable = true;
diff --git a/home-manager/stvnliu/hypr/hyprland.nix b/home-manager/stvnliu/hypr/hyprland.nix
index 33d7b00..45884c2 100644
--- a/home-manager/stvnliu/hypr/hyprland.nix
+++ b/home-manager/stvnliu/hypr/hyprland.nix
@@ -25,8 +25,7 @@
config.myAutostartCommands
++ [
''
- [workspace special silent] ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Fon
- t:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}''
+ [workspace special silent] ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}''
];
misc = {
disable_hyprland_logo = true;
@@ -46,8 +45,7 @@
"$mod, F, exec, ${pkgs.firefox}/bin/firefox"
# foot terminal
''
- $mod, Return, exec, ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=
- 12' -o colors.alpha=0.85 ${config.myShells.defaultShell}''
+ $mod, Return, exec, ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}''
]
++ (
# workspaces
diff --git a/home-manager/stvnliu/nixvim/treesitter.nix b/home-manager/stvnliu/nixvim/treesitter.nix
index da621c1..b611273 100644
--- a/home-manager/stvnliu/nixvim/treesitter.nix
+++ b/home-manager/stvnliu/nixvim/treesitter.nix
@@ -3,6 +3,7 @@
treesitter = {
enable = true;
nixGrammars = true;
+ nixvimInjections = true; # enables language injection in nixvim
indent = true;
};
treesitter-context.enable = true;
diff --git a/nixos/fonts.nix b/nixos/fonts.nix
index 621678c..64d065b 100644
--- a/nixos/fonts.nix
+++ b/nixos/fonts.nix
@@ -1,27 +1,27 @@
{pkgs, ...}: {
fonts.packages = with pkgs; [
- #helvetica-neue-lt-std
+ helvetica-neue-lt-std
aileron
corefonts
- #vistafonts
- #vistafonts-chs
+ vistafonts
+ vistafonts-chs
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
liberation_ttf
- #mplus-outline-fonts.githubRelease
- #dina-font
+ mplus-outline-fonts.githubRelease
+ dina-font
#proggyfonts
#glasstty-ttf
(
nerdfonts.override {
fonts = [
- #"FiraCode"
+ "FiraCode"
"IBMPlexMono"
- #"IntelOneMono"
- #"CascadiaMono"
- #"CommitMono"
- #"JetBrainsMono"
+ "IntelOneMono"
+ "CascadiaMono"
+ "CommitMono"
+ "JetBrainsMono"
];
}
)