thegeneralist01/config-new
1
Fork 0
Code Issues Pull requests Activity

prep main darwin config

Browse source
This commit is contained in:
TheGeneralist 2025-05-29 15:35:31 +02:00
parent 50da7ffff8
commit 523aaff701
No known key found for this signature in database
GPG key ID: C391D4D52D630F45
32 changed files with 423 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/linux/agenix.nix
View file

@ -1,9 +0,0 @@
{ pkgs, ... }: {
environment.systemPackages = with pkgs; [
agenix
];
age.identityPaths = [
"/home/thegeneralist/.ssh/id_ed25519"
];
}

15
modules/linux/dns.nix Normal file
View file

@ -0,0 +1,15 @@
{ config, lib, ... }: let
inherit (lib) concatStringsSep;
in {
# TODO: add fallback & check other options
services.resolved = {
enable = true;
extraConfig = config.dnsServers
|> map (server: "DNS=${server}")
|> concatStringsSep "\n";
dnssec = "true";
dnsovertls = "true";
};
}

29
modules/linux/ghostty.nix
View file

@ -1,29 +0,0 @@
{ pkgs, ... }: {
environment.variables = {
TERMINAL = "ghostty";
};
home-manager.sharedModules = [{
programs.ghostty = {
enable = true;
package = pkgs.ghostty;
clearDefaultKeybinds = false;
settings = {
theme = "tokyonight";
font-family = "JetBrainsMono NL NFM Medium";
font-size = 16;
shell-integration-features = "no-cursor";
cursor-style = "block";
background-opacity = 1;
background-blur-radius = 0;
gtk-titlebar = false;
mouse-hide-while-typing = true;
};
};
}];
}

27
modules/linux/git.nix
View file

@ -1,27 +0,0 @@
{
home-manager.sharedModules = [{
programs.git = {
enable = true;
userName = "TheGeneralist";
userEmail = "180094941+thegeneralist01@users.noreply.github.com";
lfs = {
enable = true;
};
extraConfig = {
commit.gpgSign = true;
tag.gpgSign = true;
gpg.format = "ssh";
user.signingKey = "~/.ssh/id_ed25519";
};
};
programs.gh = {
enable = true;
};
programs.gh-dash = {
enable = true;
};
}];
}

41
modules/linux/neovim.nix
View file

@ -1,41 +0,0 @@
{ pkgs, lib, ... }: {
environment.variables.EDITOR = "nvim";
home-manager.sharedModules = [{
programs.neovim = {
enable = true;
extraLuaConfig = lib.fileContents ../home/dotfiles/nvim/init.lua;
};
home.sessionVariables = {
EDITOR = "nvim";
};
home.packages = with pkgs; [
vimPlugins.markdown-preview-nvim
# Lua
luajitPackages.luarocks_bootstrap
lua-language-server
python311
nodejs
nodePackages."sass"
gcc_multi
#llvmPackages_20.clangWithLibcAndBasicRtAndLibcxx
];
home.file.".config/i3status" = {
source = ../home/dotfiles/i3status;
force = true;
recursive = true;
};
}];
programs.npm.npmrc = ''
prefix=~/.npm-packages
color=true
'';
}

8
modules/linux/nix.nix
View file

@ -1,8 +0,0 @@
{
# todo: gc
nix.settings.experimental-features = [
"flakes"
"nix-command"
"pipe-operators"
];
}

33
modules/linux/nushell/config.nu
View file

@ -1,33 +0,0 @@
$env.config.buffer_editor = "/home/thegeneralist/.nix-profile/bin/nvim"
$env.config.show_banner = false
# Basic Aliases
alias v = nvim .
alias ff = fastfetch --load-config examples/10.jsonc
alias g = glimpse --interactive -o both -f llm.md
def gg [] {
open llm.md | save -r /dev/stdout | ^xclip -sel c
}
alias rn = yazi
# Zoxide init
#^zoxide init nushell | save --force ~/.config/nushell/zoxide.nu
#source ~/.config/nushell/zoxide.nu
alias c = clear
alias e = exa
alias el = exa -la
alias l = ls -a
alias ll = ls -la
alias cl = c; l
alias ap = cd ~/personal
alias ad = cd ~/Downloads
alias ab = cd ~/books
alias a = cd ~
alias ah = cd ~/dotfiles/hosts/thegeneralist
alias ai3 = nvim /home/thegeneralist/dotfiles/hosts/thegeneralist/dotfiles/i3/config
# alias rb = sudo nixos-rebuild switch --flake ~/dotfiles#thegeneralist
alias rb = nh os switch . -v -- --show-trace --verbose
source ~/.zoxide.nu

49
modules/linux/nushell/default.nix
View file

@ -1,49 +0,0 @@
{ config, pkgs, lib, ... }: let
inherit (lib) readFile;
in {
# TODO: starship + change the zoxide src
# TODO: Rust tooling
environment = {
systemPackages = with pkgs; [
nushell
zoxide
ripgrep
jq
yq-go
eza
fzf
gh
fastfetch
];
shellAliases = {
v = "nvim .";
ff = "fastfetch --load-config examples/10.jsonc";
g = "glimpse --interactive -o both -f llm.md";
gg = "open llm.md | save -r /dev/stdout | ^xclip -sel c";
rn = "yazi";
c = "clear";
e = "exa";
el = "exa -la";
l = "ls -a";
ll = "ls -la";
cl = "c; l";
ap = "cd ~/personal";
ad = "cd ~/Downloads";
ab = "cd ~/books";
a = "cd ~";
ah = "cd ~/dotfiles/hosts/thegeneralist";
ai3 = "nvim /home/thegeneralist/dotfiles/hosts/thegeneralist/dotfiles/i3/config";
rb = "nh os switch . -v -- --show-trace --verbose";
};
};
home-manager.sharedModules = [{
programs.nushell = {
enable = true;
configFile.text = readFile ./config.nu;
envFile.text = readFile ./env.nu;
environmentVariables = config.environment.variables;
};
}];
}

31
modules/linux/nushell/env.nu
View file

@ -1,31 +0,0 @@
# NVM
# TODO: this
# source ("/Users/thegeneralist/.nvm/" | path join "nvm.sh")
# GPG TTY
# $env.GPG_TTY = (tty)
# Extra PATHs
# $env.PATH = [
# # "/home/thegeneralist/AppImages"
# # ($env.HOME | path join "personal/zen")
# # ($env.HOME | path join ".local/scripts")
# # ($env.HOME | path join ".local/bin")
# # ($env.HOME | path join ".bun/bin")
# # ($env.HOME | path join ".nix-profile/bin")
# # "/nix/var/nix/profiles/default/bin"
# # ($env.HOME | path join ".local/share/pnpm")
# # "/usr/bin"
# # "/usr/sbin"
# # "/sbin"
# # "/Applications/Ghostty.app/Contents/MacOS"
# # ($env.HOME | path join ".local/bin")
# # ($env.HOME | path join ".cargo/env")
# # ($env.HOME | path join ".cargo/bin")
# # "/usr/local/go/bin"
# # ($env.HOME | path join "go/bin")
# # ($env.HOME | path join ".npm-packages/bin")
# # ($env.HOME | path join ".Android/Sdk/platform-tools")
# # ($env.HOME | path join ".Android/Sdk/emulator")
# ] ++ $env.PATH

7
modules/linux/packages.nix
View file

@ -1,13 +1,8 @@
{ pkgs, lib, agenix, ...}: let
{ pkgs, lib, ...}: let
inherit (lib) attrValues;
in {
environment.systemPackages = attrValues {
inherit (pkgs)
wget
zsh
neovim
vim
home-manager
protonup-qt
pipewire
pwvucontrol

4
modules/linux/ssh.nix
View file

@ -6,8 +6,4 @@
PasswordAuthentication = false;
};
};
networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [ 22 ];
# networking.firewall.allowedUDPPorts = [ ... ];
}

9
modules/linux/tailscale.nix
View file

@ -1,4 +1,4 @@
{ config, ... }: {
{ config, ...}: {
age.secrets.tailscaleMarshall.file = ./tailscale-marshall.age;
services.tailscale = {
enable = true;
@ -11,7 +11,10 @@
authKeyFile = config.age.secrets.tailscaleMarshall.path;
};
networking.nameservers = [ "100.100.100.100" "8.8.8.8" "1.1.1.1" ];
networking.search = [ "shorthair-wall.ts.net" ];
networking.firewall.enable = true;
networking.firewall.trustedInterfaces = [ "tailscale0" ];
# for SSH
networking.firewall.allowedTCPPorts = [ 22 ];
networking.nameservers = [ "100.100.100.100" "8.8.8.8" "1.1.1.1" ];
}

11
modules/linux/zsh.nix
View file

@ -1,11 +0,0 @@
{
home-manager.sharedModules = [{
programs.zsh = {
enable = true;
enableCompletion = true;
autocd = true;
autosuggestion.enable = true;
};
}];
environment.pathsToLink = [ "/share/zsh" ];
}