Compare commits

...

2 commits

Author SHA1 Message Date
Aria Nolan aa2f41d140 setup nvidia-offload 2023-11-23 12:21:10 -05:00
Aria Nolan 631c22a3b0 formatted 2023-11-22 23:54:46 -05:00
5 changed files with 46 additions and 46 deletions

View file

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

View file

@ -1,6 +1,3 @@
# 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, # config,
lib, lib,
@ -58,8 +55,6 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
services.geoclue2.enable = true; services.geoclue2.enable = true;
# services.tlp.enable = true;
# services.thermald.enable = true;
# Enable sound. # Enable sound.
sound.enable = true; sound.enable = true;
@ -72,22 +67,42 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
# wlr.enable = true; wlr.enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [
# xdg-desktop-portal-wlr
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
]; ];
}; };
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-compute-runtime 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.opentabletdriver.enable = true;
hardware.bluetooth.enable = true;
services.blueman.enable = true;
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.tacocat = { users.users.tacocat = {
@ -108,10 +123,13 @@
programs.waybar.enable = true; programs.waybar.enable = true;
programs.steam.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"
"steam-original" "steam-original"
"steam-run" "steam-run"
"nvidia-x11"
"nvidia-settings"
]; ];
environment = { environment = {
@ -126,15 +144,6 @@
rsync rsync
strace 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 # This value determines the NixOS release from which the default

View file

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

View file

@ -19,5 +19,13 @@
slurp 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; programs.rofi.package = pkgs.rofi-wayland;
} }