Add LSP and formatter

This commit is contained in:
Joshua Yuen 2025-08-22 08:46:56 -04:00
parent 8998c1078b
commit c3cc521997
Signed by: josh
GPG Key ID: 502720BC22ED411C
39 changed files with 261 additions and 213 deletions

45
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,45 @@
{
// Nix settings
"nix.formatterPath": [
"nixpkgs-fmt",
"nixfmt",
"treefmt",
"--stdin",
"{file}",
"nix",
"fmt",
"--",
"-",
],
"nix.enableLanguageServer": true,
"nix.serverPath": "nixd",
"nix.serverSettings": {
"nixd": {
"nixpkgs": {
"expr": "(builtins.getFlake \"${workspaceFolder}/flake.nix\").inputs.nixpkgs { }"
},
"formatting": {
"command": [
"nix fmt"
]
},
"options": {
"nixos": {
"expr": "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.nixos.options"
},
"live": {
"expr": "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.live.options"
},
"nixosvm": {
"expr": "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.nixosvm.options"
},
// "home-manager": {
// "expr": "(builtins.getFlake \"/absolute/path/to/flake\").homeConfigurations.<name>.options"
// },
}
}
},
"nixEnvSelector.useFlakes": true,
"nixEnvSelector.suggestion": true,
"nixEnvSelector.nixFile": "${workspaceFolder}/flake.nix",
}

104
flake.nix
View File

@ -18,53 +18,69 @@
}; };
}; };
outputs = { nixpkgs, home-manager, install-system, ... } @ inputs: let outputs =
system = "x86_64-linux"; {
host = "vm"; nixpkgs,
profile = "vm"; home-manager,
username = "josh"; install-system,
in { ...
nixosConfigurations = { }@inputs:
nixos = nixpkgs.lib.nixosSystem { let
inherit system; system = "x86_64-linux";
specialArgs = { host = "vm";
inherit inputs; profile = "vm";
inherit host; username = "josh";
inherit profile; in
inherit username; {
nixosConfigurations = {
nixos = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
inherit host;
inherit profile;
inherit username;
};
modules = [
./hosts/${host}
];
}; };
modules = [
./hosts/${host} live = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
inherit host;
inherit profile;
inherit username;
};
modules = [
(nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
{ environment.systemPackages = [ install-system.packages.${system}.default ]; }
./hosts/${host}
];
};
nixosvm = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
inherit host;
inherit profile;
inherit username;
};
modules = [
./hosts/${host}
];
};
};
devShell.${system} = nixpkgs.legacyPackages.${system}.pkgs.mkShell {
packages = with nixpkgs.legacyPackages.${system}.pkgs; [
nixd
]; ];
}; };
live = nixpkgs.lib.nixosSystem { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
inherit system;
specialArgs = {
inherit inputs;
inherit host;
inherit profile;
inherit username;
};
modules = [
(nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
{ environment.systemPackages = [ install-system.packages.${system}.default ]; }
./hosts/${host}
];
};
nixosvm = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
inherit host;
inherit profile;
inherit username;
};
modules = [
./hosts/${host}
];
};
}; };
};
} }

View File

@ -14,8 +14,13 @@ in
}; };
# Add wayland screensharing support if PipeWire is enabled # Add wayland screensharing support if PipeWire is enabled
environment.systemPackages = with pkgs; [] environment.systemPackages =
++ (if pipewireCfg.enable with pkgs;
then [ (wrapFirefox (firefox-unwrapped.override { pipewireSupport = true; }) {}) ] [ ]
else [ firefox ]); ++ (
if pipewireCfg.enable then
[ (wrapFirefox (firefox-unwrapped.override { pipewireSupport = true; }) { }) ]
else
[ firefox ]
);
} }

View File

@ -6,13 +6,14 @@
{ {
fonts = { fonts = {
fontconfig.enable = true; fontconfig.enable = true;
packages = with pkgs; [ packages =
font-awesome with pkgs;
montserrat [
nerd-fonts.jetbrains-mono font-awesome
noto-fonts-emoji montserrat
] ++ (if config.modules.zsh.enable nerd-fonts.jetbrains-mono
then [ nerd-fonts.meslo-lg ] noto-fonts-emoji
else []); ]
++ (if config.modules.zsh.enable then [ nerd-fonts.meslo-lg ] else [ ]);
}; };
} }

View File

@ -1,5 +1,4 @@
{ {
config,
host, host,
pkgs, pkgs,
... ...

View File

@ -1,5 +1,4 @@
{ {
config,
pkgs, pkgs,
... ...
}: }:

View File

@ -11,7 +11,7 @@
fonts = { fonts = {
emoji = { emoji = {
package = pkgs.noto-fonts-emoji; package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji"; name = "Noto Color Emoji";
}; };
monospace = { monospace = {

View File

@ -1,11 +1,9 @@
{ {
config, config,
lib,
... ...
}: }:
with lib;
let let
cfg = config.system; cfg = config.system;
in in
{ {
nix = { nix = {

View File

@ -2,13 +2,11 @@
config, config,
host, host,
inputs, inputs,
lib,
pkgs, pkgs,
profile, profile,
username, username,
... ...
}: }:
with lib;
let let
shellCfg = config.modules.shell; shellCfg = config.modules.shell;
in in
@ -18,7 +16,14 @@ in
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = false; useGlobalPkgs = false;
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = { inherit host inputs profile username; }; extraSpecialArgs = {
inherit
host
inputs
profile
username
;
};
users.${username} = { users.${username} = {
imports = [ ./../home ]; imports = [ ./../home ];
home = { home = {
@ -42,7 +47,7 @@ in
}; };
# Set /etc/shells so GDM will show our user when ZSH is selected # Set /etc/shells so GDM will show our user when ZSH is selected
environment.shells = with pkgs; [ pkgs.${shellCfg.defaultShell} ]; environment.shells = [ pkgs.${shellCfg.defaultShell} ];
nix.settings.allowed-users = [ "${username}" ]; nix.settings.allowed-users = [ "${username}" ];
} }

View File

@ -1,7 +1,6 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: }:
with lib; with lib;

View File

@ -1,5 +1,4 @@
{ {
host,
... ...
}: }:
{ {

View File

@ -1,9 +1,7 @@
{ {
lib,
osConfig, osConfig,
... ...
}: }:
with lib;
let let
cfg = osConfig.modules.hyprland; cfg = osConfig.modules.hyprland;
in in

View File

@ -1,5 +1,4 @@
{ {
host,
lib, lib,
osConfig, osConfig,
pkgs, pkgs,

View File

@ -1,5 +1,4 @@
{ {
config,
lib, lib,
osConfig, osConfig,
pkgs, pkgs,

View File

@ -1,10 +1,8 @@
{ {
lib,
osConfig, osConfig,
pkgs, pkgs,
... ...
}: }:
with lib;
let let
hyprlandCfg = osConfig.modules.hyprland; hyprlandCfg = osConfig.modules.hyprland;
pipewireCfg = osConfig.modules.pipewire; pipewireCfg = osConfig.modules.pipewire;
@ -17,27 +15,31 @@ in
mimeApps.enable = true; mimeApps.enable = true;
portal = { portal = {
enable = true; enable = true;
extraPortals = [] extraPortals =
++ (if hyprlandCfg.enable [ ]
then [ pkgs.xdg-desktop-portal-hyprland ] ++ (if hyprlandCfg.enable then [ pkgs.xdg-desktop-portal-hyprland ] else [ ])
else []) ++ (
++ (if pipewireCfg.enable if pipewireCfg.enable then
then [ [
pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal-wlr
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
] ]
else []) else
++ (if plasmaCfg.enable [ ]
then [ pkgs.kdePackages.xdg-desktop-portal-kde ] )
else []); ++ (if plasmaCfg.enable then [ pkgs.kdePackages.xdg-desktop-portal-kde ] else [ ]);
configPackages = [] configPackages =
++ (if hyprlandCfg.enable [ ]
then [ pkgs.hyprland ] ++ (if hyprlandCfg.enable then [ pkgs.hyprland ] else [ ])
else []) ++ (
++ (if plasmaCfg.enable if
# TODO: use the correct packages or config plasmaCfg.enable
then [ pkgs.kdePackages.kde-gtk-config ] # TODO: use the correct packages or config
else []); then
[ pkgs.kdePackages.kde-gtk-config ]
else
[ ]
);
}; };
}; };
} }

View File

@ -1,12 +1,9 @@
{ {
config, config,
lib,
osConfig, osConfig,
pkgs, pkgs,
profile,
... ...
}: }:
with lib;
let let
cfg = osConfig.modules.zsh; cfg = osConfig.modules.zsh;
xdgCfg = config.xdg; xdgCfg = config.xdg;

View File

@ -2,7 +2,6 @@
config, config,
lib, lib,
osConfig, osConfig,
pkgs,
... ...
}: }:
with lib; with lib;

View File

@ -1,12 +1,8 @@
{ {
config,
lib, lib,
... ...
}: }:
with lib; with lib;
let
cfg = config.modules.displayManager;
in
{ {
options.modules.displayManager = { options.modules.displayManager = {
displayManager = mkOption { displayManager = mkOption {

View File

@ -1,16 +1,12 @@
{ {
config,
lib, lib,
... ...
}: }:
with lib; with lib;
let
cfg = config.modules.hyprland;
in
{ {
options.modules.hyprland = { options.modules.hyprland = {
enable = mkEnableOption { enable = mkEnableOption {
default = false; default = false;
description = "Enable Hyprland"; description = "Enable Hyprland";
}; };
terminal = mkOption { terminal = mkOption {
@ -26,7 +22,7 @@ in
monitor = mkOption { monitor = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ",preferred,auto,1" ]; default = [ ",preferred,auto,1" ];
description = '' description = ''
Monitors to use for Hyprland. Monitors to use for Hyprland.
''; '';
}; };

View File

@ -1,12 +1,8 @@
{ {
config,
lib, lib,
... ...
}: }:
with lib; with lib;
let
cfg = config.modules.pipewire;
in
{ {
options.modules.pipewire = { options.modules.pipewire = {
enable = mkEnableOption { enable = mkEnableOption {

View File

@ -1,12 +1,8 @@
{ {
config,
lib, lib,
... ...
}: }:
with lib; with lib;
let
cfg = config.modules.plasma;
in
{ {
options.modules.plasma = { options.modules.plasma = {
enable = mkEnableOption { enable = mkEnableOption {

View File

@ -22,11 +22,17 @@ in
}; };
}; };
config.assertions = [] config.assertions =
++ (if cfg.defaultShell == "zsh" [ ]
then [{ ++ (
if cfg.defaultShell == "zsh" then
[
{
assertion = zshCfg.enable; assertion = zshCfg.enable;
message = "You have selected zsh as the default shell, but you haven't enabled it in your configuration.\n\nPlease enable it by adding `modules.zsh.enable = true`."; message = "You have selected zsh as the default shell, but you haven't enabled it in your configuration.\n\nPlease enable it by adding `modules.zsh.enable = true`.";
}] }
else []); ]
else
[ ]
);
} }

View File

@ -1,20 +1,16 @@
{ {
config,
lib, lib,
... ...
}: }:
with lib; with lib;
let
cfg = config.system;
in
{ {
options.system = { options.system = {
locale = mkOption { locale = mkOption {
type = types.str; type = types.str;
default = "en_US.UTF-8"; default = "en_US.UTF-8";
}; };
keyMap = mkOption { keyMap = mkOption {
type = types.str; type = types.str;
default = "us"; default = "us";
}; };

View File

@ -1,12 +1,8 @@
{ {
config,
lib, lib,
... ...
}: }:
with lib; with lib;
let
cfg = config.modules.zsh;
in
{ {
options.modules.zsh = { options.modules.zsh = {
enable = mkEnableOption { enable = mkEnableOption {

View File

@ -2,29 +2,32 @@
description = "_template package and shell environment"; description = "_template package and shell environment";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
}; };
outputs = { self, nixpkgs, ... }: let outputs =
system = "x86_64-linux"; { nixpkgs, ... }:
pkgs = nixpkgs.legacyPackages.${system}.pkgs; let
name = builtins.baseNameOf (builtins.toString ./.); system = "x86_64-linux";
shellApplication = pkgs.writeShellApplication { pkgs = nixpkgs.legacyPackages.${system}.pkgs;
inherit name; name = builtins.baseNameOf (builtins.toString ./.);
shellApplication = pkgs.writeShellApplication {
inherit name;
text = builtins.readFile ./${name}.sh; text = builtins.readFile ./${name}.sh;
runtimeInputs = with pkgs; [ runtimeInputs = with pkgs; [
coreutils coreutils
gnused gnused
unixtools.column unixtools.column
]; ];
};
in
{
packages.${system}.default = shellApplication;
devShells.${system}.default = pkgs.mkShell {
packages = [ shellApplication ];
};
}; };
in {
packages.${system}.default = shellApplication;
devShells.${system}.default = pkgs.mkShell {
packages = [ shellApplication ];
};
};
} }

View File

@ -2,28 +2,31 @@
description = "install-system package and shell environment"; description = "install-system package and shell environment";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
}; };
outputs = { self, nixpkgs, ... }: let outputs =
pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs; { nixpkgs, ... }:
name = builtins.baseNameOf (builtins.toString ./.); let
shellApplication = pkgs.writeShellApplication { pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
inherit name; name = builtins.baseNameOf (builtins.toString ./.);
shellApplication = pkgs.writeShellApplication {
inherit name;
text = builtins.readFile ./${name}.sh; text = builtins.readFile ./${name}.sh;
runtimeInputs = with pkgs; [ runtimeInputs = with pkgs; [
coreutils coreutils
gnused gnused
unixtools.column unixtools.column
]; ];
};
in
{
packages.x86_64-linux.default = shellApplication;
devShells.x86_64-linux.default = pkgs.mkShell {
packages = [ shellApplication ];
};
}; };
in {
packages.x86_64-linux.default = shellApplication;
devShells.x86_64-linux.default = pkgs.mkShell {
packages = [ shellApplication ];
};
};
} }