diff --git a/flake.lock b/flake.lock index 9d0f73a..b019e0a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,35 @@ ] }, "locked": { - "lastModified": 1743788974, - "narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=", + "lastModified": 1746040799, + "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", "owner": "nix-community", "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" }, "original": { "owner": "nix-community", - "ref": "master", "repo": "home-manager", "type": "github" } @@ -68,6 +87,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "home-manager-unstable": "home-manager-unstable", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", diff --git a/flake.nix b/flake.nix index 7d4caca..bae259b 100644 --- a/flake.nix +++ b/flake.nix @@ -9,12 +9,16 @@ url = "github:nixos/nixpkgs?ref=nixos-24.11"; }; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; + home-manager-unstable = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; # hyprland = { # url = "github:hyprwm/Hyprland"; - # inputs.nixpkgs.follows = "nixpkgs-stable"; + # inputs.nixpkgs.follows = "nixpkgs-unstable"; # }; # hy3 = { # url = "github:outfoxxed/hy3"; @@ -66,6 +70,7 @@ }; vega = mkNixosConfig { path = ./system/hosts/vega; + nixpkgs = inputs.nixpkgs-unstable; # Required for Tailwind until 25.05 is cut }; mcp = mkNixosConfig { path = ./system/hosts/mcp; diff --git a/home-manager/features/development/markdown.nix b/home-manager/features/development/markdown.nix new file mode 100644 index 0000000..f00f758 --- /dev/null +++ b/home-manager/features/development/markdown.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + markdownlint-cli2 # linter + ]; +} diff --git a/home-manager/features/development/typescript.nix b/home-manager/features/development/typescript.nix new file mode 100644 index 0000000..16a9cbf --- /dev/null +++ b/home-manager/features/development/typescript.nix @@ -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 + ]; +} diff --git a/home-manager/features/eww/default.nix b/home-manager/features/eww/default.nix index 888e33a..f80bd60 100644 --- a/home-manager/features/eww/default.nix +++ b/home-manager/features/eww/default.nix @@ -2,7 +2,10 @@ { home.packages = with pkgs; [ # For Noto Sans NF - nerdfonts + # 25.05 + nerd-fonts.noto + # 24.11 + # (nerdfonts.override { fonts = [ "NotoSans" ]; }) ]; programs.eww = { diff --git a/home-manager/features/neovim/config/lua/plugins/obsidian.lua b/home-manager/features/neovim/config/lua/plugins/obsidian.lua index 23b4503..8c59bf4 100644 --- a/home-manager/features/neovim/config/lua/plugins/obsidian.lua +++ b/home-manager/features/neovim/config/lua/plugins/obsidian.lua @@ -35,5 +35,9 @@ return { date_format = "%Y-%m-%d", time_format = "%H:%M", }, + ui = { + -- Disable the UI features and let render-markdown.nvim handle it. + enable = false, + }, }, } diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix index 9c6a38d..023d491 100644 --- a/home-manager/features/terminal.nix +++ b/home-manager/features/terminal.nix @@ -5,12 +5,12 @@ home.packages = with pkgs; [ # Font # 24.11 - inconsolata-nerdfont - fira-code-nerdfont + # inconsolata-nerdfont + # fira-code-nerdfont # 25.05 - # nerd-fonts.inconsolata - # nerd-fonts.fira-code - # nerd-fonts.jetbrains-mono + nerd-fonts.inconsolata + nerd-fonts.fira-code + nerd-fonts.jetbrains-mono libsixel # For working with images in terminals ]; @@ -50,7 +50,7 @@ enable = true; settings = { main = { - font = "FiraCode Nerd Font:size=13"; + font = "FiraCode Nerd Font:size=12"; selection-target = "primary"; pad = "8x8"; }; diff --git a/system/hosts/vega/drew.nix b/system/hosts/vega/drew.nix index 5c039ef..6995b96 100644 --- a/system/hosts/vega/drew.nix +++ b/system/hosts/vega/drew.nix @@ -1,18 +1,24 @@ -{ ... }: +{ pkgs, ... }: { imports = map (x: ../../../home-manager + x) [ "/features/development/development.nix" - "/features/development/haskell.nix" "/features/development/docker.nix" + "/features/development/haskell.nix" + "/features/development/markdown.nix" + "/features/development/typescript.nix" + "/features/eww" "/features/linux-desktop.nix" "/features/notes.nix" - "/features/eww" ] ++ [ (import ../../../home-manager/features/wallpaper.nix [ "HDMI-A-1" ]) ]; + home.packages = with pkgs; [ + windsurf + ]; + home.stateVersion = "24.11"; home.username = "drew";