i3 is mostly working!

This commit is contained in:
Gabe Venberg 2024-04-04 18:44:59 -05:00
parent fe1ed3e1be
commit e27cafb15b
17 changed files with 444 additions and 260 deletions

View file

@ -13,32 +13,20 @@ inputs.nixpkgs.lib.nixosSystem {
modules = [
inputs.home-manager.nixosModules.home-manager
./hardware-configuration.nix
./home.nix
../../modules/commonopts.nix
../../modules/nixos/common.nix
../../modules/nixos/printing.nix
../../modules/both/sound.nix
../../modules/both/networking.nix
../../modules/both/i3
({
config,
pkgs,
...
}: {
host = {
enable-speech = true;
user = "gabe";
gui.enable = true;
nvim = {
enable-lsp = true;
enable-treesitter = true;
};
git = {
profile = {
name = "Gabe Venberg";
email = "gabevenberg@gmail.com";
};
workProfile.enable = false;
};
};
networking.hostName = "workstation-vm"; # Define your hostname.
# Set your time zone.
@ -59,13 +47,6 @@ inputs.nixpkgs.lib.nixosSystem {
LC_TIME = "en_US.UTF-8";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the Cinnamon Desktop Environment.
services.xserver.displayManager.lightdm.enable = true;
services.xserver.desktopManager.cinnamon.enable = true;
# Configure keymap in X11
services.xserver = {
xkb.layout = "us";
@ -82,13 +63,30 @@ inputs.nixpkgs.lib.nixosSystem {
firefox
# thunderbird
];
};
home-manager.users.${config.host.user} = import ./home.nix;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;};
};
home-manager.users.${config.host.user} = {inputs, ...}: {
host = {
enable-speech = true;
nvim = {
enable-lsp = true;
enable-treesitter = true;
};
git = {
profile = {
name = "Gabe Venberg";
email = "gabevenberg@gmail.com";
};
workProfile.enable = false;
};
};
imports = [
../../modules/home-manager/terminal
../../modules/home-manager/nvim
../../modules/home-manager
inputs.nixvim.homeManagerModules.nixvim
];
};
# Enable the OpenSSH daemon.
services.openssh.enable = true;
@ -105,6 +103,13 @@ inputs.nixpkgs.lib.nixosSystem {
# 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 = "23.11"; # Did you read the comment?
# Enable the X11 windowing system.
# services.xserver.enable = true;
#
# # Enable the Cinnamon Desktop Environment.
# services.xserver.displayManager.lightdm.enable = true;
# services.xserver.desktopManager.cinnamon.enable = true;
})
];
}

View file

@ -1,15 +0,0 @@
{
inputs,
config,
pkgs,
lib,
...
}: {
imports = [
../../modules/home-manager/terminal
../../modules/home-manager/nvim
../../modules/home-manager
../../modules/home-manager/kitty.nix
inputs.nixvim.homeManagerModules.nixvim
];
}