diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..ca0d8f3 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,12 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files + - repo: https://github.com/nix-community/nixpkgs-fmt + rev: v1.3.0 + hooks: + - id: nixpkgs-fmt diff --git a/README.md b/README.md index 4f9570c..43ad38f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1 @@ # My NixOS config - - diff --git a/flake.nix b/flake.nix index 4a7c86c..3219adf 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,8 @@ let system = "x86_64-linux"; user = "torjus"; - in { + in + { nixosConfigurations.prismo = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs self user; }; diff --git a/home/editor/neovim/default.nix b/home/editor/neovim/default.nix index ae15f88..9ec3c16 100644 --- a/home/editor/neovim/default.nix +++ b/home/editor/neovim/default.nix @@ -25,7 +25,7 @@ }; home.packages = with pkgs; [ # nix stuff - nixpkgs-fmt + nixpkgs-fmt nil statix ]; diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix index 0adda58..1202e35 100644 --- a/home/hyprland/hyprland.nix +++ b/home/hyprland/hyprland.nix @@ -76,13 +76,15 @@ "$mainMod,l,movewindow,r" "$mainMod,k,movewindow,u" "$mainMod,j,movewindow,d" - ] ++ (builtins.concatLists (builtins.genList (x: - let - ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10)); - in [ - "$mainMod, ${ws}, workspace, ${toString (x + 1)}" - "ALT, ${ws}, workspace, ${toString (x + 1)}" - ]) 10)); + ] ++ (builtins.concatLists (builtins.genList + (x: + let + ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10)); + in + [ + "$mainMod, ${ws}, workspace, ${toString (x + 1)}" + "ALT, ${ws}, workspace, ${toString (x + 1)}" + ]) 10)); exec-once = [ "waybar &" ]; }; }; diff --git a/home/packages/default.nix b/home/packages/default.nix index cded113..ca6c64e 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -10,7 +10,7 @@ ncdu pamixer pinentry - pre-commit + pre-commit pulsemixer rbw restic @@ -32,5 +32,8 @@ python3 poetry ruff + + # Rust + rustup ]; } diff --git a/home/programs/tmux/default.nix b/home/programs/tmux/default.nix index 25f11f4..fdb2647 100644 --- a/home/programs/tmux/default.nix +++ b/home/programs/tmux/default.nix @@ -11,4 +11,3 @@ in { }; }; } - diff --git a/hosts/prismo/configuration.nix b/hosts/prismo/configuration.nix index 1396047..d2e6821 100644 --- a/hosts/prismo/configuration.nix +++ b/hosts/prismo/configuration.nix @@ -54,4 +54,3 @@ # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "23.11"; # Did you read the comment? } -