Skip to content

Commit 35b0e0d

Browse files
committed
enable bash integration
1 parent 75fbf98 commit 35b0e0d

File tree

4 files changed

+40
-23
lines changed

4 files changed

+40
-23
lines changed

home-manager/shell.nix

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
{ pkgs, meta, ... }:
1+
{
2+
pkgs,
3+
meta,
4+
config,
5+
...
6+
}:
27

38
let
49
shellAliases = {
@@ -44,6 +49,20 @@ in
4449
# '';
4550
};
4651

52+
programs.bash = {
53+
enable = true;
54+
};
55+
56+
programs.eza = {
57+
enable = true;
58+
59+
git = config.programs.git.enable;
60+
icons = "auto";
61+
62+
enableBashIntegration = config.programs.bash.enable;
63+
enableZshIntegration = config.programs.zsh.enable;
64+
};
65+
4766
# oh-my-posh
4867
programs.oh-my-posh =
4968
let
@@ -52,19 +71,14 @@ in
5271
{
5372
enable = true;
5473

55-
enableZshIntegration = true;
74+
enableBashIntegration = config.programs.bash.enable;
75+
enableZshIntegration = config.programs.zsh.enable;
76+
5677
enableNushellIntegration = true;
5778

5879
settings = settings;
5980
};
6081

61-
programs.zellij = {
62-
enable = true;
63-
settings = {
64-
pane_frames = false;
65-
};
66-
};
67-
6882
programs.git = {
6983
enable = true;
7084
lfs.enable = true;

hosts/fonts.nix

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
1-
{ pkgs, ... }:
1+
{ pkgs, lib, ... }:
22

33
{
44
fonts = {
5-
enableDefaultPackages = true;
5+
enableDefaultPackages = lib.mkForce true;
6+
fontDir.enable = true;
7+
68
packages = with pkgs; [
79
nerd-fonts.jetbrains-mono
810
nerd-fonts.space-mono
911
helvetica-neue-lt-std
1012
];
11-
12-
fontconfig = {
13-
defaultFonts = {
14-
monospace = [ "Jetbrains Mono" ];
15-
sansSerif = [ "Jetbrains Mono" ];
16-
serif = [ "Jetbrains Mono" ];
17-
};
18-
};
1913
};
2014
}

hosts/img/configuration.nix

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
modulesPath,
33
system,
4+
lib,
45
...
56
}:
67

@@ -26,4 +27,12 @@ in
2627
"console=ttyS0,115200"
2728
"console=tty1"
2829
];
30+
31+
boot.blacklistedKernelModules = [ "nouveau" ];
32+
33+
networking.networkmanager.enable = lib.mkForce false;
34+
hardware.nvidia = lib.mkForce {
35+
modesetting.enable = false;
36+
nvidiaSettings = false;
37+
};
2938
}

modules/services/cloudflare_dns.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
# networking.networkmanager = {
3-
# enable = true;
2+
networking.networkmanager = {
3+
enable = true;
44

5-
# dns = "none";
6-
# };
5+
dns = "none";
6+
};
77

88
networking.nameservers = [
99
"1.1.1.1"

0 commit comments

Comments
 (0)