nix/config
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

removed stylix, updated nvf

Browse source
This commit is contained in:
Natalie 2025-05-27 19:56:17 -07:00
parent 27be81d914
commit b3d5a28141
No known key found for this signature in database
GPG key ID: 61F4EAEB0C9C3D5F
10 changed files with 139 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
flake.lock
View file

@ -239,11 +239,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1701680307,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,11 +257,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1731533236,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,25 +290,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_6"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -324,9 +306,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -342,9 +324,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_9" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -360,21 +342,6 @@
"type": "github" "type": "github"
} }
}, },
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -547,48 +514,13 @@
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1746827285,
"narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746838955,
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
}
},
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1747499976, "lastModified": 1748278309,
"narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "72433a144c4ac16931e9148f78db4a0e4c147441", "rev": "486a17ba1279ab2357cae8ff66b309db622f8831",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -599,7 +531,7 @@
}, },
"moonlight": { "moonlight": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -686,7 +618,7 @@
}, },
"nix-options-search": { "nix-options-search": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
@ -850,20 +782,20 @@
"nvf": { "nvf": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"mnw": "mnw", "mnw": "mnw",
"nil": "nil", "nil": "nil",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1747525582, "lastModified": 1748318168,
"narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", "narHash": "sha256-pUDVxHarStrDYxd2tztz4SjNflzFxuMMEC3SK9WLUK8=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "d3a0e7029ac57eef1120225973247851c5b967b5", "rev": "74ba4d955976af1422ea1f095968e547db70aa04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -889,7 +821,6 @@
"apple-fonts": "apple-fonts", "apple-fonts": "apple-fonts",
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module",
"moonlight": "moonlight", "moonlight": "moonlight",
"nh": "nh", "nh": "nh",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
@ -1066,7 +997,7 @@
"nixpkgs" "nixpkgs"
], ],
"nur": "nur", "nur": "nur",
"systems": "systems_6", "systems": "systems_5",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
@ -1207,21 +1138,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_9": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": { "tinted-foot": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1328,7 +1244,7 @@
"zig": { "zig": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@ -1348,7 +1264,7 @@
"zig-overlay": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"zls", "zls",
"nixpkgs" "nixpkgs"
@ -1370,7 +1286,7 @@
}, },
"zls": { "zls": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"gitignore": "gitignore_3", "gitignore": "gitignore_3",
"langref": "langref", "langref": "langref",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",

12
flake.nix
View file

@ -3,10 +3,10 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
lix-module = { # lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; # };
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -47,7 +47,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
lix-module, # lix-module,
nixos-cosmic, nixos-cosmic,
darwin, darwin,
... ...
@ -97,7 +97,7 @@
inherit inherit
overlays overlays
nixpkgs nixpkgs
lix-module # lix-module
inputs inputs
mkNeovim mkNeovim
; ;

4
lib/mkSystem.nix
View file

@ -2,7 +2,7 @@
# particular architecture. # particular architecture.
{ {
nixpkgs, nixpkgs,
lix-module, # lix-module,
overlays, overlays,
inputs, inputs,
mkNeovim, mkNeovim,
@ -89,7 +89,7 @@ systemFunc {
# Use lix (alternative nix implementation) # Use lix (alternative nix implementation)
# https://lix.systems/add-to-config/#flake-based-configurations # https://lix.systems/add-to-config/#flake-based-configurations
lix-module.nixosModules.default # lix-module.nixosModules.default
# (getInputModule "lix-module" "default") # (getInputModule "lix-module" "default")
# Modules shared between nix-darwin and NixOS # Modules shared between nix-darwin and NixOS

8
modules/neovim/default.nix
View file

@ -3,7 +3,8 @@
lib, lib,
host, host,
... ...
}: { }:
{
# based on default options from upstream: # based on default options from upstream:
# https://github.com/NotAShelf/nvf/blob/main/configuration.nix # https://github.com/NotAShelf/nvf/blob/main/configuration.nix
# #
@ -132,7 +133,10 @@
} }
]; ];
}; };
image.enable = true; image = {
enable = true;
math.enabled = false;
};
notifier.timeout = 3000; notifier.timeout = 3000;
picker = { picker = {
enable = true; enable = true;

5
users/natalie/laptop/home.nix
View file

@ -15,5 +15,10 @@
sessionPath = [ sessionPath = [
"$HOME/.emacs.d/bin" "$HOME/.emacs.d/bin"
]; ];
packages = with pkgs; [
#PDF viewer for VimTeX
skimpdf
];
}; };
} }

16
users/natalie/packages.nix
View file

@ -1,6 +1,7 @@
# Packages installed with home-manager # Packages installed with home-manager
{ pkgs, ... }: { pkgs, ... }:
with pkgs; [ with pkgs;
[
#general development #general development
just just
pkg-config pkg-config
@ -62,15 +63,9 @@ with pkgs; [
#media #media
spotify spotify
zathura
#language servers #language servers
typst-live typst-live
lua-language-server
nil
nixd
texlab
texlivePackages.chktex
#formatters/linters #formatters/linters
stylua stylua
@ -79,14 +74,10 @@ with pkgs; [
#neovim deps #neovim deps
# TODO: from clo, maybe u can remove all of these? i don't wanna break tho # TODO: from clo, maybe u can remove all of these? i don't wanna break tho
lua51Packages.lua
lua51Packages.luarocks-nix
codespell
tree-sitter tree-sitter
zathura
#python #python
pyright pyright
basedpyright
ruff ruff
python312Packages.python python312Packages.python
python312Packages.pynvim python312Packages.pynvim
@ -107,7 +98,6 @@ with pkgs; [
#math #math
texlive.combined.scheme-full texlive.combined.scheme-full
zathura
#fun things #fun things
cowsay cowsay

2
users/natalie/user.nix
View file

@ -3,7 +3,7 @@ rec {
name = "Natalie"; # name/identifier name = "Natalie"; # name/identifier
email = "nmarks413@gmail.com"; # email (used for certain configurations) email = "nmarks413@gmail.com"; # email (used for certain configurations)
dotfilesDir = "~/.dotfiles"; # absolute path of the local repo dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
theme = "catppuccin-mocha"; # name of theme that stylix will use theme = null; # name of theme that stylix will use
browser = "firefox"; # Default browser; must select one from ./user/app/browser/ browser = "firefox"; # Default browser; must select one from ./user/app/browser/
term = "ghostty"; # Default terminal command; term = "ghostty"; # Default terminal command;
font = "iosevka"; # Selected font font = "iosevka"; # Selected font

16
users/natalie/vim.nix
View file

@ -39,12 +39,24 @@
tabline = { tabline = {
nvimBufferline.enable = true; nvimBufferline.enable = true;
}; };
# nvf versions is VERY outdated
# pluginOverrides = {
# hardtime-nvim = pkgs.fetchFromGitHub {
# owner = "m4xshen";
# repo = "hardtime.nvim";
# rev = "v1.0.1";
# hash = "sha256-5tqiSuGvBJcr8l6anEBojXEaaxFS1P5T1ROr46ylVhk=";
# };
# };
startPlugins = [
"nui-nvim"
];
binds = { binds = {
hardtime-nvim = { hardtime-nvim = {
enable = true; enable = true;
setupOpts = { setupOpts = {
restriction_mode = "block"; disable_mouse = false;
restriction_mode = "warn";
}; };
}; };
}; };

6
users/natalie/vim/languages.nix
View file

@ -110,6 +110,12 @@ in
tex = [ "chktex" ]; tex = [ "chktex" ];
haskell = [ "hlint" ]; haskell = [ "hlint" ];
}; };
linters = {
chktex = {
ignore_exitcode = true;
};
};
}; };
}; };
treesitter = { treesitter = {

68
users/natalie/vim/latex.nix
View file

@ -1,17 +1,24 @@
{pkgs, ...}: { { pkgs, host, ... }:
{
vim = { vim = {
lazy.plugins.cmp-vimtex = {
enabled = true;
package = pkgs.vimPlugins.cmp-vimtex;
lazy = false;
};
lazy.plugins.vimtex = { lazy.plugins.vimtex = {
enabled = true; enabled = true;
package = pkgs.vimPlugins.vimtex; package = pkgs.vimPlugins.vimtex;
lazy = true; lazy = false;
ft = "tex";
}; };
globals = { globals = {
tex_flavor = "latex"; tex_flavor = "latex";
maplocalleader = "\\"; maplocalleader = "\\";
vimtex_compiler_method = "latexmk"; vimtex_compiler_method = "latexmk";
vimtex_view_method = "zathura"; vimtex_view_method = if host.darwin then "skim" else "zathura";
vimtex_view_automatic = 1;
vimtex_compiler_latexmk = { vimtex_compiler_latexmk = {
callback = 1; callback = 1;
continuous = 1; continuous = 1;
@ -37,6 +44,59 @@
]; ];
}; };
autocomplete.blink-cmp = {
sourcePlugins = {
"blink.compat" = {
enable = true;
package = "blink-compat";
module = "blink.compat.source";
};
};
setupOpts = {
sources = {
default = [ "vimtex" ];
providers = {
vimtex = {
name = "vimtex";
module = "blink.compat.source";
score_offset = 100;
};
};
};
};
};
augroups = [
{
name = "VimTeX Events";
}
];
autocmds = [
{
pattern = [ "VimtexEventViewReverse" ];
event = [ "User" ];
desc = "Return to nvim after reverse search";
command = "call b:vimtex.viewer.xdo_focus_vim()";
group = "VimTeX Events";
}
{
pattern = [ "VimtexEventQuit" ];
event = [ "User" ];
desc = "Close pdf after exiting nvim";
command = "VimtexClean";
group = "VimTeX Events";
}
{
pattern = [ "VimtexEventInitPost" ];
event = [ "User" ];
desc = "Start compiling when opening nvim to a tex file";
command = "VimtexCompile";
group = "VimTeX Events";
}
];
lsp = { lsp = {
servers = { servers = {
texlab = { texlab = {