Zellij and some other things

This commit is contained in:
Schrottkatze 2023-05-14 12:07:54 +02:00
parent abe737683b
commit f2689e9de0
5 changed files with 98 additions and 38 deletions

View file

@ -68,7 +68,7 @@ with builtins;
#}; #};
#security.sudo.extraConfig = "Defaults insults"; #security.sudo.extraConfig = "Defaults insults";
boot.kernel.sysctl.vm.max_map_count = 2147483642; boot.kernel.sysctl."vm.max_map_count" = 2147483642;
hardware.opengl.enable = true; hardware.opengl.enable = true;
@ -80,7 +80,8 @@ with builtins;
users.users.jade = { users.users.jade = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "input" "uinput" "libvirtd" "adbusers" ]; extraGroups = [ "wheel" "input" "uinput" "libvirtd" "adbusers" ];
packages = with pkgs; [ packages = [
pkgs.marksman
]; ];
}; };

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ inputs, config, pkgs, lib, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -42,42 +42,56 @@
ios-compat.enable = true; ios-compat.enable = true;
mail.enable = true; mail.enable = true;
}; };
zellij.enable = true;
terminal.enable = true; terminal.enable = true;
neovim.enable = true; helix.enable = true;
zsh.enable = true; zsh.enable = true;
}; };
boot = {
loader = {
# monitor control # Use the systemd-boot EFI boot loader.
services.ddccontrol.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
# latest linux kernel
#boot.kernelPackages = pkgs.linuxPackages_latest;
#boot.kernelPackages = pkgs.linux_zen_xeniafied;
kernelPackages = pkgs.linuxPackages_zen;
#boot.kernelPatches = [
#{
#name = "fomx";
#patch = ../other/0001-fomx.patch;
#}
#];
# Use the systemd-boot EFI boot loader. binfmt.emulatedSystems = [ "aarch64-linux" ];
boot.loader.systemd-boot.enable = true; };
boot.loader.efi.canTouchEfiVariables = true;
# latest linux kernel
#boot.kernelPackages = pkgs.linuxPackages_latest;
#boot.kernelPackages = pkgs.linux_zen_xeniafied;
boot.kernelPackages = pkgs.linuxPackages_zen;
#boot.kernelPatches = [
#{
#name = "fomx";
#patch = ../other/0001-fomx.patch;
#}
#];
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
programs.corectrl.enable = true;
networking.hostName = "monosodium-glutamate-g"; networking.hostName = "monosodium-glutamate-g";
services = {
services.xserver.layout = "us"; # monitor control
services.xserver.xkbVariant = "altgr-intl"; ddccontrol.enable = true;
xserver = {
services.openssh.settings.PermitRootLogin = "without-password"; layout = "us";
xkbVariant = "altgr-intl";
enable = true;
};
hardware.bluetooth.enable = true; openssh.settings.PermitRootLogin = "without-password";
hardware.keyboard.uhk.enable = true;
hardware.enableRedistributableFirmware = true; blueman.enable = true;
gnome.gnome-keyring.enable = true;
};
hardware = {
bluetooth.enable = true;
keyboard.uhk.enable = true;
enableRedistributableFirmware = true;
};
# missing: menu-qalc picom-jonaburg # missing: menu-qalc picom-jonaburg
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -92,16 +106,15 @@
rgp rgp
tea tea
]; ];
programs.wireshark.enable = true; programs = {
corectrl.enable = true;
wireshark.enable = true;
seahorse.enable = true;
};
environment.pathsToLink = [ environment.pathsToLink = [
"/share/nix-direnv" "/share/nix-direnv"
]; ];
services.blueman.enable = true;
services.gnome.gnome-keyring.enable = true;
programs.seahorse.enable = true;
security.pam.services.jade.enableGnomeKeyring = true; security.pam.services.jade.enableGnomeKeyring = true;
# Copy the NixOS configuration file and link it from the resulting system # Copy the NixOS configuration file and link it from the resulting system
@ -111,7 +124,6 @@
# networking.firewall.allowedTCPPorts = [ 4713 ]; # networking.firewall.allowedTCPPorts = [ 4713 ];
systemd.services."NetworkManager-wait-online".enable = false; systemd.services."NetworkManager-wait-online".enable = false;
services.xserver.enable = true;
systemd.services = { systemd.services = {
create-swapfile = { create-swapfile = {

View file

@ -1,6 +1,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./zellij.nix
./desktop ./desktop
./terminal.nix ./terminal.nix
./neovim.nix ./neovim.nix

View file

@ -1,5 +1,4 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
let cfg = config.jade.helix; let cfg = config.jade.helix;
in with lib; { in with lib; {
@ -8,6 +7,16 @@ in with lib; {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.jade = { pkgs, ... }: { home-manager.users.jade = { pkgs, ... }: {
home = {
sessionVariables.EDITOR = "hx";
packages = [
pkgs.nil
pkgs.nodePackages_latest.vscode-html-languageserver-bin
pkgs.nodePackages_latest.vscode-json-languageserver-bin
pkgs.nodePackages_latest.vscode-css-languageserver-bin
pkgs.nodePackages_latest.bash-language-server
];
};
programs.helix = { programs.helix = {
enable = true; enable = true;
settings = { settings = {
@ -16,6 +25,11 @@ in with lib; {
line-number = "relative"; line-number = "relative";
lsp.display-messages = true; lsp.display-messages = true;
}; };
keys.normal = {
space."=" = ":fmt";
"H" = "goto_line_start";
"L" = "goto_line_end";
};
}; };
}; };
}; };

32
modules/zellij.nix Normal file
View file

@ -0,0 +1,32 @@
{ config, lib, ... }:
let cfg = config.jade.zellij;
in with lib; {
options.jade.zellij= {
enable = mkEnableOption "Enable the Zellij multiplexer";
};
config = mkIf cfg.enable {
home-manager.users.jade = { pkgs, ... }: {
programs.zellij = {
enable = true;
enableZshIntegration = true;
settings = {
theme = "gruvbox-dark";
themes.gruvbox-dark = {
fg = "#D5C4A1";
bg = "#282828";
black = "#3C3836";
red = "#CC241D";
green = "#98971A";
yellow = "#D79921";
blue = "#3C8588";
magenta = "#B16286";
cyan = "#689D6A";
white = "#FBF1C7";
orange = "#D65D0E";
};
pane_frames = false;
};
};
};
};
}