dln/dotfiles
0
0
Code Issues Pull requests 1 Activity

Compare commits

base: dln:fac15cd4c5c56883bb1d8e2a9ca434bf18e9e532
Branches Tags
dln:main
dln:mybookmark
dln:nvim-mini
dln:dln/push-uukkorqwopqy
dln:master
dln:dark-mode
dln:porky
dln:pre-home-manager
..
compare: dln:7a2d1a7e4e531368a1846cf0224fef22ab422236
Branches Tags
dln:main
dln:mybookmark
dln:nvim-mini
dln:dln/push-uukkorqwopqy
dln:master
dln:dark-mode
dln:porky
dln:pre-home-manager

2 commits
fac15cd4c5 ... 7a2d1a7e4e

Author SHA1 Message Date
Daniel Lundin
7a2d1a7e4e
nemo: re-enable pam_rssh 2025-01-07 19:45:49 +01:00
Daniel Lundin
78d818056b
jj: use bright magenta for bookmarks 2025-01-07 19:44:44 +01:00
3 changed files with 62 additions and 52 deletions
Show stats Expand all files Collapse all files

54
flake.lock
View file

@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774679, "lastModified": 1736143030,
"narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1736113571, "lastModified": 1736210320,
"narHash": "sha256-5viqX++mUONRNCHf393l26iZIvi2DlFLJR87Xrsod3s=", "narHash": "sha256-QnDkQ/s1OWmPj1f+7MFNxQiAPJdHbI1Aft7yM5I+8gQ=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "c9c5ad43a54e815e664569f5e5809a71369b99a2", "rev": "a3837a1e4ee06a183f32d4a622c2cdcd51f73fb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +221,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736066484, "lastModified": 1736204492,
"narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", "narHash": "sha256-CoBPRgkUex9Iz6qGSzi/BFVUQjndB0PmME2B6eEyeCs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", "rev": "20665c6efa83d71020c8730f26706258ba5c6b2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +266,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1736035694, "lastModified": 1736233375,
"narHash": "sha256-hsJH+qsn3hdE2Axo+MGQv2oVPzAXoBTdVJEhmUIprzo=", "narHash": "sha256-I6fqKdaoKOVU33SyPv+MuxWRiOs+PXQTO94aCLA3rAc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "75151f049969a87404442dbcf16e885875e29e72", "rev": "721f5f602b876a3ee21be04f68ab3cedf162e7f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736023725, "lastModified": 1736193797,
"narHash": "sha256-ARpgwbA6wEHBFv4x6Cpv/sXHFkeBiZoYN0iBiI3fKQw=", "narHash": "sha256-5S4RnwKfa5nn/r+8OsMtfgD6TEA5P6cWKti76A0zIMc=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "a8ace2c58a318552869462a36859aabf1cdfaa68", "rev": "b6ab294838421afb6932c52dd6e6d35d571e621d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +381,11 @@
}, },
"nixpkgs-unstable_2": { "nixpkgs-unstable_2": {
"locked": { "locked": {
"lastModified": 1735915915, "lastModified": 1736134818,
"narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", "narHash": "sha256-30sOEZ8CFK2nTTMdkhaNrfVlIi3rWTNV0Z5z+NmpFNI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", "rev": "3df3c47c19dc90fec35359e89ffb52b34d2b0e94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +397,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1735915915, "lastModified": 1736042175,
"narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", "narHash": "sha256-jdd5UWtLVrNEW8K6u5sy5upNAFmF3S4Y+OIeToqJ1X8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", "rev": "bf689c40d035239a489de5997a4da5352434632e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,11 +413,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1735834308, "lastModified": 1736012469,
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6df24922a1400241dae323af55f30e4318a6ca65", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +498,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735905407, "lastModified": 1736154270,
"narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github" "type": "github"
}, },
"original": { "original": {

21
home/dln/home.nix
View file

@ -164,10 +164,10 @@ in
"prefix" = bold; "prefix" = bold;
"rest" = "bright black"; "rest" = "bright black";
"divergent prefix" = underline; "divergent prefix" = underline;
"bookmark" = "magenta"; "bookmark" = "bright magenta";
"bookmarks" = "magenta"; "bookmarks" = "bright magenta";
"change_id" = "magenta"; "change_id" = "bright magenta";
"local_bookmarks" = "magenta"; "local_bookmarks" = "bright magenta";
"diff file_header" = bold; "diff file_header" = bold;
"diff hunk_header" = "cyan"; "diff hunk_header" = "cyan";
@ -176,13 +176,14 @@ in
"diff added" = "green"; "diff added" = "green";
"diff added token" = "green"; "diff added token" = "green";
"diff modified" = "cyan"; "diff modified" = "cyan";
"diff untracked" = "magenta"; "diff untracked" = "blue";
"diff renamed" = "cyan"; "diff renamed" = "cyan";
"diff copied" = "green"; "diff copied" = "green";
"diff access-denied" = { "diff access-denied" = {
bg = "red"; bg = "red";
}; };
"empty" = "green";
"elided" = "blue"; "elided" = "blue";
"node elided" = dim; "node elided" = dim;
"node working_copy" = { "node working_copy" = {
@ -197,12 +198,16 @@ in
}; };
"operation id" = "blue"; "operation id" = "blue";
"operation current_operation" = bold; "operation current_operation" = bold;
"remote_bookmarks" = "magenta"; "remote_bookmarks" = "bright magenta";
"working_copy" = { "working_copy" = {
fg = "green"; fg = "green";
bold = true; bold = true;
}; };
"working_copy change_id" = "magenta"; "working_copy empty" = {
fg = "green";
bold = true;
};
"working_copy change_id" = "bright magenta";
"working_copy description placeholder" = "green"; "working_copy description placeholder" = "green";
"working_copy empty description placeholder" = "green"; "working_copy empty description placeholder" = "green";
"working_copy bookmark" = "bright magenta"; "working_copy bookmark" = "bright magenta";
@ -229,7 +234,6 @@ in
"divergent" "divergent"
"divergent change_id" "divergent change_id"
"divergent rest" "divergent rest"
"empty"
"empty description placeholder" "empty description placeholder"
"error_source" "error_source"
"git_head" "git_head"
@ -258,7 +262,6 @@ in
"working_copy conflict" "working_copy conflict"
"working_copy divergent" "working_copy divergent"
"working_copy divergent change_id" "working_copy divergent change_id"
"working_copy empty"
"working_copy git_refs" "working_copy git_refs"
"working_copy local_branches" "working_copy local_branches"
"working_copy placeholder" "working_copy placeholder"

39
hosts/nemo/default.nix
View file

@ -124,21 +124,20 @@
}; };
# FIXME: pam_rssh is broken from rust 1.80 upgrade # FIXME: pam_rssh is broken from rust 1.80 upgrade
# environment.systemPackages = [ pkgs.pam_rssh ]; security = {
# security = { pam.services.doas =
# pam.services.doas = { config, ... }:
# { config, ... }: {
# { rules.auth.rssh = {
# rules.auth.rssh = { order = config.rules.auth.ssh_agent_auth.order - 1;
# order = config.rules.auth.ssh_agent_auth.order - 1; control = "sufficient";
# control = "sufficient"; modulePath = "${pkgs.pam_rssh}/lib/libpam_rssh.so";
# modulePath = "${pkgs.pam_rssh}/lib/libpam_rssh.so"; settings.authorized_keys_command = pkgs.writeShellScript "get-authorized-keys" ''
# settings.authorized_keys_command = pkgs.writeShellScript "get-authorized-keys" '' cat "/etc/ssh/authorized_keys.d/$1"
# cat "/etc/ssh/authorized_keys.d/$1" '';
# ''; };
# }; };
# }; };
# };
services.resolved = { services.resolved = {
enable = true; enable = true;
@ -175,7 +174,7 @@
ffado ffado
libcamera libcamera
lm_sensors lm_sensors
# pkgs.pam_rssh pam_rssh
openconnect openconnect
v4l-utils v4l-utils
]; ];
@ -213,6 +212,14 @@
}; };
users.groups.nixremote = { }; users.groups.nixremote = { };
nix.sshServe.enable = true;
nix.sshServe.keys = [
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIHMAEZx02kbHrEygyPQYStiXlrIe6EIqBCv7anIkL0pAAAABHNzaDo= dln@dinky"
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJNOBFoU7Cdsgi4KpYRcv7EhR/8kD4DYjEZnwk6urRx7AAAABHNzaDo= dln@nemo"
"sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJ10mLOpInoqDaySyrxbzvcOrJfLw48Y6eWHa9501lw+hEEBXya3ib7nlvpCqEQJ8aPU5fVRqpkOW5zSimCiRbwAAAAEc3NoOg=="
"sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLpoKvsZDIQQLfgzJhe1jAQubBNxjydkj8UfdUPaSXqgfB02OypMOC1m5ZuJYcQIxox0I+4Z8xstFhYP6s8zKZwAAAAEc3NoOg=="
];
nix.settings.trusted-users = [ nix.settings.trusted-users = [
"dln" "dln"
"lsjostro" "lsjostro"