summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/modules/terminal/alacritty.nix9
-rw-r--r--common/modules/terminal/ghostty.nix1
-rw-r--r--common/programs/bash.nix7
-rw-r--r--common/programs/fish.nix2
-rw-r--r--common/templates/go/flake.nix2
-rw-r--r--flake.lock38
-rw-r--r--hosts/common.nix2
-rw-r--r--hosts/niuwux/default.nix2
-rw-r--r--users/beeb5k/default.nix4
9 files changed, 30 insertions, 37 deletions
diff --git a/common/modules/terminal/alacritty.nix b/common/modules/terminal/alacritty.nix
index fa7e32c..57ff494 100644
--- a/common/modules/terminal/alacritty.nix
+++ b/common/modules/terminal/alacritty.nix
@@ -10,9 +10,6 @@ in
programs.alacritty = {
enable = true;
settings = {
- cursor = {
- thickness = 0.0;
- };
colors = {
draw_bold_text_with_bright_colors = cfg.font.bright_color_is_bold;
@@ -36,15 +33,11 @@ in
[ "~/.config/alacritty/themes/noctalia.toml" ];
};
window = {
- dynamic_padding = true;
+ dynamic_padding = false;
padding = {
y = cfg.window.padding-y;
x = cfg.window.padding-x;
};
- # dimensions = {
- # lines = 75;
- # columns = 100;
- # };
};
font = {
normal.family = cfg.font.family;
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index 4ca4384..a53a74f 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -9,6 +9,7 @@ in
config = lib.mkIf cfg.ghostty {
programs.ghostty = {
enable = true;
+ systemd.enable = false;
enableFishIntegration = true;
settings = {
theme =
diff --git a/common/programs/bash.nix b/common/programs/bash.nix
index f6987ed..6cd9b26 100644
--- a/common/programs/bash.nix
+++ b/common/programs/bash.nix
@@ -1,6 +1,6 @@
{
programs.bash = {
- enable = false;
+ enable = true;
historySize = 10000;
historyFile = "$HOME/.bash_history";
historyControl = [
@@ -18,7 +18,6 @@
bind '"\e[A": history-search-backward'
bind '"\e[B": history-search-forward'
-
if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then
# Removed the '1;' prefix to disable bold
PROMPT_COLOR="31m"
@@ -28,7 +27,9 @@
PS1="\[\033[$PROMPT_COLOR\]\u@\h:\w\\$\[\033[0m\] "
else
# PS1="\[\033[$PROMPT_COLOR\]\[\e]0;\u@\h: \w\a\]\u@\h:\w\\$\[\033[0m\] "
- PS1="\[\e[38;5;75m\]\u@\h \[\e[38;5;113m\]\w \[\e[38;5;189m\]\$ \[\e[0m\]"
+ # PS1="\[\e[34m\]\u@\h \[\e[32m\]\w \[\e[39m\]\$ \[\e[0m\]"
+ PS1="\[\e[94m\]\u@\h \[\e[32m\]\w \[\e[39m\]\$ \[\e[0m\]"
+ # PS1="\[\e[38;5;75m\]\u@\h \[\e[38;5;113m\]\w \[\e[38;5;189m\]\$ \[\e[0m\]"
fi
if test "$TERM" = "xterm"; then
diff --git a/common/programs/fish.nix b/common/programs/fish.nix
index 8d9be78..2ff1f90 100644
--- a/common/programs/fish.nix
+++ b/common/programs/fish.nix
@@ -8,7 +8,7 @@
# ];
programs.fish = {
- enable = true;
+ enable = false;
interactiveShellInit =
#fish
''
diff --git a/common/templates/go/flake.nix b/common/templates/go/flake.nix
index 3f8e7d5..a820911 100644
--- a/common/templates/go/flake.nix
+++ b/common/templates/go/flake.nix
@@ -35,7 +35,7 @@
pkgs = nixpkgs.legacyPackages.${system};
in
{
- default = pkgs.mkShellNoCC {
+ default = pkgs.mkShell {
packages = with pkgs; [
go
gopls
diff --git a/flake.lock b/flake.lock
index f3641cd..cc7a496 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
"wrappers": "wrappers"
},
"locked": {
- "lastModified": 1781900166,
- "narHash": "sha256-ievNKEfsW+qJClgWqHK2IZNzBgImXCSbM6LfaeBDRgI=",
+ "lastModified": 1781910641,
+ "narHash": "sha256-2agExmnTA2xLc8B75gTbwQThe9U1QJ2+ouWDYvW+egM=",
"ref": "refs/heads/main",
- "rev": "c936db0627f277852fa69a9f5ed1d561c4512394",
- "revCount": 41,
+ "rev": "b2c3e55380d0dc0c5f8d9c2feb6b65e88e992593",
+ "revCount": 43,
"type": "git",
"url": "https://codeberg.org/beeb5k/beeVim"
},
@@ -33,11 +33,11 @@
]
},
"locked": {
- "lastModified": 1781344357,
- "narHash": "sha256-zDLFhtm7bYyQDdPkFvXE+eTvps2KG1YdZAS14HsuORs=",
+ "lastModified": 1781780775,
+ "narHash": "sha256-6TRfQ2NQzQhzXcxLOyCm1RilutxPt4/TVF77VLIZ0nU=",
"owner": "Daniel-42-z",
"repo": "brave-origin-flake",
- "rev": "bbe5b55e46d3f842ef52a2db961eb0244ec2cbd4",
+ "rev": "f8d37802d1088c2ac7beb077bf9f1b3f380f4c9b",
"type": "github"
},
"original": {
@@ -107,11 +107,11 @@
]
},
"locked": {
- "lastModified": 1781667738,
- "narHash": "sha256-OxrwHpsWf+QGbos1LMDGAcv7sjBGshcw/43th6waeYI=",
+ "lastModified": 1781906751,
+ "narHash": "sha256-6Ld1PqmptFtFKblE+SynhRgyBApUWcmrISetWqWHeeo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "7664e05e2413d5e2b8c54a884eb8ea0f8a504fc2",
+ "rev": "37f21dfa5d27e71b75bacd9418b156f9265e312e",
"type": "github"
},
"original": {
@@ -129,11 +129,11 @@
"scenefx": "scenefx"
},
"locked": {
- "lastModified": 1781657058,
- "narHash": "sha256-MPMEBoawVAZ1fEuctPBVUQ3Fcs2c3avwojrkR0ZjVA4=",
+ "lastModified": 1781878235,
+ "narHash": "sha256-tl7ejLTHpk61643MSATioVdGzPZF4FbgEIqHvTMEtj0=",
"owner": "mangowm",
"repo": "mango",
- "rev": "5652066c6891b5264bce1557a1e956240a771932",
+ "rev": "8e356692f6e44f5b6b12f31755ad87fae8c24a68",
"type": "github"
},
"original": {
@@ -195,11 +195,11 @@
]
},
"locked": {
- "lastModified": 1781666546,
- "narHash": "sha256-9mstXbgi7/FepdoaTB8QqbaME7sdELMdGLGOQHCrVlA=",
+ "lastModified": 1781904023,
+ "narHash": "sha256-x2Gy2TZV1QZpCRHD7nGpYUPNVyN58ZkQUh6WCIlx10I=",
"owner": "noctalia-dev",
"repo": "noctalia",
- "rev": "6b0e16179645e15693efd94f51109d22b199418c",
+ "rev": "67a99b5997cde7f64ad53d4f8f92c05ba7c22c67",
"type": "github"
},
"original": {
@@ -259,11 +259,11 @@
"plugins-neogit": {
"flake": false,
"locked": {
- "lastModified": 1781509219,
- "narHash": "sha256-K7AtBKS2b77pjfdxb11A7U7ED+XTjn4W8ajk//8U7TA=",
+ "lastModified": 1781870821,
+ "narHash": "sha256-oai8d/Zin+7jsrde4wGN2x/2vI3dH/Hs4raV/h2lrIA=",
"owner": "NeogitOrg",
"repo": "neogit",
- "rev": "5d1b65d6215928e941e1a6a4e76e02fd45ada31f",
+ "rev": "828dd073e6ad180fdb5c1603c7ad7f68a384c40b",
"type": "github"
},
"original": {
diff --git a/hosts/common.nix b/hosts/common.nix
index 54678fe..4ae58aa 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -247,8 +247,6 @@
services.gvfs.enable = true;
services.udisks2.enable = true;
- programs.fish.enable = true;
-
environment.systemPackages = with pkgs; [
android-tools
playerctl
diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix
index 6c16a13..796dc17 100644
--- a/hosts/niuwux/default.nix
+++ b/hosts/niuwux/default.nix
@@ -86,7 +86,7 @@
users.users.${user} = {
isNormalUser = true;
- shell = pkgs.fish;
+ shell = pkgs.bash;
extraGroups = [
"networkmanager"
"wheel"
diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix
index 95572f1..aa5dc51 100644
--- a/users/beeb5k/default.nix
+++ b/users/beeb5k/default.nix
@@ -39,8 +39,8 @@
};
matugen.enable = true;
terminal = {
- default = "ghostty";
- ghostty = true;
+ default = "alacritty";
+ alacritty = true;
font.family = "monospace";
font.size = 12.0;
};
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-02 14:04:45 +0000