diff options
| -rw-r--r-- | flake.lock | 8 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | machines/vm-aarch64.nix | 42 | ||||
| l--------- | mut/lf/icons | 2 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/init.fnl | 8 |
5 files changed, 18 insertions, 44 deletions
@@ -350,13 +350,13 @@ ] }, "locked": { - "lastModified": 1712307593, - "narHash": "sha256-FQaRZ06jwQ9u/TmXBD52T+GR9SB5IKdwQavykassLeQ=", - "path": "/Users/ivi/nix-darwin", + "lastModified": 1728844240, + "narHash": "sha256-lDK39oLsP3HqqovbTAUoryEUA2IRxFNbi8egwCLmLTE=", + "path": "/home/ivi/nix-darwin", "type": "path" }, "original": { - "path": "/Users/ivi/nix-darwin", + "path": "/home/ivi/nix-darwin", "type": "path" } }, @@ -17,7 +17,7 @@ neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; drduh-yubikey-guide.url = "github:drduh/YubiKey-Guide"; nix-darwin = { - url = "path:/Users/ivi/nix-darwin"; + url = "path:/home/ivi/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/machines/vm-aarch64.nix b/machines/vm-aarch64.nix index c680ec1..2b195a4 100644 --- a/machines/vm-aarch64.nix +++ b/machines/vm-aarch64.nix @@ -9,41 +9,15 @@ virtualisation.docker.rootless = { enable = true; setSocketVariable = true; + daemon.settings = { + hosts = ["unix:///run/user/${toString config.my.uid}/docker.sock" "tcp://127.0.0.1:2376"]; + }; }; - users.groups.docker.members = [ - "nixbld1" - "nixbld10" - "nixbld11" - "nixbld12" - "nixbld13" - "nixbld14" - "nixbld15" - "nixbld16" - "nixbld17" - "nixbld18" - "nixbld19" - "nixbld2" - "nixbld20" - "nixbld21" - "nixbld22" - "nixbld23" - "nixbld24" - "nixbld25" - "nixbld26" - "nixbld27" - "nixbld28" - "nixbld29" - "nixbld3" - "nixbld30" - "nixbld31" - "nixbld32" - "nixbld4" - "nixbld5" - "nixbld6" - "nixbld7" - "nixbld8" - "nixbld9" - ]; + systemd.user.services.docker.serviceConfig.Environment="DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS=\"-p 0.0.0.0:2376:2376/tcp\""; + systemd.user.services.docker.serviceConfig.ExecStart = let + cfg = config.virtualisation.docker.rootless; + in + mkForce "${cfg.package}/bin/dockerd-rootless --config-file=${(pkgs.formats.json {}).generate "daemon.json" cfg.daemon.settings}"; networking.hostName = "vm-aarch64"; programs.nix-ld.enable = true; diff --git a/mut/lf/icons b/mut/lf/icons index 0895903..2260f2b 120000 --- a/mut/lf/icons +++ b/mut/lf/icons @@ -1 +1 @@ -/nix/store/yab9wd0wxx5s54amq6waiz862m405qcz-home-manager-files/.config/lf/icons
\ No newline at end of file +/nix/store/q8hdr7j1k3mwdjh63n3i0m10d098s60n-home-manager-files/.config/lf/icons
\ No newline at end of file diff --git a/mut/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl index 28cb1f0..9a776ce 100644 --- a/mut/neovim/fnl/conf/init.fnl +++ b/mut/neovim/fnl/conf/init.fnl @@ -83,10 +83,10 @@ (let [map vim.keymap.set] (map :n :gb ":GBrowse<CR>") (map :n :g<cr> ::G<cr>) - (map :n :ga "<Plug>(EasyAlign)") - (map :x :ga "<Plug>(EasyAlign)") - (map :n :<leader>d<cr> (fn [] (draw true))) - (map :n :<leader>d<bs> (fn [] (draw false))) + ;(map :n :ga "<Plug>(EasyAlign)") + ;(map :x :ga "<Plug>(EasyAlign)") + ; (map :n :<leader>d<cr> (fn [] (draw true))) + ; (map :n :<leader>d<bs> (fn [] (draw false))) (map :n :- ::Oil<cr>) (map :n :_ #(oil.open_cwd.callback)) (map :n :<leader>qf cope) |