From e209f0fa610b7e364240db4639a5af738e22778a Mon Sep 17 00:00:00 2001 From: janis Date: Mon, 6 Apr 2026 20:21:13 +0200 Subject: [PATCH] idk.. updated stuff? --- data/zsh-aliases.nix | 1 + flake.lock | 204 ++++++++++++++++++++++++++++++++------ home/development/rust.nix | 2 +- home/git-ssh.nix | 7 +- 4 files changed, 177 insertions(+), 37 deletions(-) diff --git a/data/zsh-aliases.nix b/data/zsh-aliases.nix index d6b1ec8..914f3c9 100644 --- a/data/zsh-aliases.nix +++ b/data/zsh-aliases.nix @@ -8,6 +8,7 @@ ssh = "TERM=xterm-256color ssh"; emacs = "emacs -nw"; # Use emacs in terminal mode. ns = "nix-shell --run \"$(readlink /proc/$$/exe)\""; + nixdev = "nix develop \$* -c zsh"; # dotfiles dotfiles = "git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME"; diff --git a/flake.lock b/flake.lock index 09ffe1a..e4b8b0c 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1773506317, - "narHash": "sha256-qWKbLUJpavIpvOdX1fhHYm0WGerytFHRoh9lVck6Bh0=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "878ec37d6a8f52c6c801d0e2a2ad554c75b9353c", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1773827727, - "narHash": "sha256-ju4C3oAyUWeEItQKvLvl0ME9FUsHsAJKFo2BJ9i36Jw=", + "lastModified": 1774262056, + "narHash": "sha256-WXu81OceTamUkEX/WufrEqofxztQ30jJbPpY+5e2wfc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "73dcf114c2bab0f2bbd8b922beb1c6dafee6846c", + "rev": "eedc208a1db00cfdbc75a8689ac1127444930765", "type": "github" }, "original": { @@ -104,6 +104,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nordvpn-flake", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur", @@ -124,6 +145,43 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1758022363, + "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -131,11 +189,11 @@ ] }, "locked": { - "lastModified": 1773681845, - "narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=", + "lastModified": 1773963144, + "narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6", + "rev": "a91b3ea73a765614d90360580b689c48102d1d33", "type": "github" }, "original": { @@ -151,11 +209,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1773603777, - "narHash": "sha256-oXSEbMR/IuHYk9nvrbRhaYBxVK5s63DH2UGOZT2ok48=", + "lastModified": 1773882647, + "narHash": "sha256-VzcOcE0LLpEnyoxLuMuptZ9ZWCkSBn99bTgEQoz5Viw=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "0efe7af73d6e4a8d447a22936c5526d73822b0a7", + "rev": "fd0eae98d1ecee31024271f8d64676250a386ee7", "type": "github" }, "original": { @@ -183,11 +241,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1773705440, - "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", + "lastModified": 1773964973, + "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", + "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "type": "github" }, "original": { @@ -199,11 +257,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1773734432, - "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -247,11 +305,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1773282481, - "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -263,11 +321,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1773705440, - "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", + "lastModified": 1773964973, + "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", + "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "type": "github" }, "original": { @@ -279,11 +337,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1773734432, - "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -293,17 +367,65 @@ "type": "github" } }, - "nur": { + "nordvpn-amd64-deb": { + "flake": false, + "locked": { + "narHash": "sha256-AfVDD/9ASErvgcG590/O+l7jeIeAv+PQkOvkRX8wC7I=", + "type": "file", + "url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_amd64.deb" + }, + "original": { + "type": "file", + "url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_amd64.deb" + } + }, + "nordvpn-arm64-deb": { + "flake": false, + "locked": { + "narHash": "sha256-YweSq0QV+rMNWvvWw6RN0XbsvGeZVIUlJo3z+l+f79w=", + "type": "file", + "url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_arm64.deb" + }, + "original": { + "type": "file", + "url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_arm64.deb" + } + }, + "nordvpn-flake": { "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils", + "hercules-ci-effects": "hercules-ci-effects", + "nixpkgs": [ + "nixpkgs" + ], + "nordvpn-amd64-deb": "nordvpn-amd64-deb", + "nordvpn-arm64-deb": "nordvpn-arm64-deb" }, "locked": { - "lastModified": 1773831707, - "narHash": "sha256-By+BDtmJTKpvZYEQndmIdvDvpk2fjW1/eG5cj8bT0J4=", + "lastModified": 1764175314, + "narHash": "sha256-fe3+VYJb5poUyrlyLe9GCgTggkxPo/JvXZ4EGroIY10=", + "owner": "connerohnesorge", + "repo": "nordvpn-flake", + "rev": "97d3e39957c207af6b732f2b290763404041f36e", + "type": "github" + }, + "original": { + "owner": "connerohnesorge", + "repo": "nordvpn-flake", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1774262207, + "narHash": "sha256-VDjz6p/BMjjqLZJP5YzW5pjlt3s3jJUpVX8fTwU7zAk=", "owner": "nix-community", "repo": "nur", - "rev": "afc57b7040ac8dde32ce922c8da264809f55fb43", + "rev": "2f17ef721626a9d87acb7f74da31cbb15b452797", "type": "github" }, "original": { @@ -334,6 +456,7 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", + "nordvpn-flake": "nordvpn-flake", "nur": "nur" } }, @@ -453,6 +576,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/home/development/rust.nix b/home/development/rust.nix index c7cb128..344f476 100644 --- a/home/development/rust.nix +++ b/home/development/rust.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { # home.packages = with pkgs; [ # ]; diff --git a/home/git-ssh.nix b/home/git-ssh.nix index 0dec890..eb4dc0a 100644 --- a/home/git-ssh.nix +++ b/home/git-ssh.nix @@ -66,10 +66,11 @@ identityFile = "~/.ssh/duralumin_janis-github"; addKeysToAgent = "yes"; }; - "noonebtw.github.com" = { - host = "noonebtw.github.com"; + "github-noonebtw" = { + host = "github-noonebtw"; hostname = "github.com"; - identityFile = "~/.ssh/id_ed25519_git"; + user = "git"; + identityFile = "~/.ssh/duralumin_noonebtw-github"; addKeysToAgent = "yes"; }; };