diff options
| -rw-r--r-- | config/emacs/init.el | 2 | ||||
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | machines/vm/home.nix | 2 | ||||
| -rw-r--r-- | machines/x/home.nix | 5 | ||||
| -rw-r--r-- | modules/laptop.nix | 4 | ||||
| -rw-r--r-- | modules/virtualization.nix | 8 |
6 files changed, 23 insertions, 28 deletions
diff --git a/config/emacs/init.el b/config/emacs/init.el index d5d772d..33aa633 100644 --- a/config/emacs/init.el +++ b/config/emacs/init.el @@ -37,7 +37,7 @@ (require 'evil) (evil-mode 1) -(evil-collection-init 'magit) +(evil-collection-init) (global-set-key (kbd "M-<") 'tab-bar-switch-to-prev-tab) (global-set-key (kbd "M->") 'tab-bar-switch-to-next-tab) @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1739841949, + "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1740283128, + "narHash": "sha256-R61wtNknWWejnl+K0l4sxu/wnLNFbNe44tNM2zbj5yE=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "ed030a787938cae01d693ebaad52bbb672a4a69d", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738511497, - "narHash": "sha256-SLm1b1pYnP2ufRbqVqe/ZoPwzmxLKZWbLxEpqM6pFIs=", + "lastModified": 1740287033, + "narHash": "sha256-/MIT8/gFk2Yswm/uUzTg65Cl9GmS1iXT2REPVflJRxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75c8548d8118c31509b89ffd7df6c322b94017dd", + "rev": "06b36bb519629003bc79e4dcc0c4132b2e9e5c47", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1736549395, - "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", + "lastModified": 1739557722, + "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", + "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522", "type": "github" }, "original": { diff --git a/machines/vm/home.nix b/machines/vm/home.nix index 449f79b..e5b709d 100644 --- a/machines/vm/home.nix +++ b/machines/vm/home.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - nixpkgs.config.allowUnfree = true; - home = { username = "compromyse"; homeDirectory = "/home/compromyse"; diff --git a/machines/x/home.nix b/machines/x/home.nix index 80d1b96..be6acef 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -1,8 +1,6 @@ { inputs, pkgs, ... }: { - nixpkgs.config.allowUnfree = true; - home = { username = "compromyse"; homeDirectory = "/home/compromyse"; @@ -10,6 +8,7 @@ home.packages = with pkgs; [ wget + aria2 tmux fzf @@ -20,8 +19,8 @@ zip imv + mpv - discord firefox google-chrome diff --git a/modules/laptop.nix b/modules/laptop.nix index 39719ae..d4f9ff9 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: { - /* services.tlp = { + services.tlp = { enable = true; settings = { CPU_SCALING_GOVERNOR_ON_AC = "performance"; @@ -10,7 +10,7 @@ CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; }; - }; */ + }; boot = { kernelModules = [ "acpi_call" ]; diff --git a/modules/virtualization.nix b/modules/virtualization.nix index 18e79ee..1a53cd6 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -82,7 +82,7 @@ in ]; boot = { - /* initrd.kernelModules = [ + initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" @@ -91,12 +91,12 @@ in "nvidia_modeset" "nvidia_uvm" "nvidia_drm" - ]; */ + ]; kernelParams = [ "skippatcheck" "pci_acs_override=downstream,multifunction" - /* ("vfio-pci.ids=" + lib.concatStringsSep "," gpuIDs) */ + ("vfio-pci.ids=" + lib.concatStringsSep "," gpuIDs) ]; }; @@ -115,6 +115,4 @@ in # patch = ../dist/acso.patch; # } # ]; - - # boot.kernelParams = [ "skippatcheck" "pcie_acs_override=downstream,multifunction" ]; } |