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

Compare commits

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

6 commits
f7dead6bd4 ... 3d3b694527

Author SHA1 Message Date
Erwin Boskma
3d3b694527
Remove tags from k3s-test 2024-04-15 17:01:12 +02:00
Erwin Boskma
26b7af5aa0
home: Add sshfs, remove unused packages 2024-04-15 16:30:27 +02:00
Erwin Boskma
193de35f12
proxy: Remove git 2024-04-15 16:29:53 +02:00
Erwin Boskma
dde0f53c4d
fish: Fix kink function 2024-04-15 16:29:31 +02:00
Erwin Boskma
4751d47e23
Use carapace in fish 2024-04-15 16:29:21 +02:00
Erwin Boskma
ee5c3adc0f
flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/0da8d34425ef83395759db79377025c062a69911?narHash=sha256-VHP7ESpUHb5STZfbZyMDGz9g%2BxsgGdJGa8iX4rkFYz8%3D' (2024-04-10)
  → 'github:atuinsh/atuin/50a73f055288d72eeeb128233e2a04bc88a5d5e8?narHash=sha256-lPAdHkIQBydROJ2e6t0nFP9X220GQ4sEwb5lFQBGYb0%3D' (2024-04-15)
• Updated input 'disko':
    'github:nix-community/disko/a297cb1cb0337ee10a7a0f9517954501d8f6f74d?narHash=sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh%2Bsk%3D' (2024-04-11)
  → 'github:nix-community/disko/bb5ba68ebb73b5ca7996b64e1457fe885891e78e?narHash=sha256-k1aV06cotPwWO3FW%2Bho%2BdEoGjxNM303%2BUmhiG2o6XPs%3D' (2024-04-15)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/9b79fd139ff55062e46191bd5dd42fcb79696328?narHash=sha256-mEL4y1N/aQrI%2BOeYHm6Sol8lpDVsceCc2TJF8%2BuMv6Y%3D' (2024-04-11)
  → 'github:nix-community/emacs-overlay/1b01966ee01008bcec18702ea5e543b93236ecef?narHash=sha256-7tpbjpUI7YDpxP0ciM9bWBxzAT3jsZP9l8EGWFQVBmU%3D' (2024-04-15)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167?narHash=sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y%3D' (2024-04-08)
  → 'github:NixOS/nixpkgs/90055d5e616bd943795d38808c94dbf0dd35abe8?narHash=sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib%2B8%3D' (2024-04-13)
• Updated input 'eww':
    'github:elkowar/eww/ebe5f349d184e79edc33199d064d9ec5f1e4dd9b?narHash=sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY%3D' (2024-04-06)
  → 'github:elkowar/eww/1e37f53e99016aa2cd725d7050788bb5d4fcc76a?narHash=sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg%3D' (2024-04-14)
• Updated input 'home-manager':
    'github:nix-community/home-manager/31357486b0ef6f4e161e002b6893eeb4fafc3ca9?narHash=sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY%3D' (2024-04-10)
  → 'github:nix-community/home-manager/1c43dcfac48a2d622797f7ab741670fdbcf8f609?narHash=sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM%3D' (2024-04-15)
• Updated input 'nix-ld-rs':
    'github:nix-community/nix-ld-rs/f1c82bda746815f2162a9cc959296bfa0fc50499?narHash=sha256-99MkjQdZlEJ4292bUtHx7C07pDSbU9syEb3lc%2BFrPkw%3D' (2024-04-09)
  → 'github:nix-community/nix-ld-rs/6b76b4aa158819d6bce637485c4cdd710517c6ce?narHash=sha256-345jReT2AFR6VK0KYAEmIjsMvlCCFsoT0Xaku6Nw1fQ%3D' (2024-04-13)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/e1c4bac14beb8c409d0534382cf967171706b9d9?narHash=sha256-4zhaEW1nB%2BnGbCNMjOggWeY5nXs/H0Y71q0%2Bh%2BjdxoU%3D' (2024-04-10)
  → 'github:NixOS/nixos-hardware/f58b25254be441cd2a9b4b444ed83f1e51244f1f?narHash=sha256-7/5ubuwdEbQ7Z%2BVqd4u0mM5L2VMNDsBh54visp27CtQ%3D' (2024-04-12)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6?narHash=sha256-vMZ5603yU0wxgyQeHJryOI%2BO61yrX2AHwY6LOFyV1gM%3D' (2024-04-08)
  → 'github:nixos/nixpkgs/cfd6b5fc90b15709b780a5a1619695a88505a176?narHash=sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM%3D' (2024-04-12)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/70f504012f0a132ac33e56988e1028d88a48855c?narHash=sha256-igpsH%2Bpa6yFwYOdah3cFciCk8gw%2BytniG9quf5f/q84%3D' (2024-04-08)
  → 'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8?narHash=sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y%3D' (2024-04-12)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/35ebec41fcdeeae8e012e7d62ba153a13645227f?narHash=sha256-KZJnVw3TdfDyUhvClzgy3IEoC9tRhvG0yM%2BlHfqAm34%3D' (2024-04-11)
  → 'github:oxalica/rust-overlay/b186d85e747e2b7bee220ec95839fb66c868dc47?narHash=sha256-Ic7zCPfiSYc9nFFp%2BE44WFk3TBJ99J/uPZ4QXX%2BuPPw%3D' (2024-04-15)
• Updated input 'sops':
    'github:Mic92/sops-nix/538c114cfdf1f0458f507087b1dcf018ce1c0c4c?narHash=sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8%3D' (2024-04-08)
  → 'github:Mic92/sops-nix/226062b47fe0e2130ba3ee9f4f1c880dc815cf87?narHash=sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc%3D' (2024-04-14)
• Updated input 'sops/nixpkgs-stable':
    'github:NixOS/nixpkgs/e38d7cb66ea4f7a0eb6681920615dfcc30fc2920?narHash=sha256-g0whLLwRvgO2FsyhY8fNk%2BTWenS3jg5UdlWL4uqgFeo%3D' (2024-04-06)
  → 'github:NixOS/nixpkgs/c27f3b6d8e29346af16eecc0e9d54b1071eae27e?narHash=sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE%3D' (2024-04-13)
 2024-04-15 10:30:09 +02:00
6 changed files with 46 additions and 54 deletions
Show stats Expand all files Collapse all files

78
flake.lock
View file

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

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

@ -45,7 +45,10 @@ 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,7 +62,6 @@ 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,11 +33,6 @@
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,7 +182,6 @@ 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
@ -198,7 +197,6 @@ in
freecad freecad
gnome.nautilus gnome.nautilus
helvum helvum
horizon-eda
imagemagick imagemagick
(imv.override { (imv.override {
withBackends = [ withBackends = [
@ -210,7 +208,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
@ -230,15 +228,12 @@ in
procs procs
prusa-slicer prusa-slicer
qgis qgis
quintom-cursor-theme
remmina remmina
ripgrep ripgrep
scid-vs-pc sshfs
signal-desktop
steam steam
steamcmd steamcmd
steam-tui steam-tui
stellarium
# super-slicer-latest # super-slicer-latest
units units
unzip unzip