erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:3d3b69452766fe4ebf33cc6dc02e782a7845a525
Branches Tags
erwin:main
..
compare: erwin:f7dead6bd4d332478ab4ee44f876f3bf6ce655da
Branches Tags
erwin:main

No commits in common. "3d3b69452766fe4ebf33cc6dc02e782a7845a525" and "f7dead6bd4d332478ab4ee44f876f3bf6ce655da" have entirely different histories.
3d3b694527 ... f7dead6bd4

6 changed files with 54 additions and 46 deletions
Show stats Expand all files Collapse all files

78
flake.lock generated
View file

@ -54,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713166406, "lastModified": 1712750567,
"narHash": "sha256-lPAdHkIQBydROJ2e6t0nFP9X220GQ4sEwb5lFQBGYb0=", "narHash": "sha256-VHP7ESpUHb5STZfbZyMDGz9g+xsgGdJGa8iX4rkFYz8=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "50a73f055288d72eeeb128233e2a04bc88a5d5e8", "rev": "0da8d34425ef83395759db79377025c062a69911",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713152224, "lastModified": 1712798444,
"narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=", "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e", "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -216,11 +216,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1713154103, "lastModified": 1712800011,
"narHash": "sha256-7tpbjpUI7YDpxP0ciM9bWBxzAT3jsZP9l8EGWFQVBmU=", "narHash": "sha256-mEL4y1N/aQrI+OeYHm6Sol8lpDVsceCc2TJF8+uMv6Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "1b01966ee01008bcec18702ea5e543b93236ecef", "rev": "9b79fd139ff55062e46191bd5dd42fcb79696328",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,11 +240,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713106678, "lastModified": 1712401919,
"narHash": "sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg=", "narHash": "sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "1e37f53e99016aa2cd725d7050788bb5d4fcc76a", "rev": "ebe5f349d184e79edc33199d064d9ec5f1e4dd9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,11 +560,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713166971, "lastModified": 1712759992,
"narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -652,11 +652,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713026309, "lastModified": 1712668238,
"narHash": "sha256-345jReT2AFR6VK0KYAEmIjsMvlCCFsoT0Xaku6Nw1fQ=", "narHash": "sha256-99MkjQdZlEJ4292bUtHx7C07pDSbU9syEb3lc+FrPkw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld-rs", "repo": "nix-ld-rs",
"rev": "6b76b4aa158819d6bce637485c4cdd710517c6ce", "rev": "f1c82bda746815f2162a9cc959296bfa0fc50499",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -667,11 +667,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1712909959, "lastModified": 1712760404,
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -732,11 +732,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1713013257, "lastModified": 1712588820,
"narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -764,11 +764,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1713042715, "lastModified": 1712437997,
"narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=", "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e", "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -780,11 +780,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1712608508,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -835,11 +835,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1712897695, "lastModified": 1712579741,
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "narHash": "sha256-igpsH+pa6yFwYOdah3cFciCk8gw+ytniG9quf5f/q84=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "rev": "70f504012f0a132ac33e56988e1028d88a48855c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -911,11 +911,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713150335, "lastModified": 1712801594,
"narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=", "narHash": "sha256-KZJnVw3TdfDyUhvClzgy3IEoC9tRhvG0yM+lHfqAm34=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b186d85e747e2b7bee220ec95839fb66c868dc47", "rev": "35ebec41fcdeeae8e012e7d62ba153a13645227f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -932,11 +932,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1713066950, "lastModified": 1712617241,
"narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=", "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87", "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
home-manager/modules/fish/default.nix
View file

@ -45,10 +45,7 @@ in
vim = mkIf config.eboskma.programs.neovim.enable "nvim"; vim = mkIf config.eboskma.programs.neovim.enable "nvim";
vi = mkIf config.eboskma.programs.neovim.enable "nvim"; vi = mkIf config.eboskma.programs.neovim.enable "nvim";
}; };
interactiveShellInit = '' interactiveShellInit = "";
set -Ux CARAPACE_BRIDGES 'zsh,fish,bash,inshellisense'
${pkgs.carapace}/bin/carapace _carapace | source
'';
}; };
fzf = { fzf = {

2
home-manager/modules/fish/functions.nix
View file

@ -71,7 +71,7 @@
else if [ "$channel" = "distortion" ] else if [ "$channel" = "distortion" ]
set pls_url "https://playerservices.streamtheworld.com/pls/KINK_DISTORTIONAAC.pls" set pls_url "https://playerservices.streamtheworld.com/pls/KINK_DISTORTIONAAC.pls"
end end
set -f stream_url (${pkgs.curl}/bin/curl -sSL "$pls_url" | grep File | shuf | head -n 1 | awk -F '=' 'BEGIN { RS="\r\n" } { print $2 }') set -f stream_url (${pkgs.curl}/bin/curl -sSL $pls_url | grep File | shuf | head -n 1 | awk -F '=' 'BEGIN { RS="\r\n" } { print $2 }')
mpc clear mpc clear
mpc add "$stream_url" mpc add "$stream_url"
mpc play mpc play

1
machines/default.nix
View file

@ -62,6 +62,7 @@ inputs: {
targetUser = "erwin"; targetUser = "erwin";
buildOn = "local"; buildOn = "local";
substituteOnTarget = true; substituteOnTarget = true;
tags = [ "container" ];
}; };
}; };
loki = { loki = {

5
machines/proxy/configuration.nix
View file

@ -33,6 +33,11 @@
externalHostname = "frigate.datarift.nl"; externalHostname = "frigate.datarift.nl";
proxyAddress = "frigate.barn-beaver.ts.net:5000"; proxyAddress = "frigate.barn-beaver.ts.net:5000";
} }
{
externalHostname = "git.datarift.nl";
proxyAddress = "gitea.barn-beaver.ts.net:3000";
external = true;
}
{ {
externalHostname = "minio.datarift.nl"; externalHostname = "minio.datarift.nl";
proxyAddress = "minio.barn-beaver.ts.net:9000"; proxyAddress = "minio.barn-beaver.ts.net:9000";

9
users/erwin/home.nix
View file

@ -182,6 +182,7 @@ in
packages = packages =
with pkgs; with pkgs;
[ [
ardour
atool atool
inputs.attic.packages.${pkgs.system}.attic-client inputs.attic.packages.${pkgs.system}.attic-client
# bitwarden # bitwarden
@ -197,6 +198,7 @@ in
freecad freecad
gnome.nautilus gnome.nautilus
helvum helvum
horizon-eda
imagemagick imagemagick
(imv.override { (imv.override {
withBackends = [ withBackends = [
@ -208,7 +210,7 @@ in
]; ];
}) })
iotop iotop
# (jetbrains.clion.override { jdk = pkgs.jetbrains.jdk; }) (jetbrains.clion.override { jdk = pkgs.jetbrains.jdk; })
kicad kicad
kubectl kubectl
kubernetes-helm kubernetes-helm
@ -228,12 +230,15 @@ in
procs procs
prusa-slicer prusa-slicer
qgis qgis
quintom-cursor-theme
remmina remmina
ripgrep ripgrep
sshfs scid-vs-pc
signal-desktop
steam steam
steamcmd steamcmd
steam-tui steam-tui
stellarium
# super-slicer-latest # super-slicer-latest
units units
unzip unzip