From ea0bff8e51ad5240a90da457ab7d158207824fd9 Mon Sep 17 00:00:00 2001 From: CDaut Date: Mon, 22 Apr 2024 15:15:19 +0200 Subject: [PATCH] direnv --- flake.lock | 12 ++++++------ home.nix | 1 + programm_configs/.vscode.nix.swp | Bin 12288 -> 0 bytes programm_configs/i3.nix | 3 ++- programm_configs/vscode.nix | 6 +++++- programm_configs/zsh.nix | 2 ++ 6 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 programm_configs/.vscode.nix.swp diff --git a/flake.lock b/flake.lock index 69c8dc4..57989c7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1713453970, - "narHash": "sha256-rvPC+vg5rXo9/FAkfW1aGdzxQDMhUQTlnu2YKmWef5s=", + "lastModified": 1713789879, + "narHash": "sha256-4Wt3Bg6uOnvwZcECBZaFEdzlWRlGLgd8DqLL4ugLdxg=", "owner": "nix-community", "repo": "home-manager", - "rev": "7cebe921eaffd5f9880f0dab7a23789d15f6169b", + "rev": "46833c3115e8858370880d892748f0927d8193c3", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index f78cd9d..292b44c 100644 --- a/home.nix +++ b/home.nix @@ -62,6 +62,7 @@ in cifs-utils samba unzip + direnv ]; fonts.fontconfig.enable = true; diff --git a/programm_configs/.vscode.nix.swp b/programm_configs/.vscode.nix.swp deleted file mode 100644 index 3ca53ece2d4aed22fdd3d80a1aeaf0990c177015..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmYc?2=nw+u+%eTU|?VnU|^UZtdy3%bsLlHRtARToYdUZykd|HUYwU%QIME|R|#0M z4r-u&US@@UK~a8sQDSaxd~$wXT4s8&epzvHeoCrdUS4A9i>J?U^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1cqP; zfadK_^D;2#^FikSVg3J){0t25`573l^D{6U;Adc%&(FY+&CkFP#?QcD#?QbY&CkH_ zn~#Cv1|I{%9zF(!MSKhlO?(UtaeNF6&U_3E7JLj0hI|ln#rPN)L_y{c!SES%@@NQ* zhQMeDjE2By2#kinXb6mkz-S1JhQMeD4DS%AWl&I1P^h&AQy^w6l!;S9K|!G+u`IPn zFF7YMFI_h+zbH4c1g^a*qckxuy(B*`JuOi$H?btOC^Iofw zeqOPHtwMQbNrpl}c6u?)^$1yOg=n~*g2d$P#Pn1JTO_rarMb{pQBY7w%}Y$m0m+vX im8L?3p)2fRCM(z~R5MgFRD&$jQP9)Vt5vX4U;qGq`n_}j diff --git a/programm_configs/i3.nix b/programm_configs/i3.nix index ec357f5..72b878d 100644 --- a/programm_configs/i3.nix +++ b/programm_configs/i3.nix @@ -62,6 +62,7 @@ in extraConfig = "floating_modifier ${mod}\n gaps inner 10\n gaps outer 0\n - smart_gaps on\n"; + smart_gaps on\n + for_window [class=\"Vulkan\"] floating enable\n"; }; } diff --git a/programm_configs/vscode.nix b/programm_configs/vscode.nix index 459d73b..b04318e 100644 --- a/programm_configs/vscode.nix +++ b/programm_configs/vscode.nix @@ -11,9 +11,13 @@ arrterian.nix-env-selector vadimcn.vscode-lldb serayuzgur.crates - bungcip.better-toml + tamasfe.even-better-toml zhuangtongfa.material-theme xaver.clang-format + ms-vscode.cpptools + mkhl.direnv + ms-vscode.cmake-tools + twxs.cmake ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "shader"; diff --git a/programm_configs/zsh.nix b/programm_configs/zsh.nix index 9f58f11..b417ce5 100644 --- a/programm_configs/zsh.nix +++ b/programm_configs/zsh.nix @@ -9,6 +9,8 @@ ssh = "TERM=xterm-256color $(which -p ssh)"; }; + initExtra = "eval \"$(direnv hook zsh)\""; + oh-my-zsh = { enable = true; plugins = [ "git" "battery" "docker" "docker-compose" "virtualenv" ];