diff options
| -rw-r--r-- | config/nvim/default.nix | 4 | ||||
| -rw-r--r-- | config/nvim/init.lua | 3 | ||||
| -rw-r--r-- | config/nvim/lua/compile.lua | 38 | ||||
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | machines/d/home.nix | 2 | ||||
| -rw-r--r-- | machines/v/home.nix | 2 | ||||
| -rw-r--r-- | machines/x/home.nix | 2 | ||||
| -rw-r--r-- | modules/core/global.nix | 2 | ||||
| -rw-r--r-- | modules/virtualization.nix | 31 |
9 files changed, 27 insertions, 69 deletions
diff --git a/config/nvim/default.nix b/config/nvim/default.nix index 28b879b..d194fda 100644 --- a/config/nvim/default.nix +++ b/config/nvim/default.nix @@ -10,8 +10,4 @@ }; home.file.".config/nvim/init.lua".source = ./init.lua; - home.file.".config/nvim/lua" = { - source = ./lua; - recursive = true; - }; } diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 6a8c490..c74ec08 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -162,9 +162,6 @@ telescope.setup({ -- Set Up Autopairs require('nvim-autopairs').setup({ map_cr = true }) --- Set Up Compile.lua -require('compile') - -- Keyboard Shortcuts vim.keymap.set('n', 'P', '<cmd>pu<cr>', { noremap = true }) diff --git a/config/nvim/lua/compile.lua b/config/nvim/lua/compile.lua deleted file mode 100644 index f529b90..0000000 --- a/config/nvim/lua/compile.lua +++ /dev/null @@ -1,38 +0,0 @@ -local openTerminal = function(command) - local Terminal = require('toggleterm.terminal').Terminal - local term = Terminal:new({ - cmd = command, - direction = 'horizontal' - }) - term:toggle() -end - -local path = vim.fn.getcwd() .. '/.compile' - -local run = function() - local file_exists = os.rename(path, path) - - if file_exists then - openTerminal( - 'echo "Directory: $(pwd)"; echo "Compilation started at $(date +"%H:%M:%S")"; echo; ' - .. 'bash ' .. path .. - '; echo; echo "Compilation finished at $(date +"%H:%M:%S")"; read' - ) - return - end - - local file = io.open(path, 'w') - - file:seek('set') - file:write([[#!/bin/sh -set -xe -]] - ) - file:close() - print('Created ' .. path) - return nil -end - -vim.keymap.set('n', 'zz', function() - run() -end) @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { diff --git a/machines/d/home.nix b/machines/d/home.nix index 4174861..7c0a463 100644 --- a/machines/d/home.nix +++ b/machines/d/home.nix @@ -20,7 +20,7 @@ zip ccls - nodePackages.pyright + pyright git-lfs ]; diff --git a/machines/v/home.nix b/machines/v/home.nix index 3564e22..d8a1100 100644 --- a/machines/v/home.nix +++ b/machines/v/home.nix @@ -20,7 +20,7 @@ zip ccls - nodePackages.pyright + pyright git-lfs ]; diff --git a/machines/x/home.nix b/machines/x/home.nix index f1008bb..554d074 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -34,6 +34,8 @@ in { ccls pyright git-lfs + + slides ] ++ [ tlauncher ]; imports = (map (path: ../../config/${path}) [ diff --git a/modules/core/global.nix b/modules/core/global.nix index f44855d..7d372ab 100644 --- a/modules/core/global.nix +++ b/modules/core/global.nix @@ -11,8 +11,6 @@ in { nixPath = [ "nixpkgs=${nix_path}" ]; }; - boot.kernelPackages = pkgs.linuxPackages_zen; - systemd.tmpfiles.rules = [ "L+ ${nix_path} - - - - ${pkgs.path}" ]; diff --git a/modules/virtualization.nix b/modules/virtualization.nix index b1c42dd..74a879c 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -45,18 +45,21 @@ '') ]; - # boot.kernelPatches = [ - # { - # # https://github.com/Kinsteen/win10-gpu-passthrough/blob/main/pat_patch.diff - # name = "disable-pat-check"; - # patch = ../dist/disable-pat-check.patch; - # } - # { - # # https://aur.archlinux.org/cgit/aur.git/tree/1001-6.8.0-add-acs-overrides.patch?h=linux-vfio - # name = "acso"; - # patch = ../dist/acso.patch; - # } - # ]; - - boot.kernelParams = [ /* "skippatcheck" */ "pcie_acs_override=downstream,multifunction" ]; + # Use the custom kernel package set + boot.kernelPackages = pkgs.linuxPackages_latest; + + boot.kernelPatches = [ + { + # https://github.com/Kinsteen/win10-gpu-passthrough/blob/main/pat_patch.diff + name = "disable-pat-check"; + patch = ../dist/disable-pat-check.patch; + } + { + # https://aur.archlinux.org/cgit/aur.git/tree/1001-6.8.0-add-acs-overrides.patch?h=linux-vfio + name = "acso"; + patch = ../dist/acso.patch; + } + ]; + + boot.kernelParams = [ "skippatcheck" "pcie_acs_override=downstream,multifunction" ]; } |