diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 31c95b0..a9a19c8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "label": "Build System", "type": "shell", // TODO: Run in tmux (for those cases which kills X server) - "command": "make", + "command": "bin/run-via-tmux", "args": [], "problemMatcher": [], "group": { diff --git a/bin/run-via-tmux b/bin/run-via-tmux new file mode 100755 index 0000000..6738959 --- /dev/null +++ b/bin/run-via-tmux @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -xe +PROJECT=$(basename `pwd`) +tmux new-session -A -s $PROJECT make diff --git a/flake.lock b/flake.lock index b185a52..10505a8 100644 --- a/flake.lock +++ b/flake.lock @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1635839387, - "narHash": "sha256-2B6DqfTiwY5w2TljC4+AxEUuVYMTP5Fo2h5iGNIONvk=", + "lastModified": 1638311312, + "narHash": "sha256-OMAd3WZ/VtMK0QQwDrrynP6+jOlWLd1yQtnW56+eZtA=", "owner": "nix-community", "repo": "home-manager", - "rev": "288faaa5a65e72e37e6027024829b15c8bb69286", + "rev": "f23073f1daa769a28a12ac587eea487aa8afb196", "type": "github" }, "original": { @@ -636,17 +636,17 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1637155076, - "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=", + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2", + "rev": "8a308775674e178495767df90c419425474582a1", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2", + "rev": "8a308775674e178495767df90c419425474582a1", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 6aaa5cc..a7ea1b9 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # https://status.nixos.org/ # # This ensures that we always use the official nix cache. - nixpkgs.url = "github:nixos/nixpkgs/715f63411952c86c8f57ab9e3e3cb866a015b5f2"; + nixpkgs.url = "github:nixos/nixpkgs/8a308775674e178495767df90c419425474582a1"; nixos-hardware.url = github:NixOS/nixos-hardware/master; home-manager.url = "github:nix-community/home-manager"; diff --git a/home.nix b/home.nix index 9ef538d..cb6b4f5 100644 --- a/home.nix +++ b/home.nix @@ -48,10 +48,6 @@ rec { hledger hledger-web - - # latex - texlive.combined.scheme-full - # texlive.combined.scheme-basic ]; programs = { @@ -102,7 +98,7 @@ rec { l = "${pkgs.exa}/bin/exa"; ll = "${pkgs.exa}/bin/exa -l"; ls = "l"; - #h = "himalaya"; + pux = "sh -c \"tmux -S $(pwd).tmux attach\""; }; sessionVariables = { }; # XXX: These are needed only on non-NixOS Linux (on NixOS, they are broken) @@ -122,7 +118,6 @@ rec { enableBashIntegration = true; nix-direnv = { enable = true; - enableFlakes = true; }; };