flake.nix

@@ -16,7 +16,10 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    helix.url = "github:helix-editor/helix/master";
+    helix = {
+      url = "github:helix-editor/helix/master";
+      # inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -44,6 +47,9 @@
       nur.overlay
     ];
   in {
+    formatter.${system} = pkgs.alejandra;
+
+    # nixosConfigurations: define options for different systems
     # desktop
     nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem {
       inherit system;
@@ -65,19 +71,30 @@
         ./hosts/JWST/configuration.nix
         sops-nix.nixosModules.sops
         nixos-hardware.nixosModules.dell-xps-15-9520
+        nixos-hardware.nixosModules.common-gpu-nvidia-disable
         {nixpkgs.overlays = overlays;}
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
-          home-manager.extraSpecialArgs = {inherit inputs;};
           home-manager.users."tacocat" = {
             imports = [./users/tacocat/home.nix];
             _module.args.theme = import ./modules/themes;
           };
+          home-manager.extraSpecialArgs = {inherit inputs;};
         }
       ];
     };
 
-    formatter.${system} = pkgs.alejandra;
+    #homeConfigurations: define options for different users
+    # homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration {
+    #   inherit pkgs;
+    #   extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
+    #   modules = [
+    #     {nixpkgs.overlays = overlays;}
+    #     ./users/tacocat/home.nix
+    #   ];
+    # };
+
+    # packages.${system}."tacocat" = self.homeConfigurations."tacocat".activationPackage;
   };
 }

hosts/JWST/configuration.nix

@@ -1,3 +1,6 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 {
   # config,
   lib,
@@ -55,6 +58,8 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.geoclue2.enable = true;
+  # services.tlp.enable = true;
+  # services.thermald.enable = true;
 
   # Enable sound.
   sound.enable = true;
@@ -67,42 +72,22 @@
 
   xdg.portal = {
     enable = true;
-    wlr.enable = true;
+    # wlr.enable = true;
     extraPortals = with pkgs; [
+    # xdg-desktop-portal-wlr
     xdg-desktop-portal-gtk
     ];
   };
 
   hardware.opengl = {
     enable = true;
-    driSupport = true;
     driSupport32Bit = true;
     extraPackages = with pkgs; [
       intel-compute-runtime
-      vaapiVdpau
     ];
   };
 
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
-    powerManagement.finegrained = false;
-    open = false;
-    nvidiaSettings = true;
-    prime = {
-      offload.enable = true;
-      offload.enableOffloadCmd = true;
-      intelBusId = "PCI:0:2:0";
-      nvidiaBusId = "PCI:1:0:0";
-    };
-  };
-
-  services.xserver.videoDrivers = ["nvidia"];
-
-
   hardware.opentabletdriver.enable = true;
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.tacocat = {
@@ -123,13 +108,10 @@
 
   programs.waybar.enable = true;
   programs.steam.enable = true;
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "steam"
     "steam-original"
     "steam-run"
-      "nvidia-x11"
-      "nvidia-settings"
   ];
 
   environment = {
@@ -144,6 +126,15 @@
       rsync
       strace
     ];
+
+    # TODO configure this under sway with home-manager
+    variables = {
+      SDL_VIDEODRIVER = "wayland";
+      QT_QPA_PLATFORM = "wayland";
+      QT_WAYLAND_DISABLE_WINDOWDECORATIONS = "1";
+      _JAVA_AWT_WM_NONREPARENTING = "1";
+      MOZ_ENABLE_WAYLAND = "1";
+    };
   };
 
   # This value determines the NixOS release from which the default

users/tacocat/helix/default.nix

@@ -32,11 +32,11 @@
     });
 
     settings = {
-      theme = "gruvbox";
+      theme = "rose_pine_moon";
       editor = {
         line-number = "relative";
         lsp.display-messages = true;
-        scrolloff = 10;
+        scrolloff = 5;
         middle-click-paste = false;
         cursorline = true;
         cursor-shape = {

users/tacocat/wayland/default.nix

@@ -19,13 +19,5 @@
     slurp
   ];
 
-  home.sessionVariables = {
-    SDL_VIDEODRIVER = "wayland";
-    QT_QPA_PLATFORM = "wayland";
-    QT_WAYLAND_DISABLE_WINDOWDECORATIONS = "1";
-    _JAVA_AWT_WM_NONREPARENTING = "1";
-    MOZ_ENABLE_WAYLAND = "1";
-  };
-
   programs.rofi.package = pkgs.rofi-wayland;
 }