[development] More TS dev fixes, adds direnv. Fixes some markdown rendering.

This commit is contained in:
2025-05-01 12:19:54 -07:00
parent 8884bd51fd
commit 2643d3801f
8 changed files with 69 additions and 16 deletions

28
flake.lock generated
View File

@@ -7,16 +7,35 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743788974, "lastModified": 1746040799,
"narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=", "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0f5908daf890c3d7e7052bef1d6deb0f2710aaa1", "rev": "5f217e5a319f6c186283b530f8c975e66c028433",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1746040799,
"narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5f217e5a319f6c186283b530f8c975e66c028433",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -68,6 +87,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",

View File

@@ -9,12 +9,16 @@
url = "github:nixos/nixpkgs?ref=nixos-24.11"; url = "github:nixos/nixpkgs?ref=nixos-24.11";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
home-manager-unstable = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# hyprland = { # hyprland = {
# url = "github:hyprwm/Hyprland"; # url = "github:hyprwm/Hyprland";
# inputs.nixpkgs.follows = "nixpkgs-stable"; # inputs.nixpkgs.follows = "nixpkgs-unstable";
# }; # };
# hy3 = { # hy3 = {
# url = "github:outfoxxed/hy3"; # url = "github:outfoxxed/hy3";
@@ -66,6 +70,7 @@
}; };
vega = mkNixosConfig { vega = mkNixosConfig {
path = ./system/hosts/vega; path = ./system/hosts/vega;
nixpkgs = inputs.nixpkgs-unstable; # Required for Tailwind until 25.05 is cut
}; };
mcp = mkNixosConfig { mcp = mkNixosConfig {
path = ./system/hosts/mcp; path = ./system/hosts/mcp;

View File

@@ -0,0 +1,6 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
markdownlint-cli2 # linter
];
}

View File

@@ -0,0 +1,9 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
vtsls # Language Server
eslint # Linter
nodePackages.prettier # Formatter
tailwindcss-language-server # Language server for tailwind CSS
];
}

View File

@@ -2,7 +2,10 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# For Noto Sans NF # For Noto Sans NF
nerdfonts # 25.05
nerd-fonts.noto
# 24.11
# (nerdfonts.override { fonts = [ "NotoSans" ]; })
]; ];
programs.eww = { programs.eww = {

View File

@@ -35,5 +35,9 @@ return {
date_format = "%Y-%m-%d", date_format = "%Y-%m-%d",
time_format = "%H:%M", time_format = "%H:%M",
}, },
ui = {
-- Disable the UI features and let render-markdown.nvim handle it.
enable = false,
},
}, },
} }

View File

@@ -5,12 +5,12 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
# Font # Font
# 24.11 # 24.11
inconsolata-nerdfont # inconsolata-nerdfont
fira-code-nerdfont # fira-code-nerdfont
# 25.05 # 25.05
# nerd-fonts.inconsolata nerd-fonts.inconsolata
# nerd-fonts.fira-code nerd-fonts.fira-code
# nerd-fonts.jetbrains-mono nerd-fonts.jetbrains-mono
libsixel # For working with images in terminals libsixel # For working with images in terminals
]; ];
@@ -50,7 +50,7 @@
enable = true; enable = true;
settings = { settings = {
main = { main = {
font = "FiraCode Nerd Font:size=13"; font = "FiraCode Nerd Font:size=12";
selection-target = "primary"; selection-target = "primary";
pad = "8x8"; pad = "8x8";
}; };

View File

@@ -1,18 +1,24 @@
{ ... }: { pkgs, ... }:
{ {
imports = imports =
map (x: ../../../home-manager + x) [ map (x: ../../../home-manager + x) [
"/features/development/development.nix" "/features/development/development.nix"
"/features/development/haskell.nix"
"/features/development/docker.nix" "/features/development/docker.nix"
"/features/development/haskell.nix"
"/features/development/markdown.nix"
"/features/development/typescript.nix"
"/features/eww"
"/features/linux-desktop.nix" "/features/linux-desktop.nix"
"/features/notes.nix" "/features/notes.nix"
"/features/eww"
] ]
++ [ ++ [
(import ../../../home-manager/features/wallpaper.nix [ "HDMI-A-1" ]) (import ../../../home-manager/features/wallpaper.nix [ "HDMI-A-1" ])
]; ];
home.packages = with pkgs; [
windsurf
];
home.stateVersion = "24.11"; home.stateVersion = "24.11";
home.username = "drew"; home.username = "drew";