From 606d4ecaa63f7a31abcbfe990fea26cd3830968d Mon Sep 17 00:00:00 2001 From: Weckyy702 Date: Wed, 11 Mar 2026 17:49:23 +0100 Subject: [PATCH] Formatting --- configuration.nix | 1 + flake.nix | 5 +++++ hardware-configuration.nix | 20 +++++++++----------- home/home.nix | 4 +--- home/nixvim/default.nix | 2 +- home/nixvim/options.nix | 2 +- home/nixvim/plugins/default.nix | 2 +- home/nixvim/plugins/lsp.nix | 2 +- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/configuration.nix b/configuration.nix index 2735e66..710739f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -125,6 +125,7 @@ "user,users" "uid=1000" "gid=100" + #TODO: we should use age for this "credentials=/etc/nixos/secrets/nas-share.creds" ]; }; diff --git a/flake.nix b/flake.nix index 1e52bb2..4535582 100644 --- a/flake.nix +++ b/flake.nix @@ -3,16 +3,21 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nixvim.url = "github:nix-community/nixvim/nixos-25.11"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; + zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + catppuccin.url = "github:catppuccin/nix/release-25.11"; catppuccin.inputs.nixpkgs.follows = "nixpkgs"; + spicetify-nix.url = "github:Gerg-L/spicetify-nix"; spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index c42fe0d..8a8bb1a 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,22 +1,20 @@ # 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, - username, - ... +{ config +, lib +, pkgs +, modulesPath +, username +, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = ["amdgpu"]; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/0869e843-348d-47e3-b6a1-79ad814ff62b"; diff --git a/home/home.nix b/home/home.nix index 745c0b4..17b52e2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -12,9 +12,6 @@ top @ { config ./borgmatic.nix ]; - #NOTE: MUST be kept up to date with nixpkgs! - home.stateVersion = "25.11"; - home.username = username; home.homeDirectory = "/home/${username}"; @@ -219,4 +216,5 @@ top @ { config enable = true; enableZshIntegration = true; }; + home.stateVersion = "25.11"; } diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 6f48cbd..bb9f02e 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { imports = [ ./keymaps.nix ./options.nix diff --git a/home/nixvim/options.nix b/home/nixvim/options.nix index e1f82b8..f618d79 100644 --- a/home/nixvim/options.nix +++ b/home/nixvim/options.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { programs.nixvim.opts = { # Expand tabs to 4 spaces shiftwidth = 4; diff --git a/home/nixvim/plugins/default.nix b/home/nixvim/plugins/default.nix index 6224f01..46f54f1 100644 --- a/home/nixvim/plugins/default.nix +++ b/home/nixvim/plugins/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { imports = [ ./lsp.nix ./telescope diff --git a/home/nixvim/plugins/lsp.nix b/home/nixvim/plugins/lsp.nix index 45faba5..ab6a91c 100644 --- a/home/nixvim/plugins/lsp.nix +++ b/home/nixvim/plugins/lsp.nix @@ -1,4 +1,4 @@ -{...}: { +{ ... }: { programs.nixvim = { dependencies.rust-analyzer.enable = true;