From 5d1cab4e59f8473d5b32992792edbea783b19700 Mon Sep 17 00:00:00 2001 From: muon Date: Fri, 19 Sep 2025 11:08:44 +0000 Subject: [PATCH 1/2] Add tldr and ssh keys --- flake.lock | 50 ++++++++++++++++++------------------ hosts/murk/configuration.nix | 8 ++++++ hosts/murk/home.nix | 2 ++ 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index f775149..bd3104f 100644 --- a/flake.lock +++ b/flake.lock @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1754924470, - "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", + "lastModified": 1756022458, + "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", "owner": "nix-community", "repo": "home-manager", - "rev": "67393957c27b4e4c6c48a60108a201413ced7800", + "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752566074, - "narHash": "sha256-hWPv6S5lFn6qOQdSL5Ad/m0mge2ALTC8WEAR7c6YWcE=", + "lastModified": 1755253391, + "narHash": "sha256-8Muat6VcG9HsVNtyeKblnj28nnPZVPCGKh/kP3uUPeU=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "ccf263b7ac5f44f89fd990594b09aa52de3d6585", + "rev": "e62b3ad75e8c9a5e505fc78b9b40eed1178634cb", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1752441837, - "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", + "lastModified": 1754800038, + "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "839e02dece5845be3a322e507a79712b73a96ba2", + "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754726524, - "narHash": "sha256-s4uXZ2D0fbaAu6qFMP/fNSpvVQ7z7F7AalIBhbIGaIE=", - "owner": "ddogfoodd", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "01f6508918a7af7583e4da274dc429b5ea831665", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754832356, - "narHash": "sha256-CHWUy7FY1icSQnvTNv+9ty6VFjBNDyb3gD8hHhVEZ9Y=", + "lastModified": 1755463179, + "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=", "owner": "NotAShelf", "repo": "nvf", - "rev": "1681ad703470e784156ce3461d92d18492c5baef", + "rev": "03833118267ad32226b014b360692bdce9d6e082", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754851076, - "narHash": "sha256-k3+/24lN6E9BFRhryHocm7314t0Wtku0hgIdEWi15XI=", + "lastModified": 1755997543, + "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", "owner": "danth", "repo": "stylix", - "rev": "afcfed6fd2a51615cd63aa7fa7608d670e7b61e5", + "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", "type": "github" }, "original": { diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix index f8f12ef..00e5f56 100644 --- a/hosts/murk/configuration.nix +++ b/hosts/murk/configuration.nix @@ -9,6 +9,11 @@ ... }: let cfg = config.mods; + keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEio+Y5wBVD1wILaH2R3wV10FvVjiqy/4gGBWHOITTB muon@muon" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKevYmkH7xvYoquBjnYZ7PJiVqf+GOh9fxAJBN6wZGBB gin4@hi.is" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmAOd9VbhyJeibt6Vrb101MNTk5W8+rh94Djv/C+pyu muon@muho" + ]; in { # Hardware imports = [ @@ -58,6 +63,9 @@ in { services.picom.enable = true; services.picom.opacityRules = ["50:name *= 'Cheat'"]; + users.users.muon.openssh.authorizedKeys.keys = keys; + users.users.root.openssh.authorizedKeys.keys = keys; + # Persist environment.persistence."/persist" = { directories = ["/etc/NetworkManager" "/var/lib/NetworkManager"]; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index 974866f..a891f58 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -36,6 +36,8 @@ in { ruff just go + rainfrog + tealdeer ] # Non-free Date: Fri, 19 Sep 2025 12:21:32 +0000 Subject: [PATCH 2/2] Add nvf keymaps --- flake.lock | 48 +++++++++++++-------------- modules/home/terminal/development.nix | 17 ++++++++++ 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 29e5c3f..2a356ad 100644 --- a/flake.lock +++ b/flake.lock @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "lastModified": 1758250706, + "narHash": "sha256-Jv/V+PNi5RyqCUK2V6YJ0iCqdLPutU69LZas85EBUaU=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "rev": "363007f12930caf8b0ea59c0bf5be109c52ad0ef", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755253391, - "narHash": "sha256-8Muat6VcG9HsVNtyeKblnj28nnPZVPCGKh/kP3uUPeU=", + "lastModified": 1757920634, + "narHash": "sha256-MNxTc+dncIHFGKQRyAqI/Clttp3JICaSUKlMUQ6l9jc=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "e62b3ad75e8c9a5e505fc78b9b40eed1178634cb", + "rev": "f8a51ef800bc8b7420998415035f9c086eb64d5c", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1754800038, - "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1755463179, - "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=", + "lastModified": 1758271661, + "narHash": "sha256-ENqd2/33uP5vB44ClDjjAV+J78oF8q1er4QUZuT8Z7g=", "owner": "NotAShelf", "repo": "nvf", - "rev": "03833118267ad32226b014b360692bdce9d6e082", + "rev": "b7571df4d6e9ac08506a738ddceeec0b141751b0", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755997543, - "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", + "lastModified": 1757956156, + "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", "owner": "danth", "repo": "stylix", - "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", + "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", "type": "github" }, "original": { diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index ccdb8fd..3d3757f 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -110,6 +110,23 @@ formatOnSave = true; }; + keymaps = [ + { + key = "w"; + mode = ["n"]; + action = ":w"; + silent = true; + desc = "Save file"; + } + { + key = "gd"; + mode = "n"; + silent = true; + action = "lua vim.lsp.buf.definition()"; + desc = "Go to Definition"; + } + ]; + languages = { enableFormat = true; enableTreesitter = true;