diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index 048d18e4..f14fe6d9 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit 048d18e4a3d47c8d9849796c9a0eeb0fb3f3333d +Subproject commit f14fe6d9f1800d9e9a4cf2e4313f2b0b978a4bd6 diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 5c3e7893..8b6cfbcf 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -23,6 +23,7 @@ ./kat.nix ./keybase.nix ./kubelet.nix + ./laptop.nix ./nix.nix ./nixified.ai.nix ./nvidia.nix diff --git a/nixos/flake.nix b/nixos/flake.nix index 137d1171..f7193421 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -18,7 +18,7 @@ }; home-manager = { - url = "github:colonelpanic8/home-manager/colonelpanic8/multiple-backup-files"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -32,6 +32,7 @@ url = "git+ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"; }; + xmonad = { url = "github:xmonad/xmonad"; inputs = { diff --git a/nixos/laptop.nix b/nixos/laptop.nix new file mode 100644 index 00000000..e274afb1 --- /dev/null +++ b/nixos/laptop.nix @@ -0,0 +1,6 @@ +{ makeEnable, config, ... }: +makeEnable config "myModules.laptop" true { + services.logind = { + lidSwitchExternalPower = "ignore"; + }; +} diff --git a/nixos/machines/strixi-minaj.nix b/nixos/machines/strixi-minaj.nix index 26e93f67..34c74a62 100644 --- a/nixos/machines/strixi-minaj.nix +++ b/nixos/machines/strixi-minaj.nix @@ -3,7 +3,7 @@ { imports = [ ../configuration.nix - inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr + # inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr ]; hardware.nvidia.open = true; @@ -17,6 +17,8 @@ myModules.fonts.enable = true; myModules.nixified-ai.enable = false; myModules.gitea-runner.enable = false; + myModules.nvidia.enable = true; + myModules.electron.enable = true; hardware.enableRedistributableFirmware = true; @@ -31,10 +33,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; hardware.nvidia.powerManagement.enable = true; - hardware.graphics = { - enable = true; - enable32Bit = true; - }; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix index 77d54edf..3a575586 100644 --- a/nixos/nvidia.nix +++ b/nixos/nvidia.nix @@ -8,10 +8,8 @@ makeEnable config "myModules.nvidia" false { enable = true; mount-nvidia-executables = false; }; - hardware.opengl.enable = true; + virtualisation.docker.enableNvidia = true; hardware.nvidia.open = true; - hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; - hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ]; hardware.graphics.enable32Bit = true; services.xserver = { videoDrivers = [ "nvidia" ];