summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock36
-rw-r--r--machines/x/configuration.nix2
-rw-r--r--machines/x/home.nix1
-rw-r--r--modules/compromyse.nix2
-rw-r--r--modules/core/global.nix3
-rw-r--r--modules/login.nix6
-rw-r--r--modules/nvidia.nix2
-rw-r--r--modules/virtualization.nix11
8 files changed, 37 insertions, 26 deletions
diff --git a/flake.lock b/flake.lock
index c14dbda..b491ab6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1755519972,
- "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=",
+ "lastModified": 1758287904,
+ "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community",
"repo": "disko",
- "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d",
+ "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github"
},
"original": {
@@ -25,11 +25,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1755404445,
- "narHash": "sha256-K+DsOYkPjDX3kyzUsQ+to5bwX7ac8YUiF7oSPR080+4=",
+ "lastModified": 1757136219,
+ "narHash": "sha256-tKU+vq34KHu/A2wD7WdgP5A4/RCmSD8hB0TyQAUlixA=",
"owner": "vinceliuice",
"repo": "grub2-themes",
- "rev": "6f235a8bc5501b257df32330d70dd0c9324dcd74",
+ "rev": "80dd04ddf3ba7b284a7b1a5df2b1e95ee2aad606",
"type": "github"
},
"original": {
@@ -45,11 +45,11 @@
]
},
"locked": {
- "lastModified": 1755491080,
- "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=",
+ "lastModified": 1758810399,
+ "narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d",
+ "rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2",
"type": "github"
},
"original": {
@@ -75,11 +75,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1755523773,
- "narHash": "sha256-MFFaCNVcThmC36lqF57r5H6bXnX8QJnqUWEWl8z65HM=",
+ "lastModified": 1758819930,
+ "narHash": "sha256-uSZZSitEeYV3rt6zQUyh7xOViYO86mbBiCTIeYG1ZSQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "58f3c8b331269776bf25b8725a2ea9c184bd6fe5",
+ "rev": "d61e2929adf49dfec9bbf83e62f2daf7dce50018",
"type": "github"
},
"original": {
@@ -91,11 +91,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1755186698,
- "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
+ "lastModified": 1758690382,
+ "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
+ "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github"
},
"original": {
@@ -115,11 +115,11 @@
]
},
"locked": {
- "lastModified": 1754501628,
- "narHash": "sha256-FExJ54tVB5iu7Dh2tLcyCSWpaV+lmUzzWKZUkemwXvo=",
+ "lastModified": 1758185783,
+ "narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=",
"owner": "nix-community",
"repo": "plasma-manager",
- "rev": "cca090f8115c4172b9aef6c5299ae784bdd5e133",
+ "rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4",
"type": "github"
},
"original": {
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index b739803..dcc2c03 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -63,7 +63,7 @@ in {
extraSpecialArgs = { inherit inputs; };
useGlobalPkgs = true;
useUserPackages = true;
- sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
+ sharedModules = [ inputs.plasma-manager.homeModules.plasma-manager ];
users = {
"compromyse" = import ./home.nix;
};
diff --git a/machines/x/home.nix b/machines/x/home.nix
index ba665fa..18763ea 100644
--- a/machines/x/home.nix
+++ b/machines/x/home.nix
@@ -37,6 +37,7 @@
slides
calibre
+ kdePackages.okular
];
programs = {
diff --git a/modules/compromyse.nix b/modules/compromyse.nix
index c75d93d..e8484c8 100644
--- a/modules/compromyse.nix
+++ b/modules/compromyse.nix
@@ -2,7 +2,7 @@
{
users.users.compromyse = {
- hashedPassword = "$y$j9T$QfsPs3aK5iQOzctkQglAp1$00VuaoJthM6hNxnoMsx58CbI3rsFDem5xtsKqPRfy4C";
+ hashedPassword = "$y$j9T$sLByWUVQIl0D6AzHKpVat/$VAsX7YK1NCy2H4XxhVTKdkhWXHuzdMMHq6tC4liH879";
isNormalUser = true;
# openssh.authorizedKeys.keys = [];
extraGroups = [ "wheel" "video" "storage" "input" "plugdev" "libvirtd" "docker" "kvm" "lp" ];
diff --git a/modules/core/global.nix b/modules/core/global.nix
index 1ef2ab7..42a7dd6 100644
--- a/modules/core/global.nix
+++ b/modules/core/global.nix
@@ -24,7 +24,8 @@ in {
man-pages-posix
];
- time.timeZone = "Asia/Kolkata";
+ time.timeZone = "America/New_York";
+ # time.timeZone = "Asia/Kolkata";
networking.networkmanager.enable = true;
networking.firewall.enable = false;
diff --git a/modules/login.nix b/modules/login.nix
index 6ecc459..4029d1c 100644
--- a/modules/login.nix
+++ b/modules/login.nix
@@ -19,9 +19,9 @@
};
};
- services.logind.extraConfig = ''
- HandlePowerKey=ignore
- '';
+ services.logind.settings.Login = {
+ HandlePowerKey = "ignore";
+ };
systemd.services.greetd.serviceConfig = {
Type = "idle";
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index ffd1bc5..697726c 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -11,7 +11,7 @@
powerManagement.finegrained = true;
open = true;
nvidiaSettings = true;
- package = config.boot.kernelPackages.nvidiaPackages.latest;
+ package = config.boot.kernelPackages.nvidiaPackages.stable;
prime = {
offload = {
diff --git a/modules/virtualization.nix b/modules/virtualization.nix
index 35910ae..d51a3a9 100644
--- a/modules/virtualization.nix
+++ b/modules/virtualization.nix
@@ -51,6 +51,8 @@ in
'')
(pkgs.writeShellScriptBin "vfio-bind" ''
+ set -xe
+
sudo modprobe -r nvidia_drm nvidia_modeset nvidia_uvm i2c_nvidia_gpu nvidia
sudo modprobe vfio
@@ -63,9 +65,13 @@ in
sudo virsh nodedev-detach pci_0000_01_00_1
systemctl --user -M compromyse@ restart pipewire.service pipewire.socket
+
+ set +xe
'')
(pkgs.writeShellScriptBin "vfio-unbind" ''
+ set -xe
+
systemctl --user -M compromyse@ stop pipewire.service pipewire.socket
sudo virsh nodedev-reattach pci_0000_01_00_0
@@ -78,6 +84,8 @@ in
sudo modprobe -r vfio
sudo modprobe nvidia_drm nvidia_modeset nvidia_uvm i2c_nvidia_gpu nvidia
+
+ set +xe
'')
];
@@ -101,7 +109,8 @@ in
'';
# Use the custom kernel package set
- boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
+ boot.kernelPackages = pkgs.linuxPackages_xanmod;
+ # boot.kernelPackages = pkgs.linuxPackages_zen;
# boot.kernelPatches = [
# {