Compare commits
2 commits
0f28a1c1be
...
aa2f41d140
Author | SHA1 | Date | |
---|---|---|---|
|
aa2f41d140 | ||
|
631c22a3b0 |
23
flake.nix
23
flake.nix
|
@ -16,10 +16,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
helix = {
|
||||
url = "github:helix-editor/helix/master";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
helix.url = "github:helix-editor/helix/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -47,9 +44,6 @@
|
|||
nur.overlay
|
||||
];
|
||||
in {
|
||||
formatter.${system} = pkgs.alejandra;
|
||||
|
||||
# nixosConfigurations: define options for different systems
|
||||
# desktop
|
||||
nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
|
@ -71,30 +65,19 @@
|
|||
./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;};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
#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;
|
||||
formatter.${system} = pkgs.alejandra;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
lib,
|
||||
|
@ -14,7 +11,7 @@
|
|||
|
||||
sops.defaultSopsFile = ./secrets/secrets.yaml;
|
||||
sops.defaultSopsFormat = "yaml";
|
||||
|
||||
|
||||
sops.age.keyFile = "/home/tacocat/.config/sops/age/keys.txt";
|
||||
|
||||
boot.loader = {
|
||||
|
@ -58,8 +55,6 @@
|
|||
# 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;
|
||||
|
@ -72,22 +67,42 @@
|
|||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
# wlr.enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
# xdg-desktop-portal-wlr
|
||||
xdg-desktop-portal-gtk
|
||||
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 = {
|
||||
|
@ -108,11 +123,14 @@
|
|||
|
||||
programs.waybar.enable = true;
|
||||
programs.steam.enable = true;
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-run"
|
||||
];
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-run"
|
||||
"nvidia-x11"
|
||||
"nvidia-settings"
|
||||
];
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
|
@ -126,15 +144,6 @@
|
|||
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
|
||||
|
|
|
@ -32,11 +32,11 @@
|
|||
});
|
||||
|
||||
settings = {
|
||||
theme = "rose_pine_moon";
|
||||
theme = "gruvbox";
|
||||
editor = {
|
||||
line-number = "relative";
|
||||
lsp.display-messages = true;
|
||||
scrolloff = 5;
|
||||
scrolloff = 10;
|
||||
middle-click-paste = false;
|
||||
cursorline = true;
|
||||
cursor-shape = {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
"Sched"
|
||||
"Due"
|
||||
"Description"
|
||||
"Urg"
|
||||
"Urg"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -19,5 +19,13 @@
|
|||
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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue