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

some fixes

Browse source
This commit is contained in:
Dennis Schoepf 2026-03-03 23:19:56 +00:00
parent 257a49faac
commit 555c53d8a3
16 changed files with 114 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/bluetooth/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ inputs, ... }:
{
flake.modules.nixos.ssh =
{ pkgs, ... }:
{
hardware.bluetooth = {
enable = true;
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
Experimental = true;
};
};
};
};
}

1
modules/cli-tools/default.nix
View file

@ -15,6 +15,7 @@ let
just
mmv-go
usbutils
lazygit
];
in
{

58
modules/git/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ inputs, ... }:
{
flake.modules.nixos.git =
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
git
];
home-manager.sharedModules = [
inputs.self.modules.homeManager.git
];
};
flake.modules.darwin.git =
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
git
];
home-manager.sharedModules = [
inputs.self.modules.homeManager.git
];
};
flake.modules.homeManager.git =
{ pkgs, config, ... }:
{
programs.git = {
enable = true;
settings = {
init = {
defaultBranch = "main";
};
core = {
ignorecase = "false";
};
pull = {
rebase = false;
};
push = {
autoSetupRemote = true;
};
user = {
# TODO get from config
name = "Dennis Schoepf";
email = "me@dnsc.io";
};
};
ignores = [ ".DS_Store" ];
};
};
}

3
modules/hosts/dnsc-machine/default.nix
View file

@ -9,11 +9,14 @@ in
home-manager
base
shell
git
ssh
neovim
cli-tools
nix
nvidia-graphics
drawing-tablet
bluetooth
printing
desktop
terminal

2
modules/neovim/colorscheme.nix → modules/neovim/_colorscheme.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-colorscheme = {
programs.nixvim = {
colorscheme = "winterly";
@ -12,5 +11,4 @@
# discovers it automatically
extraFiles."colors/winterly.lua".source = ./extraFiles/winterly.lua;
};
};
}

2
modules/neovim/completion.nix → modules/neovim/_completion.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-completion = {
programs.nixvim.plugins.blink-cmp = {
enable = true;
settings = {
@ -28,5 +27,4 @@
cmdline.completion.menu.auto_show = true;
};
};
};
}

2
modules/neovim/editing.nix → modules/neovim/_editing.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-editing = { pkgs, ... }: {
programs.nixvim = {
plugins.sleuth.enable = true;
plugins.nvim-surround.enable = true;
@ -78,5 +77,4 @@
}
];
};
};
}

2
modules/neovim/formatter.nix → modules/neovim/_formatter.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-formatter = { pkgs, ... }: {
programs.nixvim.plugins.conform-nvim = {
enable = true;
settings = {
@ -53,5 +52,4 @@
};
extraPackages = [ pkgs.stylua ];
};
};
}

2
modules/neovim/git.nix → modules/neovim/_git.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-git = {
programs.nixvim = {
plugins.gitportal = {
enable = true;
@ -29,5 +28,4 @@
}
];
};
};
}

2
modules/neovim/keybindings.nix → modules/neovim/_keybindings.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-keybindings = {
programs.nixvim = {
plugins.which-key = {
enable = true;
@ -130,5 +129,4 @@
}
];
};
};
}

2
modules/neovim/lsp.nix → modules/neovim/_lsp.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-lsp = { pkgs, ... }: {
programs.nixvim = {
plugins.lspconfig.enable = true;
@ -198,5 +197,4 @@
severity_sort = false;
};
};
};
}

2
modules/neovim/options.nix → modules/neovim/_options.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-options = {
programs.nixvim = {
globals = {
mapleader = " ";
@ -48,5 +47,4 @@
foldlevelstart = 99;
};
};
};
}

2
modules/neovim/picker.nix → modules/neovim/_picker.nix
View file

@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.homeManager.neovim-picker = { pkgs, ... }: {
programs.nixvim = {
plugins.oil = {
enable = true;
@ -170,5 +169,4 @@
}
];
};
};
}

26
modules/neovim/default.nix
View file

@ -3,6 +3,22 @@
...
}:
{
flake.modules.nixos.neovim =
{ pkgs, ... }:
{
home-manager.sharedModules = [
inputs.self.modules.homeManager.neovim
];
};
flake.modules.darwin.neovim =
{ pkgs, ... }:
{
home-manager.sharedModules = [
inputs.self.modules.homeManager.neovim
];
};
flake.modules.homeManager.neovim = { pkgs, ... }: {
imports = [ inputs.nixvim.homeModules.nixvim ];
programs.nixvim = {
@ -11,6 +27,16 @@
package = pkgs.neovim-unwrapped;
vimAlias = true;
vimdiffAlias = true;
imports = [
./_colorscheme.nix
./_completion.nix
./_editing.nix
./_formatter.nix
./_keybindings.nix
./_lsp.nix
./_options.nix
./_picker.nix
];
};
};
}

99
modules/neovim/statusline.nix
View file

@ -1,99 +0,0 @@
{ ... }:
{
flake.modules.homeManager.neovim-statusline = {
programs.nixvim.plugins.lualine = {
enable = true;
settings = {
options = {
theme = {
__raw = "winterly_lualine";
};
icons_enabled = false;
component_separators = {
left = "|";
right = "|";
};
section_separators = {
left = "";
right = "";
};
};
sections = {
lualine_a = [
{
__unkeyed-1 = "mode";
fmt = {
__raw = "function(str) return str:sub(1, 1) end";
};
}
];
lualine_b = [
{
__unkeyed-1 = "filename";
file_status = true;
newfile_status = false;
path = 4;
shorting_target = 120;
symbols = {
modified = "[+]";
readonly = "[-]";
unnamed = "[No Name]";
newfile = "[New]";
};
}
"encoding"
];
lualine_c = null;
lualine_x = null;
lualine_y = [
"branch"
"diff"
"diagnostics"
];
lualine_z = [
"location"
];
};
};
# Sets up my custom colorscheme
luaConfig.pre = /* lua */ ''
local palette = require("dnsc.palette")
local winterly_lualine = {
normal = {
a = { bg = palette.magenta, fg = palette.bg, gui = "bold" },
b = { bg = palette.bg_secondary, fg = palette.magenta },
c = { bg = palette.bg_secondary, fg = palette.magenta },
},
insert = {
a = { bg = palette.cyan_bright, fg = palette.bg, gui = "bold" },
b = { bg = palette.bg_secondary, fg = palette.cyan_bright },
c = { bg = palette.bg_secondary, fg = palette.cyan_bright },
},
visual = {
a = { bg = palette.blue_bright, fg = palette.bg, gui = "bold" },
b = { bg = palette.bg_secondary, fg = palette.blue_bright },
c = { bg = palette.bg_secondary, fg = palette.blue_bright },
},
replace = {
a = { bg = palette.red_bright, fg = palette.bg, gui = "bold" },
b = { bg = palette.bg_secondary, fg = palette.red_bright },
c = { bg = palette.bg_secondary, fg = palette.red_bright },
},
command = {
a = { bg = palette.green_bright, fg = palette.bg, gui = "bold" },
b = { bg = palette.bg_secondary, fg = palette.green_bright },
c = { bg = palette.bg_secondary, fg = palette.green_bright },
},
inactive = {
a = { bg = palette.bg_secondary, fg = palette.fg_dim },
b = { bg = palette.bg_secondary, fg = palette.fg_dim },
c = { bg = palette.bg_secondary, fg = palette.fg_dim },
},
}
'';
};
};
}

10
modules/terminal/default.nix
View file

@ -3,6 +3,11 @@
flake.modules.nixos.terminal =
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
tmux
tmuxinator
];
home-manager.sharedModules = [
inputs.self.modules.homeManager.terminal
];
@ -11,6 +16,11 @@
flake.modules.darwin.terminal =
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
tmux
tmuxinator
];
home-manager.sharedModules = [
inputs.self.modules.homeManager.terminal
];