moved zsh to home-manger with p10k
This commit is contained in:
@ -9,30 +9,30 @@
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
|
||||
enableCompletion = true;
|
||||
autosuggestions.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
# enableCompletion = true;
|
||||
# autosuggestions.enable = true;
|
||||
# syntaxHighlighting.enable = true;
|
||||
|
||||
ohMyZsh = {
|
||||
enable = true;
|
||||
theme = "agnoster";
|
||||
customPkgs = [
|
||||
pkgs.zsh-autosuggestions
|
||||
pkgs.zsh-syntax-highlighting
|
||||
pkgs.zsh-powerlevel10k
|
||||
];
|
||||
plugins = [
|
||||
"cp"
|
||||
"common-aliases"
|
||||
"docker "
|
||||
"systemd"
|
||||
"wd"
|
||||
"kubectl"
|
||||
"git"
|
||||
# "zsh-autosuggestions"
|
||||
# "zsh-syntax-highlightin"
|
||||
];
|
||||
};
|
||||
# ohMyZsh = {
|
||||
# enable = true;
|
||||
# theme = "agnoster";
|
||||
# customPkgs = [
|
||||
# pkgs.zsh-autosuggestions
|
||||
# pkgs.zsh-syntax-highlighting
|
||||
# pkgs.zsh-powerlevel10k
|
||||
# ];
|
||||
# plugins = [
|
||||
# "cp"
|
||||
# "common-aliases"
|
||||
# "docker "
|
||||
# "systemd"
|
||||
# "wd"
|
||||
# "kubectl"
|
||||
# "git"
|
||||
# # "zsh-autosuggestions"
|
||||
# # "zsh-syntax-highlightin"
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
|
||||
services = {
|
||||
|
@ -5,7 +5,6 @@
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.allowBroken = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
kitty
|
||||
signal-desktop
|
||||
chromium
|
||||
gparted
|
||||
|
1579
configs/p10k-config/p10k.zsh
Normal file
1579
configs/p10k-config/p10k.zsh
Normal file
File diff suppressed because it is too large
Load Diff
117
configs/user-gui.nix
Normal file
117
configs/user-gui.nix
Normal file
@ -0,0 +1,117 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
imports = [ <home-manager/nixos> ];
|
||||
|
||||
home-manager.users.alex = { pkgs, ... }: {
|
||||
home.packages = [
|
||||
pkgs.cryfs
|
||||
];
|
||||
|
||||
programs = {
|
||||
vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscode;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.Nix
|
||||
justusadam.language-haskell
|
||||
editorconfig.editorconfig
|
||||
ms-azuretools.vscode-docker
|
||||
#hsnazar.hyper-term-theme
|
||||
#rafaelmaiolla.remote-vscode
|
||||
eamodio.gitlens
|
||||
];
|
||||
# userSettings = {
|
||||
# #"terminal.integrated.fontFamily" = "Hack";
|
||||
# "workbench.colorTheme" = "Hyper Term Black";
|
||||
# "window.titleBarStyle" = "custom";
|
||||
# };
|
||||
};
|
||||
|
||||
rofi = {
|
||||
enable = true;
|
||||
lines = 10;
|
||||
borderWidth = 2;
|
||||
scrollbar = false;
|
||||
padding = 50;
|
||||
font = "Liberation Sans Regular 20";
|
||||
separator = "solid";
|
||||
colors = {
|
||||
window = {
|
||||
background = "#dd000000";
|
||||
border = "#a6a6a6";
|
||||
separator = "#a6a6a6";
|
||||
};
|
||||
rows = {
|
||||
normal = {
|
||||
background = "#00000000";
|
||||
foreground = "#a6a6a6";
|
||||
backgroundAlt = "#00000000";
|
||||
highlight = {
|
||||
background = "#a6a6a6";
|
||||
foreground = "#000000";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
extraConfig = {
|
||||
modi = "drun,window";
|
||||
show-icons = true;
|
||||
};
|
||||
};
|
||||
|
||||
mpv = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
|
||||
kitty = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
enabled_layouts splits:split_axis=vertical
|
||||
enable_audio_bell false
|
||||
|
||||
map F5 launch --location=hsplit
|
||||
map F6 launch --location=vsplit
|
||||
map F7 layout_action rotate
|
||||
|
||||
map shift+up move_window up
|
||||
map shift+left move_window left
|
||||
map shift+right move_window right
|
||||
map shift+down move_window down
|
||||
|
||||
map ctrl+left neighboring_window left
|
||||
map ctrl+right neighboring_window right
|
||||
map ctrl+up neighboring_window up
|
||||
map ctrl+down neighboring_window down
|
||||
|
||||
background #000000
|
||||
foreground #e9e9e9
|
||||
cursor #e9e9e9
|
||||
selection_background #424242
|
||||
color0 #000000
|
||||
color8 #000000
|
||||
color1 #d44d53
|
||||
color9 #d44d53
|
||||
color2 #b9c949
|
||||
color10 #b9c949
|
||||
color3 #e6c446
|
||||
color11 #e6c446
|
||||
color4 #79a6da
|
||||
color12 #79a6da
|
||||
color5 #c396d7
|
||||
color13 #c396d7
|
||||
color6 #70c0b1
|
||||
color14 #70c0b1
|
||||
color7 #fffefe
|
||||
color15 #fffefe
|
||||
selection_foreground #000000
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# manuals not needed
|
||||
manual.html.enable = false;
|
||||
manual.json.enable = false;
|
||||
manual.manpages.enable = false;
|
||||
};
|
||||
}
|
126
configs/user.nix
126
configs/user.nix
@ -71,102 +71,44 @@
|
||||
};
|
||||
};
|
||||
|
||||
vscode = {
|
||||
zsh = {
|
||||
enable = true;
|
||||
package = pkgs.vscode;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.Nix
|
||||
justusadam.language-haskell
|
||||
editorconfig.editorconfig
|
||||
ms-azuretools.vscode-docker
|
||||
#hsnazar.hyper-term-theme
|
||||
#rafaelmaiolla.remote-vscode
|
||||
eamodio.gitlens
|
||||
enableAutosuggestions = true;
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
"cp"
|
||||
"common-aliases"
|
||||
"docker "
|
||||
"systemd"
|
||||
"wd"
|
||||
"kubectl"
|
||||
"git"
|
||||
];
|
||||
theme = "agnoster";
|
||||
};
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "powerlevel10k-config";
|
||||
src = lib.cleanSource ./p10k-config;
|
||||
file = "p10k.zsh";
|
||||
}
|
||||
];
|
||||
# userSettings = {
|
||||
# #"terminal.integrated.fontFamily" = "Hack";
|
||||
# "workbench.colorTheme" = "Hyper Term Black";
|
||||
# "window.titleBarStyle" = "custom";
|
||||
# };
|
||||
};
|
||||
|
||||
rofi = {
|
||||
enable = true;
|
||||
lines = 10;
|
||||
borderWidth = 2;
|
||||
scrollbar = false;
|
||||
padding = 50;
|
||||
font = "Liberation Sans Regular 20";
|
||||
separator = "solid";
|
||||
colors = {
|
||||
window = {
|
||||
background = "#dd000000";
|
||||
border = "#a6a6a6";
|
||||
separator = "#a6a6a6";
|
||||
};
|
||||
rows = {
|
||||
normal = {
|
||||
background = "#00000000";
|
||||
foreground = "#a6a6a6";
|
||||
backgroundAlt = "#00000000";
|
||||
highlight = {
|
||||
background = "#a6a6a6";
|
||||
foreground = "#000000";
|
||||
};
|
||||
};
|
||||
};
|
||||
localVariables = {
|
||||
EDITOR = "vim";
|
||||
};
|
||||
extraConfig = {
|
||||
modi = "drun,window";
|
||||
show-icons = true;
|
||||
shellAliases = {
|
||||
lw = "lorri watch --once";
|
||||
mff = "git merge --ff-only";
|
||||
vi = "vim";
|
||||
};
|
||||
};
|
||||
|
||||
mpv = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
kitty = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
enabled_layouts splits:split_axis=vertical
|
||||
enable_audio_bell false
|
||||
|
||||
map F5 launch --location=hsplit
|
||||
map F6 launch --location=vsplit
|
||||
map F7 layout_action rotate
|
||||
|
||||
map shift+up move_window up
|
||||
map shift+left move_window left
|
||||
map shift+right move_window right
|
||||
map shift+down move_window down
|
||||
|
||||
map ctrl+left neighboring_window left
|
||||
map ctrl+right neighboring_window right
|
||||
map ctrl+up neighboring_window up
|
||||
map ctrl+down neighboring_window down
|
||||
|
||||
background #000000
|
||||
foreground #e9e9e9
|
||||
cursor #e9e9e9
|
||||
selection_background #424242
|
||||
color0 #000000
|
||||
color8 #000000
|
||||
color1 #d44d53
|
||||
color9 #d44d53
|
||||
color2 #b9c949
|
||||
color10 #b9c949
|
||||
color3 #e6c446
|
||||
color11 #e6c446
|
||||
color4 #79a6da
|
||||
color12 #79a6da
|
||||
color5 #c396d7
|
||||
color13 #c396d7
|
||||
color6 #70c0b1
|
||||
color14 #70c0b1
|
||||
color7 #fffefe
|
||||
color15 #fffefe
|
||||
selection_foreground #000000
|
||||
initExtra = ''
|
||||
unset LESS
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
@ -10,6 +10,7 @@ in
|
||||
../configs/gui.nix
|
||||
../configs/virtualisation.nix
|
||||
../configs/common.nix
|
||||
../configs/user-gui.nix
|
||||
../configs/user.nix
|
||||
];
|
||||
|
||||
@ -132,12 +133,5 @@ in
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
|
||||
system.stateVersion = "21.05";
|
||||
}
|
||||
|
@ -6,6 +6,7 @@
|
||||
/etc/nixos/hardware-configuration.nix
|
||||
../configs/common.nix
|
||||
../configs/virtualisation.nix
|
||||
../configs/user.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
@ -20,15 +21,6 @@
|
||||
networking.useDHCP = false;
|
||||
networking.interfaces.enp3s0.useDHCP = true;
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users = {
|
||||
defaultUserShell = pkgs.zsh;
|
||||
users.alex = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "docker" "render" ]; # Enable ‘sudo’ for the user.
|
||||
};
|
||||
};
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
@ -174,20 +166,7 @@
|
||||
} ];
|
||||
}];
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.enable = true;
|
||||
# networking.firewall.allowPing = true;
|
||||
# networking.firewall.allowedTCPPorts = [ 445 139 19999 ];
|
||||
# networking.firewall.allowedUDPPorts = [ 137 138 19999 ];
|
||||
# Or disable the firewall altogether.
|
||||
networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
|
||||
system.stateVersion = "21.05";
|
||||
}
|
||||
|
@ -6,6 +6,7 @@
|
||||
/etc/nixos/hardware-configuration.nix
|
||||
../configs/virtualisation.nix
|
||||
../configs/common.nix
|
||||
../configs/user.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
@ -16,24 +17,7 @@
|
||||
networking.useDHCP = false;
|
||||
networking.interfaces.enp3s0.useDHCP = true;
|
||||
|
||||
users.users.alex = {
|
||||
defaultUserShell = pkgs.zsh;
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||
};
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
|
||||
system.stateVersion = "21.05";
|
||||
}
|
||||
|
@ -10,6 +10,7 @@ in
|
||||
../configs/gui.nix
|
||||
../configs/common.nix
|
||||
../configs/user.nix
|
||||
../configs/user-gui.nix
|
||||
../configs/desktop.nix
|
||||
];
|
||||
|
||||
@ -45,12 +46,5 @@ in
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
|
||||
system.stateVersion = "21.05";
|
||||
}
|
||||
|
@ -21,6 +21,7 @@ in
|
||||
../configs/virtualisation.nix
|
||||
../configs/common.nix
|
||||
../configs/user.nix
|
||||
../configs/user-gui.nix
|
||||
];
|
||||
|
||||
# boot.initrd.luks.devices = {
|
||||
@ -170,17 +171,7 @@ in
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# Open ports in the firewall.
|
||||
#networking.firewall.allowedTCPPorts = [ 52698 ];
|
||||
#networking.firewall.allowedUDPPorts = [ 52698 ];
|
||||
# Or disable the firewall altogether.
|
||||
networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
system.stateVersion = "21.05";
|
||||
}
|
||||
|
@ -6,6 +6,7 @@
|
||||
/etc/nixos/hardware-configuration.nix
|
||||
../configs/common.nix
|
||||
../configs/virtualisation.nix
|
||||
../configs/user.nix
|
||||
];
|
||||
|
||||
# Use the GRUB 2 boot loader.
|
||||
@ -20,16 +21,6 @@
|
||||
networking.useDHCP = false;
|
||||
networking.interfaces.ens3.useDHCP = true;
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users = {
|
||||
defaultUserShell = pkgs.zsh;
|
||||
|
||||
users.alex = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "docker" ];
|
||||
};
|
||||
};
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
environment.systemPackages = with pkgs; [
|
||||
docker-compose
|
||||
@ -105,19 +96,9 @@
|
||||
# Limit stack size to reduce memory usage
|
||||
systemd.services.fail2ban.serviceConfig.LimitSTACK = 256 * 1024;
|
||||
|
||||
# Open ports in the firewall.
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
networking.firewall.allowedUDPPorts = [ 80 443 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
|
||||
system.stateVersion = "21.05";
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user