added kitty shell, module organization changes.

This commit is contained in:
Gabe Venberg 2024-03-24 22:09:58 -05:00
parent 7ff04254fb
commit a26d6a1e02
11 changed files with 72 additions and 39 deletions

View file

@ -90,6 +90,7 @@
users.users.gabe = { users.users.gabe = {
isNormalUser = true; isNormalUser = true;
description = "Gabe Venberg"; description = "Gabe Venberg";
shell = pkgs.nushell;
extraGroups = ["networkmanager" "wheel"]; extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; [ packages = with pkgs; [
firefox firefox

View file

@ -1,15 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
config, imports =
lib, [ (modulesPath + "/profiles/qemu-guest.nix")
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
@ -17,13 +13,18 @@
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-uuid/87ee53a2-077d-47df-9051-9abcc0fc1a89"; { device = "/dev/disk/by-uuid/1000b969-f089-4b1e-bbef-3d0c39da8a91";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ fileSystems."/boot" =
{device = "/dev/disk/by-uuid/5aa8725e-fdd1-4825-9d2c-e2c2c165b726";} { device = "/dev/disk/by-uuid/AB75-97AD";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/506f2ef4-c9ee-4fe6-8590-95e0821d5903"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View file

@ -15,7 +15,9 @@
home.username = "gabe"; home.username = "gabe";
home.homeDirectory = "/home/gabe"; home.homeDirectory = "/home/gabe";
imports = [ imports = [
../../terminal/terminal.nix ../../modules/home-manager/terminal/terminal.nix
../../modules/home-manager/home-manager.nix
../../modules/home-manager/kittty/kitty.nix
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
]; ];
} }

View file

@ -16,5 +16,6 @@
home.homeDirectory = "/home/gabe"; home.homeDirectory = "/home/gabe";
imports = [ imports = [
../terminal/terminal.nix ../terminal/terminal.nix
../../modules/home-manager/home-manager.nix
]; ];
} }

View file

@ -16,5 +16,6 @@
home.homeDirectory = "/home/gabe"; home.homeDirectory = "/home/gabe";
imports = [ imports = [
../terminal/terminal.nix ../terminal/terminal.nix
../../modules/home-manager/home-manager.nix
]; ];
} }

View file

@ -1,6 +1,9 @@
default: default:
just --list just --list
nixos target:
sudo nixos-rebuild --flake .#{{target}} switch
home-manager target: home-manager target:
home-manager --flake .#{{target}} switch home-manager --flake .#{{target}} switch

View file

@ -0,0 +1,21 @@
{
config,
pkgs,
lib,
...
}: {
home.stateVersion = "23.11"; # Please read the comment before changing.
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
# enable flakes
nix =
lib.mkIf config.targets.genericLinux.enable
{
package = pkgs.nix;
settings.experimental-features = ["nix-command" "flakes"];
settings.max-jobs = "auto";
gc.automatic = true;
};
}

View file

@ -0,0 +1,15 @@
{
config,
pkgs,
lib,
...
}: {
programs.kitty = {
enable=true;
font={
package=pkgs.fira-code-nerdfont;
name="Fira Code";
};
theme="Gruvbox Dark";
};
}

View file

@ -17,6 +17,10 @@
clipboard.providers.xsel.enable = true; clipboard.providers.xsel.enable = true;
}; };
home.sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
};
imports = [ imports = [
./keybinds.nix ./keybinds.nix
./options.nix ./options.nix

View file

@ -4,8 +4,6 @@
lib, lib,
... ...
}: { }: {
home.stateVersion = "23.11"; # Please read the comment before changing.
home.packages = with pkgs; [ home.packages = with pkgs; [
sshfs sshfs
just just
@ -24,8 +22,6 @@
}; };
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
PIPENV_VENV_IN_PROJECT = 1; PIPENV_VENV_IN_PROJECT = 1;
POETRY_VIRTUALENVS_IN_PROJECT = 1; POETRY_VIRTUALENVS_IN_PROJECT = 1;
}; };
@ -47,8 +43,8 @@
./zsh.nix ./zsh.nix
./git.nix ./git.nix
./starship.nix ./starship.nix
./nvim/nvim.nix
./voice.nix ./voice.nix
./nvim/nvim.nix
]; ];
programs = { programs = {
@ -66,17 +62,4 @@
}; };
services.ssh-agent.enable = true; services.ssh-agent.enable = true;
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
# enable flakes
nix =
lib.mkIf config.targets.genericLinux.enable
{
package = pkgs.nix;
settings.experimental-features = ["nix-command" "flakes"];
settings.max-jobs = "auto";
gc.automatic = true;
};
} }

View file

@ -9,6 +9,7 @@
programs.yazi.enableZshIntegration = true; programs.yazi.enableZshIntegration = true;
programs.carapace.enableZshIntegration = true; programs.carapace.enableZshIntegration = true;
programs.direnv.enableZshIntegration = true; programs.direnv.enableZshIntegration = true;
programs.kitty.shellIntegration.enableZshIntegration = true;
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;