fixed sam home zsh issue

This commit is contained in:
Sam 2024-05-17 10:54:53 +01:00
parent 58d5e6b58f
commit 878fffd900
15 changed files with 62 additions and 114 deletions

View File

@ -1,5 +1,6 @@
{ pkgs, ... }:
{ config, lib, pkgs, outputs, ... }:
{
imports = [
./zsh.nix
] ;
}

23
home/common/core/zsh.nix Normal file
View File

@ -0,0 +1,23 @@
{ pkgs, config, ... }: {
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
ll = "ls -l";
};
history.size = 10000;
history.path = "${config.xdg.dataHome}/zsh/history";
initExtra = ''
bindkey -v
bindkey "^H" backward-delete-char
bindkey "^?" backward-delete-char
set -o vi
export TERM=xterm
'';
};
}

View File

@ -5,12 +5,13 @@
...
}: {
imports = [
# Import users
./users/admin
./common/core
./common/optional/sops.nix
# Import optional
./common/optional/git.nix
# Import users
./users/admin
];

View File

@ -5,13 +5,14 @@
...
}: {
imports = [
# Import users
./users/media
./common/core
./common/optional/sops.nix
# Import optional
./common/optional/git.nix
# Import users
./users/media
];
}

View File

@ -5,6 +5,9 @@
...
}: {
imports = [
# Import users
./users/sam
./common/core
./common/optional/desktop/hyprland
./common/optional/desktop/waybar.nix
@ -12,9 +15,6 @@
# Import optional
./common/optional/git.nix
# Import users
./users/sam
];
# ------

View File

@ -11,28 +11,6 @@
home.packages = [
];
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
ll = "ls -l";
};
history.size = 10000;
history.path = "${config.xdg.dataHome}/zsh/history";
initExtra = ''
bindkey -v
bindkey "^H" backward-delete-char
bindkey "^?" backward-delete-char
set -o vi
export TERM=xterm
'';
};
home.file = {
};

View File

@ -12,27 +12,6 @@
home.packages = [
];
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
ll = "ls -l";
};
history.size = 10000;
history.path = "${config.xdg.dataHome}/zsh/history";
initExtra = ''
bindkey -v
bindkey "^H" backward-delete-char
bindkey "^?" backward-delete-char
set -o vi
export TERM=xterm
'';
};
home.file = {
};

View File

@ -16,29 +16,7 @@
pkgs.xfce.thunar
#pkgs.age
];
programs.zsh = {
enable = true;
enableCompletion = true;
programs.zsh.autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
ll = "ls -l";
};
history.size = 10000;
history.path = "${config.xdg.dataHome}/zsh/history";
initExtra = ''
bindkey -v
bindkey "^H" backward-delete-char
bindkey "^?" backward-delete-char
set -o vi
export TERM=xterm
'';
};
home.file = {
".icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
};
@ -71,6 +49,5 @@
IMAGE_EDITOR="";
};
programs.home-manager.enable = true;
}

View File

@ -1,6 +1,7 @@
{pkgs, ...}: {
imports = [
./sops.nix
./locale.nix
];
environment.systemPackages = [

View File

@ -0,0 +1,8 @@
{
i18n.defaultLocale = "en_GB.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "uk";
useXkbConfig = false;
};
}

View File

@ -20,7 +20,7 @@ in
programs.zsh.enable = true;
programs.fuse.userAllowOther = true;
#home-manager.users.sam =
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {

View File

@ -22,24 +22,6 @@ in
programs.zsh.enable = true;
fileSystems."/persist".neededForBoot = true;
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/etc/nixos"
"/var/log"
"/var/lib/nixos"
"/var/lib/systemd/coredump"
"/etc/NetworkManager/system-connections"
];
users.media = {
directories = [
"keep"
".ssh"
];
};
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {

View File

@ -41,13 +41,6 @@
time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "uk";
useXkbConfig = false;
};
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;

View File

@ -29,6 +29,24 @@
};
};
fileSystems."/persist".neededForBoot = true;
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/etc/nixos"
"/var/log"
"/var/lib/nixos"
"/var/lib/systemd/coredump"
"/etc/NetworkManager/system-connections"
];
users.media = {
directories = [
"keep"
".ssh"
];
};
};
boot = {
loader = {
systemd-boot.enable = true;
@ -37,13 +55,6 @@
};
};
i18n.defaultLocale = "en_GB.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "uk";
useXkbConfig = false;
};
networking = {
hostName = "media";
networkmanager.enable = true;

View File

@ -42,13 +42,6 @@
time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "uk";
useXkbConfig = false;
};
services.printing.enable = true;
services.libinput.enable = true;