diff options
| -rw-r--r-- | config/emacs/init.el | 6 | ||||
| -rwxr-xr-x | dist/vm.sh | 2 | ||||
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | machines/x/configuration.nix | 8 | ||||
| -rw-r--r-- | machines/x/home.nix | 2 | ||||
| -rw-r--r-- | modules/nvidia.nix | 7 | ||||
| -rw-r--r-- | modules/virtualization.nix | 3 |
7 files changed, 33 insertions, 25 deletions
diff --git a/config/emacs/init.el b/config/emacs/init.el index ef38196..3c40151 100644 --- a/config/emacs/init.el +++ b/config/emacs/init.el @@ -2,7 +2,7 @@ (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t) (package-initialize) (custom-set-variables - '(package-selected-packages '(fzf kaolin-themes evil popper flycheck company lsp-mode cmake-mode nix-mode clang-format direnv magit evil-collection vue-mode typescript-mode))) + '(package-selected-packages '(fzf kaolin-themes evil popper flycheck company lsp-mode cmake-mode nix-mode clang-format direnv magit evil-collection vue-mode typescript-mode haml-mode yaml-mode))) (require 'direnv) (direnv-mode 1) @@ -28,6 +28,10 @@ (global-set-key (kbd "C-`") 'popper-cycle) (global-set-key (kbd "s-`") 'popper-toggle-type) +(setq-default tab-width 2) +(setq-default indent-tabs-mode nil) +(setq-default c-basic-offset 2) + (setq evil-want-C-u-scroll t) (setq evil-undo-system 'undo-redo) (setq evil-emacs-state-modes nil) @@ -1,2 +1,2 @@ #!/usr/bin/env bash -alacritty --title float -o 'window.dimensions = { columns = 80, lines = 40 }' -e bash -c 'virt-manager -c qemu:///system --show-domain-console $(virsh -c qemu:///system list --all --name | fzf)' +alacritty --title float -o 'window.dimensions = { columns = 80, lines = 40 }' -e bash -c 'virt-manager -c qemu:///system --fork --show-domain-console $(virsh -c qemu:///system list --all --name | fzf)' @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743524395, + "narHash": "sha256-BXVan1TBC2iDJODFvCoz2XrbAOyZ9KWjwyIkOYwO4Mc=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "f6dbc8952df9e40afafbe38449751bfad12d64f2", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1741914680, - "narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=", + "lastModified": 1743556466, + "narHash": "sha256-rvU79DJ6rPDxiH0sTp686Vlm+JewwAZPGcwt8OfHJbM=", "owner": "nix-community", "repo": "home-manager", - "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef", + "rev": "5ee44bc7c2e853f144390a12ebe5174ad7e3b9e0", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741944640, - "narHash": "sha256-MqD2MGUyFB/sCdUy524MXh0rfisAZATZxsGPtAxajq8=", + "lastModified": 1743568003, + "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ac6bd9e5ffac4fc92d5eae24652d3b5a91eef18", + "rev": "b7ba7f9f45c5cd0d8625e9e217c28f8eb6a19a76", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1740569341, - "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=", + "lastModified": 1742765550, + "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845", + "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16", "type": "github" }, "original": { diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index 5cf5313..4efcae7 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -77,11 +77,7 @@ in { networking.extraHosts = '' 192.168.122.100 android 192.168.122.101 deb - 141.148.221.227 o - ''; - - programs.ssh.extraConfig = '' - Host o - User ubuntu + 192.168.122.102 testdb app.labsmartlis.local + 192.168.122.104 dev ''; } diff --git a/machines/x/home.nix b/machines/x/home.nix index b9d0563..c1e87ca 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -25,6 +25,8 @@ chromium spotify + postman + filezilla pcmanfm diff --git a/modules/nvidia.nix b/modules/nvidia.nix index 7d6d0b0..0309c7a 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -3,6 +3,8 @@ { services.xserver.videoDrivers = [ "nvidia" ]; + hardware.graphics.enable32Bit = true; + hardware.nvidia = { modesetting.enable = true; powerManagement.enable = true; @@ -21,5 +23,8 @@ }; }; - # environment.systemPackages = [ pkgs.cudatoolkit ]; + environment.systemPackages = [ + pkgs.cudatoolkit + pkgs.nvidia-container-toolkit + ]; } diff --git a/modules/virtualization.nix b/modules/virtualization.nix index 1a53cd6..08168b4 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -19,6 +19,7 @@ in spiceUSBRedirection.enable = true; docker.enable = true; + docker.enableNvidia = true; }; services.spice-vdagentd.enable = true; programs.virt-manager.enable = true; @@ -29,9 +30,9 @@ in environment.systemPackages = [ pkgs.looking-glass-client pkgs.libvirt - #pkgs.vagrant pkgs.virt-viewer pkgs.guestfs-tools + #pkgs.vagrant (pkgs.writeShellScriptBin "pin-cpu" '' if [[ $1 == "" ]]; then |