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