cschmatzler/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
Christoph Schmatzler
2025-10-03 09:37:53 +00:00
parent 7eaf15441e
commit 5b65b1be62
12 changed files with 77 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
flake.lock generated
View File

@@ -3,16 +3,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1756059815, "lastModified": 1758543057,
"narHash": "sha256-UALOxoXoFIHbwKzcqbqCAqw5cC0MJEehLaWSet5vxfE=", "narHash": "sha256-lw3V2jOGYphUFHYQ5oARcb6urlbNpUCLJy1qhsGdUmc=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "02947ea4edbdef5fcce9ee57fa289547f4d096c9", "rev": "5b236456eb93133c2bd0d60ef35ed63f1c0712f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "4.6.7", "ref": "4.6.12",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758447883, "lastModified": 1758805352,
"narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -58,11 +58,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1759362264,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1759362264,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -135,11 +135,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758464306, "lastModified": 1759761710,
"narHash": "sha256-i56XRXqjwJRdVYmpzVUQ0ktqBBHqNzQHQMQvFRF/acQ=", "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "939e91e1cff1f99736c5b02529658218ed819a2a", "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -151,11 +151,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1758527843, "lastModified": 1759820126,
"narHash": "sha256-wMSROPpEDvvXrKQgYrs4g5DIDhMbvPylHK29UJJNfW0=", "narHash": "sha256-cI3AAv8E7nqYubCsyiK9yUbu4/VGCQxPK7OhuqxHgl0=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "b2e54c47433806a328297a8cec59f5e25a7c8a3d", "rev": "22a7df4cddadc0dcbd8979b0de71969499a84e76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -167,11 +167,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1758527680, "lastModified": 1759820815,
"narHash": "sha256-i+qOd7ihfFf1j09HveUfcaIF8jeNsod8uDE5et3iGVc=", "narHash": "sha256-+Vvp3P80aJdgRqIxgiib18jLufL8EU3v+mzn49no/Ow=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "894e3660c1145b8ecf242d6a2b6177af287c5e49", "rev": "77597d194798c9e61b0395d65d3119d6da4dba9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -213,11 +213,11 @@
"brew-src": "brew-src" "brew-src": "brew-src"
}, },
"locked": { "locked": {
"lastModified": 1756398546, "lastModified": 1758598228,
"narHash": "sha256-n4GVDLhKu65XFraJuCzap2AaZji4xhPaZMTJ8aQdD3s=", "narHash": "sha256-qr60maXGbZ4FX5tejPRI3nr0bnRTnZ3AbbbfO6/6jq4=",
"owner": "zhaofengli-wip", "owner": "zhaofengli-wip",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "3aa475996cb3bc1ecefa88c99c466e6f0bc17431", "rev": "f36e5db56e117f7df701ab152d0d2036ea85218c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -228,11 +228,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1758531458, "lastModified": 1759820878,
"narHash": "sha256-ms7H9jBSOjMySr8yuJmLwDn0elpMbckRF8gOUanXJJo=", "narHash": "sha256-1BZSdHl5r3KiH+NvI4dz7OQH/2rDSBsblBtO9pwN62U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e347d154312188158f25a4711b9763fe0ec955c9", "rev": "9bfda15c4dd398b0a5a174af8fce80383161a401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -259,11 +259,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1758294315, "lastModified": 1759632233,
"narHash": "sha256-H+C4c+jKCZpSJHODHFaY6b2ciB3Hv00V5QKA7yUVtis=", "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90ade7da38aa49c2e2693a04a44662a0e61530e9", "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -297,11 +297,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1758459270, "lastModified": 1759792642,
"narHash": "sha256-r2VA33WYfxDJyWmJeo0TmPPrk9yGS9WWb/kld0e7X+I=", "narHash": "sha256-BPZK3jHFFXWuQFDbR6wG8uIksmStODfwWp2TQEC1NEA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "92ba37a3e8c25d470f9affe8d5f36f2cfb21e5dd", "rev": "9bdedc05109b44f97cdf757b3910fda8f86bc28d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -320,11 +320,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758272005, "lastModified": 1758662783,
"narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=", "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "aa975a3757f28ce862812466c5848787b868e116", "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -375,11 +375,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758425756, "lastModified": 1759635238,
"narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
modules/darwin/homebrew.nix
View File

@@ -2,10 +2,9 @@
homebrew = { homebrew = {
enable = true; enable = true;
casks = [ casks = [
"hey-desktop"
"zen" "zen"
"pareto-security"
]; ];
masApps = {
"wipr2" = 1662217862;
};
}; };
} }

4
modules/darwin/packages.nix
View File

@@ -4,7 +4,7 @@ with pkgs; [
dockutil dockutil
mas mas
raycast raycast
tailscale # tailscale
whatsapp-for-mac
xcodes xcodes
# whatsapp-for-mac
] ]

3
modules/home/default.nix
View File

@@ -6,13 +6,14 @@
imports = [ imports = [
./atuin.nix ./atuin.nix
./bash.nix ./bash.nix
./jujutsu.nix
./bat.nix ./bat.nix
./direnv.nix ./direnv.nix
./eza.nix ./eza.nix
./fish.nix ./fish.nix
./fzf.nix ./fzf.nix
./git.nix ./git.nix
./jjui.nix
./jujutsu.nix
./mise.nix ./mise.nix
./neovim ./neovim
./opencode.nix ./opencode.nix

5
modules/home/jjui.nix Normal file
View File

@@ -0,0 +1,5 @@
{
programs.jjui = {
enable = true;
};
}

9
modules/home/neovim/plugins/lsp.nix
View File

@@ -9,6 +9,10 @@
inlayHints = true; inlayHints = true;
servers = { servers = {
nil_ls.enable = true; nil_ls.enable = true;
cssls.enable = true;
dockerls.enable = true;
elixirls.enable = true;
yamlls.enable = true;
vtsls = { vtsls = {
enable = true; enable = true;
package = pkgs.vtsls; package = pkgs.vtsls;
@@ -19,7 +23,6 @@
globalPlugins = [ globalPlugins = [
{ {
name = "@vue/typescript-plugin"; name = "@vue/typescript-plugin";
# Keep your working path to the language server package
location = "${pkgs.vue-language-server}/lib/language-tools/packages/language-server"; location = "${pkgs.vue-language-server}/lib/language-tools/packages/language-server";
languages = ["vue"]; languages = ["vue"];
configNamespace = "typescript"; configNamespace = "typescript";
@@ -30,10 +33,6 @@
}; };
}; };
}; };
cssls.enable = true;
dockerls.enable = true;
elixirls.enable = false;
yamlls.enable = true;
}; };
}; };
}; };

8
modules/nixos/default.nix
View File

@@ -8,12 +8,12 @@
}: { }: {
imports = [ imports = [
../core.nix ../core.nix
./firewall.nix ../syncthing.nix
./ssh.nix ../tailscale.nix
./adguard.nix ./adguard.nix
./docker.nix ./docker.nix
../tailscale.nix ./firewall.nix
../syncthing.nix ./ssh.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
]; ];

1
modules/packages.nix
View File

@@ -19,7 +19,6 @@ with pkgs; [
gnupg gnupg
htop htop
hyperfine hyperfine
jjui
jq jq
killall killall
lsof lsof

12
modules/tailscale.nix
View File

@@ -1,13 +1,7 @@
{ {lib, pkgs, ...}: {
pkgs, services.tailscale = {
lib,
...
}: {
services.tailscale =
{
enable = true; enable = true;
} } // lib.optionalAttrs pkgs.stdenv.isLinux {
// lib.optionalAttrs pkgs.stdenv.isLinux {
openFirewall = true; openFirewall = true;
useRoutingFeatures = "server"; useRoutingFeatures = "server";
}; };

15
overlays/default.nix
View File

@@ -1,16 +1,17 @@
{ inputs }: {inputs}: let
let
dir = builtins.readDir ./.; dir = builtins.readDir ./.;
overlayNames = builtins.sort builtins.lessThan (builtins.filter ( overlayNames = builtins.sort builtins.lessThan (builtins.filter (
name: name:
name != "default.nix" name
!= "default.nix"
&& dir.${name} == "regular" && dir.${name} == "regular"
&& builtins.match ".*\\.nix" name != null && builtins.match ".*\\.nix" name != null
) (builtins.attrNames dir)); ) (builtins.attrNames dir));
overlayPath = name: overlayPath = name:
builtins.toPath "${builtins.toString ./.}/${name}"; builtins.toPath "${builtins.toString ./.}/${name}";
loadOverlay = name: loadOverlay = name: let
let
overlayModule = import (overlayPath name); overlayModule = import (overlayPath name);
in overlayModule { inherit inputs; }; in
in map loadOverlay overlayNames overlayModule {inherit inputs;};
in
map loadOverlay overlayNames

3
overlays/zjstatus.nix
View File

@@ -1,4 +1,3 @@
{ inputs }: {inputs}: final: prev: {
final: prev: {
zjstatus = inputs.zjstatus.packages.${prev.system}.default; zjstatus = inputs.zjstatus.packages.${prev.system}.default;
} }