diff options
| -rw-r--r-- | config/bash.nix | 19 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | machines/x/home.nix | 2 | ||||
| -rw-r--r-- | modules/laptop.nix | 5 | ||||
| -rw-r--r-- | modules/nvidia.nix | 4 | ||||
| -rw-r--r-- | modules/virtualization.nix | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/config/bash.nix b/config/bash.nix index 563a60f..506c40a 100644 --- a/config/bash.nix +++ b/config/bash.nix @@ -15,17 +15,16 @@ if [ -n "$DIR" ] then - if [ "$1" == "-cd" ] - then - cd $DIR - return - fi - tmux new-session -d -c "$DIR" -s "$SESSION_NAME" - if [ -n "$TMUX" ] - then - tmux switch -t "$SESSION_NAME" + if [ -f "$DIR/flake.nix" ]; then + cd "$DIR" || exit + nix develop else - tmux attach -t "$SESSION_NAME" + tmux new-session -d -c "$DIR" -s "$SESSION_NAME" + if [ -n "$TMUX" ]; then + tmux switch -t "$SESSION_NAME" + else + tmux attach -t "$SESSION_NAME" + fi fi fi } @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { diff --git a/machines/x/home.nix b/machines/x/home.nix index 114faef..958a951 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -34,6 +34,8 @@ in { ccls nodePackages.pyright git-lfs + + vagrant ] ++ [ tlauncher ]; imports = (map (path: ../../config/${path}) [ diff --git a/modules/laptop.nix b/modules/laptop.nix index 3d6f00e..4dc9526 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -18,11 +18,6 @@ CPU_HWP_DYN_BOOST_ON_AC = 1; CPU_HWP_DYN_BOOST_ON_BAT = 0; - - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 35; }; }; diff --git a/modules/nvidia.nix b/modules/nvidia.nix index 98dab8b..474b9ce 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -5,9 +5,9 @@ hardware.nvidia = { modesetting.enable = true; - powerManagement.enable = true; + powerManagement.enable = false; powerManagement.finegrained = true; - open = false; + open = true; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.production; diff --git a/modules/virtualization.nix b/modules/virtualization.nix index f3935c2..e0d9b88 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -11,6 +11,10 @@ }; }; spiceUSBRedirection.enable = true; + + docker = { + enable = true; + }; }; services.spice-vdagentd.enable = true; programs.virt-manager.enable = true; |