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

big cleanup

Browse source
This commit is contained in:
fwastring 2025-11-17 21:28:37 +01:00
parent e01f925f0a
commit 70b75d6faa
11 changed files with 64 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

1
maskiner/core/configuration.nix
View file

@ -110,6 +110,7 @@ in
}; };
}; };
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = myhostname; networking.hostName = myhostname;

32
moduler/dev.nix
View file

@ -7,9 +7,9 @@
... ...
}: }:
let let
go-migrate-pg = pkgs.go-migrate.overrideAttrs (oldAttrs: { # go-migrate-pg = pkgs.go-migrate.overrideAttrs (oldAttrs: {
tags = [ "postgres" ]; # tags = [ "postgres" ];
}); # });
in in
{ {
nix.settings.trusted-users = [ nix.settings.trusted-users = [
@ -19,46 +19,42 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Neovim # Neovim
inputs.neovim-nightly-overlay.packages.${pkgs.system}.default inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default
# Nix # Nix
devenv devenv
nixfmt-rfc-style nixfmt-rfc-style
opentofu
# Docker # Docker
dive dive
lazydocker lazydocker
# Jobb # Jobb
azure-cli
dotnetCorePackages.dotnet_9.sdk dotnetCorePackages.dotnet_9.sdk
jira-cli-go
gh gh
mermaid-cli
# Minio
awscli awscli
minio-client minio-client
# opentofu
# azure-cli
# jira-cli-go
# Blogging # Blogging
hugo
zola zola
# System Design # System Design
sqlc # sqlc
postgresql # postgresql
plantuml # plantuml
# Web Dev # Web Dev
tailwindcss # tailwindcss
prettierd prettierd
# Go # Go
air
go go
templ # air
go-migrate-pg # templ
# go-migrate-pg
# Build # Build
git git

3
moduler/home.nix
View file

@ -13,7 +13,7 @@
../moduler/kitty.nix ../moduler/kitty.nix
../moduler/dunst.nix ../moduler/dunst.nix
../moduler/nixpkgs.nix ../moduler/nixpkgs.nix
../moduler/firefox.nix # ../moduler/firefox.nix
../moduler/zathura.nix ../moduler/zathura.nix
../moduler/lazygit.nix ../moduler/lazygit.nix
../moduler/ssh.nix ../moduler/ssh.nix
@ -23,7 +23,6 @@
../moduler/programs/k9s ../moduler/programs/k9s
]; ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.fish.enable = true; programs.fish.enable = true;

18
moduler/lsp.nix
View file

@ -1,11 +1,8 @@
# This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{ {
inputs, inputs,
lib, lib,
config, config,
pkgs, pkgs,
myhostname,
... ...
}: }:
{ {
@ -14,19 +11,20 @@
nixd nixd
gopls gopls
omnisharp-roslyn omnisharp-roslyn
nodePackages.vscode-json-languageserver
tailwindcss-language-server
dockerfile-language-server dockerfile-language-server
nodejs_22
bash-language-server bash-language-server
helm-ls helm-ls
yaml-language-server yaml-language-server
vue-language-server
vtsls
typescript
typescript-language-server
lua-language-server lua-language-server
marksman marksman
tofu-ls tofu-ls
# nodejs_22
# vue-language-server
# vtsls
# typescript
# typescript-language-server
# nodePackages.vscode-json-languageserver
# tailwindcss-language-server
]; ];
} }

26
moduler/network.nix
View file

@ -16,23 +16,19 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
openvpn
networkmanagerapplet networkmanagerapplet
wireguard-tools
networkmanager networkmanager
openssh
(octodns.withProviders (ps: [
octodns-providers.gandi
]))
mtr # A network diagnostic tool
iperf3 iperf3
dnsutils # `dig` + `nslookup` dnsutils
ldns # replacement of `dig`, it provide the command `drill` aria2
aria2 # A lightweight multi-protocol & multi-source command-line download utility nmap
socat # replacement of openbsd-netcat ipcalc
nmap # A utility for network discovery and security auditing
ipcalc # it is a calculator for the IPv4/v6 addresses # openvpn
# openssh
# wireguard-tools
# (octodns.withProviders (ps: [
# octodns-providers.gandi
# ]))
]; ];
} }

16
moduler/programs.nix
View file

@ -1,11 +1,8 @@
# This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{ {
inputs, inputs,
lib, lib,
config, config,
pkgs, pkgs,
myhostname,
... ...
}: }:
{ {
@ -14,6 +11,7 @@
KERNEL=="ttyACM0", MODE:="666" KERNEL=="ttyACM0", MODE:="666"
ACTION=="add", KERNEL=="sd[a-e][0-9]", ENV{ID_FS_UUID}=="3039-3932", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/sdcard" ACTION=="add", KERNEL=="sd[a-e][0-9]", ENV{ID_FS_UUID}=="3039-3932", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/sdcard"
ACTION=="add", KERNEL=="sd[a-e]", ENV{ID_FS_UUID}=="66BA-4EBA", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/kobo" ACTION=="add", KERNEL=="sd[a-e]", ENV{ID_FS_UUID}=="66BA-4EBA", RUN+="${pkgs.systemd}/bin/systemd-mount --no-block -A -G -o gid=users,fmask=113,dmask=002 /dev/%k /mnt/kobo"
KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput"
''; '';
packages = with pkgs; [ packages = with pkgs; [
vial vial
@ -29,16 +27,15 @@
thunderbird thunderbird
discord discord
slack slack
vial
via
drawio drawio
freecad-wayland
evince evince
spotify spotify
ansible angryipscanner
# ansible
# freecad-wayland
# TUI # TUI
mpc
codex codex
# Browsers # Browsers
@ -55,7 +52,6 @@
devour devour
caligula caligula
ptouch-print ptouch-print
xev
# Transforms # Transforms
yt-dlp yt-dlp
@ -64,6 +60,6 @@
pinta pinta
pastel pastel
ffmpeg ffmpeg
darktable # darktable
]; ];
} }

8
moduler/programs/kubernetes-tools.nix
View file

@ -12,10 +12,10 @@
config = lib.mkIf config.kubernetes-tools.enable { config = lib.mkIf config.kubernetes-tools.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kubectl kubectl
buildkit # buildkit
argocd argocd
containerd # containerd
cri-tools # cri-tools
kubectx kubectx
(wrapHelm kubernetes-helm { (wrapHelm kubernetes-helm {
plugins = with pkgs.kubernetes-helmPlugins; [ plugins = with pkgs.kubernetes-helmPlugins; [
@ -25,7 +25,7 @@
helm-git helm-git
]; ];
}) })
k3sup # k3sup
]; ];
}; };

1
moduler/sound.nix
View file

@ -22,5 +22,4 @@
}; };
}; };
}; };
} }

56
moduler/ssh.nix
View file

@ -4,72 +4,42 @@
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
matchBlocks = { matchBlocks = {
"lth" = {
hostname = "login.student.lth.se";
port = 22;
user = "fr7658wa-s";
identityFile = "/home/fw/.ssh/id_rsa";
};
"git.wastring.com" = {
hostname = "git.wastring.com";
port = 80;
user = "git";
identityFile = "/home/fw/.ssh/id_ed25519";
};
"dm2" = { "dm2" = {
hostname = "192.168.0.190"; hostname = "192.168.0.190";
port = 22; port = 22;
user = "fw"; user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key"; identityFile = "/home/fw/.ssh/fw-ssh-key";
}; };
"mac" = { "caddy" = {
hostname = "192.168.0.149"; hostname = "192.168.0.214";
port = 22; port = 22;
user = "ifacts"; user = "ifacts";
identityFile = "/home/fw/.ssh/ifacts-ssh-key"; identityFile = "/home/fw/.ssh/id_ed25519";
}; };
"malmo" = { "wazuh" = {
hostname = "192.168.0.138"; hostname = "192.168.0.200";
port = 22; port = 22;
user = "ifacts"; user = "ifacts";
identityFile = "/home/fw/.ssh/ifacts-ssh-key"; identityFile = "/home/fw/.ssh/id_ed25519";
};
"nixos" = {
hostname = "192.168.0.218";
port = 22;
user = "fw";
identityFile = "/home/fw/.ssh/id_ed25519";
}; };
"kobo" = { "kobo" = {
hostname = "192.168.1.192"; hostname = "192.168.1.192";
port = 22; port = 22;
user = "root"; user = "root";
}; };
"kube01" = {
hostname = "192.168.0.177";
port = 22;
user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key";
};
"kube02" = {
hostname = "192.168.0.159";
port = 22;
user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key";
};
"kube03" = {
hostname = "192.168.0.182";
port = 22;
user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key";
};
"runner01" = {
hostname = "192.168.0.184";
port = 22;
user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key";
};
"docker03" = { "docker03" = {
hostname = "192.168.0.118"; hostname = "192.168.0.118";
port = 22; port = 22;
user = "fw"; user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key"; identityFile = "/home/fw/.ssh/fw-ssh-key";
}; };
"desktop" = { "node" = {
hostname = "192.168.1.227"; hostname = "192.168.1.227";
port = 22; port = 22;
user = "fw"; user = "fw";

13
moduler/system.nix
View file

@ -39,7 +39,7 @@
alsa-utils alsa-utils
# Monitor # Monitor
brightnessctl # brightnessctl
# System # System
sops sops
@ -71,7 +71,7 @@
fzf fzf
eza eza
rsync rsync
dust # dust
ripgrep ripgrep
fd fd
@ -87,17 +87,14 @@
lazygit lazygit
hyprpicker hyprpicker
# Terminal Stuff
chawan
go-passbolt-cli
# Typesetting # Typesetting
typst typst
typstyle typstyle
tinymist tinymist
websocat # websocat
nix-search-cli # nix-search-cli
libsixel # libsixel
( (
let let

2
moduler/tmux.nix
View file

@ -11,7 +11,7 @@
plugins = with pkgs; [ plugins = with pkgs; [
tmuxPlugins.sensible tmuxPlugins.sensible
tmuxPlugins.pain-control tmuxPlugins.pain-control
{ plugin = inputs.minimal-tmux.packages.${pkgs.system}.default; } { plugin = inputs.minimal-tmux.packages.${pkgs.stdenv.hostPlatform.system}.default; }
]; ];
extraConfig = '' extraConfig = ''
set -g set-clipboard on set -g set-clipboard on