From 7a46a2c96b39c420dd5a6b7e601339888313fb23 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Josh)" Date: Wed, 8 May 2024 00:07:25 -0500 Subject: [PATCH] updates --- flake.lock | 6 +++--- flake.nix | 1 - hosts/_common/components/docker.nix | 5 +++++ hosts/joe/configuration.nix | 2 +- users/_common/home_manager/git.nix | 3 +++ users/josh/home_manager/tmux/tmux-reset.conf | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 hosts/_common/components/docker.nix diff --git a/flake.lock b/flake.lock index a0f4c68..8319fd6 100644 --- a/flake.lock +++ b/flake.lock @@ -230,11 +230,11 @@ "nvim_plugin-declancm/cinnamon.nvim": "nvim_plugin-declancm/cinnamon.nvim" }, "locked": { - "lastModified": 1715021116, - "narHash": "sha256-90rB0FN9XodUTSw8fHJSGm8qbqkQOOryQUHt7v53KPQ=", + "lastModified": 1715117107, + "narHash": "sha256-HQMygE6TtrS4w2YPSyRrRcBpGoCwdniXerh4c415Twk=", "owner": "RingOfStorms", "repo": "nvim", - "rev": "d3212044572caeaaf969c06c66f779de96ef37ce", + "rev": "dd1d3dba564adaa1cdfd1d4b29f933a971a2b70e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4e17c99..7ca118f 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,6 @@ user = { username = "josh"; git = { - email = "ringofstorms@gmail.com"; name = "RingOfStorms (Joshua Bell)"; }; diff --git a/hosts/_common/components/docker.nix b/hosts/_common/components/docker.nix new file mode 100644 index 0000000..0ab5630 --- /dev/null +++ b/hosts/_common/components/docker.nix @@ -0,0 +1,5 @@ +{ settings, ... }: +{ + virtualisation.docker.enable = true; + users.extraGroups.docker.members = [ settings.user.username ]; +} diff --git a/hosts/joe/configuration.nix b/hosts/joe/configuration.nix index 0557694..2bf390c 100644 --- a/hosts/joe/configuration.nix +++ b/hosts/joe/configuration.nix @@ -2,7 +2,6 @@ { imports = [ - # TODO revisit (settings.hostsDir + "/_common/components/neovim.nix") # Common components this machine uses (settings.hostsDir + "/_common/components/systemd_boot.nix") @@ -11,6 +10,7 @@ (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") (settings.hostsDir + "/_common/components/home_manager.nix") (settings.hostsDir + "/_common/components/gnome_xorg.nix") + (settings.hostsDir + "/_common/components/docker.nix") # Users this machine has (settings.usersDir + "/root/configuration.nix") (settings.usersDir + "/josh/configuration.nix") diff --git a/users/_common/home_manager/git.nix b/users/_common/home_manager/git.nix index 5373667..f2d7f04 100644 --- a/users/_common/home_manager/git.nix +++ b/users/_common/home_manager/git.nix @@ -53,6 +53,9 @@ # direnv things "/.direnv" + + # local only files + "*.local" ]; }; } diff --git a/users/josh/home_manager/tmux/tmux-reset.conf b/users/josh/home_manager/tmux/tmux-reset.conf index ad50ed0..58953c6 100644 --- a/users/josh/home_manager/tmux/tmux-reset.conf +++ b/users/josh/home_manager/tmux/tmux-reset.conf @@ -6,7 +6,7 @@ bind C-Space send-prefix bind -r p previous-window bind -r n next-window bind -r & kill-window -bind -r c new-window +bind -r c new-window -c "#{pane_current_path}" bind ',' command-prompt "rename-window %%" # Defaults are % and " which is weird and I cannot seem to remember them so using my normal | and \ bind -r "\\" split-window -v -c "#{pane_current_path}"