run nixfmt
This commit is contained in:
@@ -2,11 +2,16 @@
|
||||
# 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, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./modules/greetd/nixos.nix
|
||||
./modules/stylix/nixos.nix
|
||||
@@ -18,14 +23,18 @@
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.device = "nodev";
|
||||
boot.loader.grub.devices = ["/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"
|
||||
boot.loader.grub.devices = [
|
||||
"/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F"
|
||||
"nodev"
|
||||
];
|
||||
#boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.grub.efiSupport = true;
|
||||
boot.loader.grub.efiInstallAsRemovable = true;
|
||||
|
||||
nix.settings.experimental-features = ["flakes" "nix-command"];
|
||||
nix.settings.experimental-features = [
|
||||
"flakes"
|
||||
"nix-command"
|
||||
];
|
||||
|
||||
networking.hostName = "doloroo-main"; # Define your hostname.
|
||||
|
||||
@@ -77,7 +86,8 @@
|
||||
fileSystems."/mnt/2tb" = {
|
||||
device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2";
|
||||
fsType = "ext4";
|
||||
options = [ # If you don't have this options attribute, it'll default to "defaults"
|
||||
options = [
|
||||
# If you don't have this options attribute, it'll default to "defaults"
|
||||
# boot options for fstab. Search up fstab mount options you can use
|
||||
"defaults"
|
||||
"users" # Allows any user to mount and unmount
|
||||
@@ -211,4 +221,3 @@
|
||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||
system.stateVersion = "25.11"; # Did you read the comment?
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,8 @@
|
||||
spicetify-nix = {
|
||||
url = "github:Gerg-L/spicetify-nix";
|
||||
};
|
||||
nix-warez = { # Blender-bin
|
||||
nix-warez = {
|
||||
# Blender-bin
|
||||
url = "github:edolstra/nix-warez?dir=blender";
|
||||
};
|
||||
};
|
||||
@@ -41,7 +42,12 @@
|
||||
inputs@{ nixpkgs, home-manager, ... }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs { inherit system; config = { allowUnfree = true; }; };
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
overlays = [ inputs.neovim-nightly-overlay.overlays.default ];
|
||||
in
|
||||
{
|
||||
@@ -62,7 +68,12 @@
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
};
|
||||
modules = [ ./configuration.nix inputs.sops-nix.nixosModules.sops inputs.disko.nixosModules.disko {nixpkgs.overlays = overlays;} ];
|
||||
modules = [
|
||||
./configuration.nix
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
inputs.disko.nixosModules.disko
|
||||
{ nixpkgs.overlays = overlays; }
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,25 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ inputs, config, pkgs, fetchFromGitHub, ... }:
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
fetchFromGitHub,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
{ inputs, pkgs, home, system, ... }:
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
home,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
blenderPkgs = inputs.nix-warez.packages.${system};
|
||||
in {
|
||||
in
|
||||
{
|
||||
# whole blender config including addons is too fat to include here
|
||||
home.packages = with pkgs; [
|
||||
blenderPkgs.blender_4_5
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ inputs, pkgs, system, ... }:
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
||||
in
|
||||
|
||||
@@ -14,7 +14,8 @@ in
|
||||
# settings = { };
|
||||
systemd.variables = [ "--all" ];
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
portalPackage =
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
};
|
||||
# todo, split this into its own module;
|
||||
programs.foot = {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
programs.wofi.enable = true;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
wayfreeze
|
||||
|
||||
@@ -99,7 +99,10 @@
|
||||
"$mainMod, right, movefocus, r"
|
||||
"$mainMod, up, movefocus, u"
|
||||
"$mainMod, down, movefocus, d"
|
||||
("$mainMod, S, exec, " + ''wayfreeze --after-freeze-cmd 'grim -g "$(slurp -d)" - | wl-copy -t image/png;killall wayfreeze' --hide-cursor'')
|
||||
(
|
||||
"$mainMod, S, exec, "
|
||||
+ ''wayfreeze --after-freeze-cmd 'grim -g "$(slurp -d)" - | wl-copy -t image/png;killall wayfreeze' --hide-cursor''
|
||||
)
|
||||
"$mainMod, F, fullscreen"
|
||||
"$mainMod, mouse_down, workspace, e+1"
|
||||
"$mainMod, mouse_up, workspace, e-1"
|
||||
@@ -108,15 +111,19 @@
|
||||
", F8, pass, class:^(com\.obsproject\.Studio)$"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
"$mainMod SHIFT, 0, movetoworkspace, 10"
|
||||
] ++ (
|
||||
builtins.concatLists (
|
||||
builtins.genList(i: let ws = i + 1; in [
|
||||
]
|
||||
++ (builtins.concatLists (
|
||||
builtins.genList (
|
||||
i:
|
||||
let
|
||||
ws = i + 1;
|
||||
in
|
||||
[
|
||||
"$mainMod, ${toString ws}, workspace, ${toString ws}"
|
||||
"$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}"
|
||||
]
|
||||
) 9
|
||||
)
|
||||
);
|
||||
));
|
||||
bindm = [
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
"$mainMod, mouse:273, resizewindow"
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
{ inputs, pkgs, config, ... }:
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
inputs.neovim-nightly-overlay.packages.${pkgs.system}.default
|
||||
];
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ inputs, pkgs, ... }:{
|
||||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
];
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{ inputs, ... }: {
|
||||
{ inputs, ... }:
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ inputs, pkgs, ... }: {
|
||||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
obs-studio = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
{ inputs, config, pkgs, system, ... }:
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
pkg = inputs.quickshell.packages.${system}.quickshell;
|
||||
in
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
inputs.spicetify-nix.homeManagerModules.default
|
||||
];
|
||||
|
||||
@@ -30,7 +30,10 @@
|
||||
mangohud
|
||||
gamemode
|
||||
lsof
|
||||
(gamescope.overrideAttrs { enableWsi = true; NIX_CFLAGS_COMPILE = ["-fno-fast-math"]; })
|
||||
(gamescope.overrideAttrs {
|
||||
enableWsi = true;
|
||||
NIX_CFLAGS_COMPILE = [ "-fno-fast-math" ];
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ inputs, ... }: {
|
||||
{ inputs, ... }:
|
||||
{
|
||||
services.dunst = {
|
||||
settings = {
|
||||
global = {
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ inputs, pkgs, fetchFromGitHub, ... }:
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
fetchFromGitHub,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
arrpc_overlay = (self: super: {
|
||||
arrpc_overlay = (
|
||||
self: super: {
|
||||
arrpc = super.arrpc.overrideAttrs (prev: {
|
||||
version = "git";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@@ -10,7 +11,9 @@ let
|
||||
sha256 = "sha256-9Tnw/BmIAA+RPAfhHFv0kenrRdoxJuUw3iRjKykGxdE=";
|
||||
};
|
||||
});
|
||||
});
|
||||
in {
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
nixpkgs.overlays = [ arrpc_overlay ];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user