fix formatting

README.md

@@ -1,9 +1,11 @@
 # Home Manager Configuration
 
 Rebuild the configuration
+
 ```sh
 home-manager switch --flake ~/.config/home-manager
 ```
+
 **Make sure new files are added to git**
 
 ## Initial Setup on a new machine
@@ -11,6 +13,7 @@ home-manager switch --flake ~/.config/home-manager
 Enable flakes
 
 `configuration.nix`
+
 ```nix
 nix.settings.experimental-features = [ "nix-command" "flakes" ];
 ```
@@ -20,4 +23,5 @@ git clone git@github.com:Theaninova/home-manager-config.git ~/.config/home-manag
 nix build '.#homeConfigurations.theaninova.activationPackage'
 ./result/activate
 ```
+
 After that reload the shell

desktops/hyprland/alacritty.nix

@@ -7,7 +7,10 @@
       size = 12;
     };
     window = {
-      padding = { x = 16; y = 16; };
+      padding = {
+        x = 16;
+        y = 16;
+      };
       opacity = 0.8;
     };
   };

desktops/hyprland/hyprland.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   wayland.windowManager.hyprland = {
     enable = true;
     enableNvidiaPatches = true;
@@ -151,7 +154,7 @@
   };
   programs.fuzzel = import ./fuzzel.nix;
   # programs.alacritty = import ./alacritty.nix;
-  programs.kitty = import ./kitty.nix { inherit pkgs; };
+  programs.kitty = import ./kitty.nix {inherit pkgs;};
   programs.wofi = import ./wofi.nix;
   programs.swaylock = import ./swaylock.nix;
 
@@ -170,13 +173,15 @@
     wl-clipboard
     polkit_gnome
     xdg-desktop-portal-gtk
-    /* TODO: (flameshot.overrideAttrs(prev: {
+    /*
+       TODO: (flameshot.overrideAttrs(prev: {
       nativeBuildInputs = prev.nativeBuildInputs ++ [ git grim ];
       cmakeFlags = [
         "-DUSE_WAYLAND_CLIPBOARD=1"
         "-DUSE_WAYLAND_GRIM=true"
       ];
-    }))*/
+    }))
+    */
     swww
     # ags
     glib
@@ -232,7 +237,11 @@
     file.profile = {
       enable = true;
       target = ".zprofile"; # change to .profile if you're not using zsh
-      text = /* sh */ ''
+      text =
+        /*
+        sh
+        */
+        ''
           Hyprland && echo "goodbye" && exit 0 \
           || echo "$? couldn't launch Hyprland" && tty | grep tty1 \
           && echo "refusing to autologin without Hyprland on tty1" && exit 0 \
@@ -246,4 +255,3 @@
     };
   };
 }
-

desktops/hyprland/keybinds.nix

@@ -3,7 +3,7 @@
   "SUPER,T,exec,kitty"
   "SUPER,C,togglespecialworkspace,calc"
   "SUPER_SHIFT,C,exec,hyprpicker"
-  ",PRINT,exec,slurp | grim -g - - | wl-copy"
+  "SUPER_SHIFT,V,exec,slurp | grim -g - - | wl-copy"
   "SUPER,P,pseudo,"
 
   "SUPER_SHIFT,up,movewindow,u"
@@ -11,8 +11,8 @@
   "SUPER_SHIFT,left,movewindow,l"
   "SUPER_SHIFT,right,movewindow,r"
 
-  "SUPER_SHIFT,S,movetoworkspace,special"
-  "SUPER,S,togglespecialworkspace,special"
+  "SUPER_SHIFT,S,movetoworkspace,special:terminal"
+  "SUPER,S,togglespecialworkspace,terminal"
 
   "SUPER,up,movefocus,u"
   "SUPER,down,movefocus,d"

desktops/hyprland/kitty.nix

@@ -1,5 +1,4 @@
-{ pkgs }:
-{
+{pkgs}: {
   enable = true;
   shellIntegration.enableFishIntegration = true;
   font = {

desktops/hyprland/swaylock.nix

@@ -1,3 +0,0 @@
-{
-  enable = true;
-}

desktops/hyprland/waybar.nix

@@ -6,9 +6,9 @@
       position = "top";
       height = 48;
       output = "HDMI-A-1";
-      modules-left = [ "wlr/workspaces" ];
-      modules-center = [ "wlr/taskbar" ];
-      modules-right = [ "custom/weather" "clock" ];
+      modules-left = ["wlr/workspaces"];
+      modules-center = ["wlr/taskbar"];
+      modules-right = ["custom/weather" "clock"];
 
       "wlr/taskbar" = {
         all-outputs = true;

flake.nix

@@ -17,8 +17,13 @@
     };
   };
 
-  outputs = {nixpkgs, home-manager, ags, nixvim, ...}:
-    let
+  outputs = {
+    nixpkgs,
+    home-manager,
+    ags,
+    nixvim,
+    ...
+  }: let
     username = "theaninova";
     system = "x86_64-linux";
     stateVersion = "23.11";
@@ -28,12 +33,15 @@
       config.allowUnfree = true;
     };
 
-      homeDirPrefix = if pkgs.stdenv.hostPlatform.isDarwin then "/Users" else "/home";
+    homeDirPrefix =
+      if pkgs.stdenv.hostPlatform.isDarwin
+      then "/Users"
+      else "/home";
     homeDirectory = "${homeDirPrefix}/${username}";
 
-      home = (import ./home.nix {
+    home = import ./home.nix {
       inherit homeDirectory pkgs stateVersion system username;
-      });
+    };
   in {
     homeConfigurations.theaninova = home-manager.lib.homeManagerConfiguration {
       inherit pkgs;

home.nix

@@ -1,8 +1,13 @@
-{ homeDirectory, pkgs, stateVersion, system, username }:
-let
-  packages = import ./packages.nix { inherit pkgs; };
+{
+  homeDirectory,
+  pkgs,
+  stateVersion,
+  system,
+  username,
+}: let
+  packages = import ./packages.nix {inherit pkgs;};
 in {
-  imports = [ ./desktops/hyprland/hyprland.nix ];
+  imports = [./desktops/hyprland/hyprland.nix];
 
   home = {
     inherit homeDirectory packages stateVersion username;
@@ -26,6 +31,6 @@ in {
     };
   };
 
-  programs = import ./programs.nix { inherit pkgs; };
-  services = import ./services.nix { inherit pkgs homeDirectory; };
+  programs = import ./programs.nix {inherit pkgs;};
+  services = import ./services.nix {inherit pkgs homeDirectory;};
 }

packages.nix

@@ -1,4 +1,5 @@
-{ pkgs }: with pkgs; [
+{pkgs}:
+with pkgs; [
   # nix
   cachix
   lorri
@@ -21,7 +22,7 @@
   bitwarden
 
   # chat apps
-  (import ./packages/threema-desktop.nix { inherit pkgs; })
+  (import ./packages/threema-desktop.nix {inherit pkgs;})
   (discord.override {
     withOpenASAR = true;
     withVencord = false;
@@ -40,7 +41,7 @@
   blender
 
   # development
-  (import ./packages/intellij.nix { inherit pkgs; })
+  (import ./packages/intellij.nix {inherit pkgs;})
   jetbrains.rust-rover
   insomnia
   avalonia-ilspy

packages/firefox-gnome-theme-installer.nix

@@ -1,5 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, pkgs }:
-
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkgs,
+}:
 stdenv.mkDerivation rec {
   name = "firefox-gnome-theme";
   version = "116.0.0";

packages/hid-fanatecff-tools.nix

@@ -1,5 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, pkgs }:
-
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkgs,
+}:
 stdenv.mkDerivation rec {
   pname = "hid-fanatecff-tools";
   version = "0.1.0";

packages/intellij.nix

@@ -1,7 +1,8 @@
-{ pkgs }: pkgs.jetbrains.idea-ultimate.overrideAttrs(prev: {
-  version = "233.11799.30";
+{pkgs}:
+pkgs.jetbrains.idea-ultimate.overrideAttrs (prev: {
+  version = "233.11799.67";
   src = builtins.fetchurl {
-    url = "https://download.jetbrains.com/idea/ideaIU-233.11799.30.tar.gz";
-    sha256 = "c5db01f201660c9bd3427383f6ae9179293cbdeae7e54e2d708b4d70248d8427";
+    url = "https://download.jetbrains.com/idea/ideaIU-233.11799.67.tar.gz";
+    sha256 = "374153baecd8a633fef3fe75fb5fe47e57f3d136e9873f7bd7ce1166f942559e";
   };
 })

packages/node-packages/default.nix

@@ -1,17 +1,22 @@
 # This file has been generated by node2nix 1.11.1. Do not edit!
-
-{pkgs ? import <nixpkgs> {
+{
+  pkgs ?
+    import <nixpkgs> {
       inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
-
-let
+    },
+  system ? builtins.currentSystem,
+  nodejs ? pkgs."nodejs_14",
+}: let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool =
+      if pkgs.stdenv.isDarwin
+      then pkgs.darwin.cctools
+      else null;
   };
 in
-import ./node-packages.nix {
+  import ./node-packages.nix {
     inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
     inherit nodeEnv;
-}
+  }

packages/threema-desktop.nix

@@ -1,5 +1,8 @@
-{ pkgs }: pkgs.threema-desktop.overrideAttrs(prev: {
-  postFixup = prev.postFixup + ''
+{pkgs}:
+pkgs.threema-desktop.overrideAttrs (prev: {
+  postFixup =
+    prev.postFixup
+    + ''
       echo "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" >> $out/bin/threema
     '';
 })

programs.nix

@@ -1,10 +1,9 @@
-{ pkgs }:
-{
+{pkgs}: {
   home-manager.enable = true;
   rbw = import ./programs/bitwarden.nix;
   git = import ./programs/git.nix;
   lazygit.enable = true;
-  nixvim = import ./programs/nixvim.nix { inherit pkgs; };
+  nixvim = import ./programs/nixvim.nix {inherit pkgs;};
   fish = {
     enable = true;
     interactiveShellInit = ''

programs/nixvim.nix

@@ -1,7 +1,11 @@
-{ pkgs }:
-let
-  angular-ls = (import ../packages/node-packages { inherit pkgs; nodejs = pkgs.nodejs_18; })."@angular/language-server";
-  nvim-treesitter-angular = (pkgs.vimUtils.buildVimPlugin {
+{pkgs}: let
+  angular-ls =
+    (import ../packages/node-packages {
+      inherit pkgs;
+      nodejs = pkgs.nodejs_18;
+    })
+    ."@angular/language-server";
+  nvim-treesitter-angular = pkgs.vimUtils.buildVimPlugin {
     name = "nvim-treesitter-angular";
     src = pkgs.fetchFromGitHub {
       owner = "dlvandenberg";
@@ -9,8 +13,8 @@ let
       rev = "7549872eb34934c5bc4f4df2ca71196755adfb1c";
       hash = "sha256-fayRXogWBeV9jDmjXs/u6ULlbCziKIL26pKKh9QJzf8=";
     };
-  });
-  tree-sitter-angular = (pkgs.tree-sitter.buildGrammar {
+  };
+  tree-sitter-angular = pkgs.tree-sitter.buildGrammar {
     language = "angular";
     version = "624ff10";
     src = pkgs.fetchFromGitHub {
@@ -19,8 +23,8 @@ let
       rev = "e0d7582e1ebbcf6136cfcfb22a37e20f4562acba";
       hash = "sha256-ADOlhAUidmRKCpDxmo70ZYHgtUIwxrfy0ucACfjkhlQ=";
     };
-  });
-  darkman = (pkgs.vimUtils.buildVimPlugin {
+  };
+  darkman = pkgs.vimUtils.buildVimPlugin {
     name = "darkman";
     src = pkgs.buildGoModule rec {
       pname = "darkman.nvim";
@@ -36,9 +40,8 @@ let
         cp -r lua $out
       '';
     };
-  });
-in
-  {
+  };
+in {
   enable = true;
   defaultEditor = true;
 
@@ -53,7 +56,7 @@ in
     smartindent = true;
     signcolumn = "yes";
 
-      undodir = { __raw = /* lua */ "os.getenv('HOME') .. '/.config/nvim/undodir'"; };
+    undodir = {__raw = "os.getenv('HOME') .. '/.config/nvim/undodir'";};
     undofile = true;
 
     scrolloff = 8;
@@ -66,27 +69,65 @@ in
   };
 
   keymaps = [
-      { key = "<leader>u"; mode = "n"; action = "<cmd>:UndotreeToggle<CR>"; }
-      { key = "<leader>ft"; action = "<cmd>:Neotree toggle<CR>"; }
-      { key = "<leader>s"; action = "<cmd>:SymbolsOutline<CR>"; }
+    {
+      key = "<leader>u";
+      mode = "n";
+      action = "<cmd>:UndotreeToggle<CR>";
+    }
+    {
+      key = "<leader>ft";
+      action = "<cmd>:Neotree toggle<CR>";
+    }
+    {
+      key = "<leader>s";
+      action = "<cmd>:SymbolsOutline<CR>";
+    }
 
-      { key = "J"; mode = "v"; action = ":m '>+1<CR>gv=gv"; }
-      { key = "K"; mode = "v"; action = ":m '<-2<CR>gv=gv"; }
+    {
+      key = "J";
+      mode = "v";
+      action = ":m '>+1<CR>gv=gv";
+    }
+    {
+      key = "K";
+      mode = "v";
+      action = ":m '<-2<CR>gv=gv";
+    }
 
-      { key = "<C-d>"; mode = "n"; action = "<C-d>zz"; }
-      { key = "<C-u>"; mode = "n"; action = "<C-d>zz"; }
+    {
+      key = "<C-d>";
+      mode = "n";
+      action = "<C-d>zz";
+    }
+    {
+      key = "<C-u>";
+      mode = "n";
+      action = "<C-d>zz";
+    }
 
-      { key = "<leader>p"; mode = "x"; action = "\"_dP"; }
-      { key = "<leader>p"; mode = "n"; action = "\"_dP"; }
-      { key = "<leader>p"; mode = "v"; action = "\"_dP"; }
+    {
+      key = "<leader>p";
+      mode = "x";
+      action = ''"_dP'';
+    }
+    {
+      key = "<leader>p";
+      mode = "n";
+      action = ''"_dP'';
+    }
+    {
+      key = "<leader>p";
+      mode = "v";
+      action = ''"_dP'';
+    }
   ];
 
   globals = {
     minimap_width = 10;
     minimap_auto_start = 1;
     minimap_auto_start_win_enter = 1;
-      minimap_close_buftypes = [ "nofile" ];
-      minimap_block_filetypes = [ "NvimTree" ];
+    minimap_close_buftypes = ["nofile"];
+    minimap_block_filetypes = ["NvimTree"];
 
     catppuccin_debug = true;
 
@@ -98,11 +139,11 @@ in
     providers.wl-copy.enable = true;
   };
 
-    extraConfigVim = /* vim */ ''
+  extraConfigVim = ''
     hi Normal guibg=NONE ctermbg=NONE
   '';
 
-    extraConfigLua = /* lua */ ''
+  extraConfigLua = ''
     require("darkman").setup()
 
     local Terminal  = require('toggleterm.terminal').Terminal
@@ -141,16 +182,39 @@ in
     lualine = {
       enable = true;
       globalstatus = true;
-        sectionSeparators = { left = ""; right = ""; };
-        componentSeparators = { left = "┊"; right = "┊"; };
+      sectionSeparators = {
+        left = "";
+        right = "";
+      };
+      componentSeparators = {
+        left = "┊";
+        right = "┊";
+      };
       sections = {
-          lualine_a = [ { name = "mode"; separator = { right = ""; left = ""; }; icon = ""; } ];
-          lualine_z = [ { name = "location"; separator = { right = ""; left = ""; }; } ];
+        lualine_a = [
+          {
+            name = "mode";
+            separator = {
+              right = "";
+              left = "";
+            };
+            icon = "";
+          }
+        ];
+        lualine_z = [
+          {
+            name = "location";
+            separator = {
+              right = "";
+              left = "";
+            };
+          }
+        ];
       };
     };
     auto-save = {
       enable = true;
-        triggerEvents = [ "FocusLost" "CursorHold" "BufLeave" ];
+      triggerEvents = ["FocusLost" "BufLeave"];
     };
     indent-blankline = {
       enable = true;
@@ -164,7 +228,7 @@ in
       enable = true;
       filesystem.filteredItems.visible = true;
       eventHandlers = {
-          file_opened = /* lua */ ''
+        file_opened = ''
           function()
             require('neo-tree').close_all()
           end
@@ -193,22 +257,61 @@ in
     treesitter = {
       enable = true;
       indent = true;
-        grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars ++ [tree-sitter-angular];
+      grammarPackages =
+        pkgs.vimPlugins.nvim-treesitter.allGrammars
+        ++ [tree-sitter-angular];
+      nixvimInjections = true;
     };
 
-      none-ls.enable = true;
-      lsp-format.enable = true;
+    none-ls = {
+      enable = true;
+      sources = {
+        code_actions = {
+          eslint.enable = true;
+          shellcheck.enable = true;
+        };
+        diagnostics = {
+          eslint.enable = true;
+          shellcheck.enable = true;
+        };
+        formatting = {
+          alejandra.enable = true;
+          prettier.enable = true;
+          rustfmt.enable = true;
+          shfmt.enable = true;
+          stylua.enable = true;
+        };
+      };
+      onAttach = ''
+        function(client, bufnr)
+          if client.supports_method("textDocument/formatting") then
+            vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+            vim.api.nvim_create_autocmd("BufWritePre", {
+              group = augroup,
+              buffer = bufnr,
+              callback = function()
+                vim.lsp.buf.format({async = false})
+              end,
+            })
+          end
+        end
+      '';
+    };
     lsp = {
       enable = true;
-        keymaps = {
-          diagnostic = {
-          };
-        };
+      keymaps = {diagnostic = {};};
       enabledServers = [
         {
           name = "angularls";
           extraOptions = {
-              cmd = ["${angular-ls}" "--stdio" "--tsProbeLocations" "${pkgs.nodePackages.typescript-language-server}" "--ngProbeLocations" "${angular-ls}"];
+            cmd = [
+              "${angular-ls}"
+              "--stdio"
+              "--tsProbeLocations"
+              "${pkgs.nodePackages.typescript-language-server}"
+              "--ngProbeLocations"
+              "${angular-ls}"
+            ];
           };
         }
       ];
@@ -216,7 +319,6 @@ in
         html.enable = true;
         cssls.enable = true;
         svelte.enable = true;
-          eslint.enable = true;
         tsserver.enable = true;
 
         yamlls.enable = true;
@@ -227,6 +329,7 @@ in
         pylsp.enable = true;
 
         nixd.enable = true;
+        lua-ls.enable = true;
         bashls.enable = true;
       };
     };
@@ -234,7 +337,7 @@ in
     lspkind = {
       enable = true;
       mode = "symbol";
-        cmp.after = /* lua */ ''
+      cmp.after = ''
         function(entry, vim_item, kind)
           kind.kind = kind.kind .. " ";
           return kind
@@ -244,28 +347,28 @@ in
     nvim-cmp = {
       enable = true;
       mapping = {
-          "<C-n>" = /* lua */ "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})";
-          "<C-p>" = /* lua */ "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})";
-          "<C-Space>" = /* lua */ "cmp.mapping.confirm({select = true})";
-          "<C-Enter>" = /* lua */ "cmp.mapping.complete()";
+        "<C-n>" = "cmp.mapping.select_next_item({behavior = cmp.SelectBehavior.Select})";
+        "<C-p>" = "cmp.mapping.select_prev_item({behavior = cmp.SelectBehavior.Select})";
+        "<C-Space>" = "cmp.mapping.confirm({select = true})";
+        "<C-Enter>" = "cmp.mapping.complete()";
       };
       sources = [
-          { name = "path"; }
-          { name = "nvim_lsp"; }
-          { name = "npm"; }
-          { name = "treesitter"; }
+        {name = "path";}
+        {name = "nvim_lsp";}
+        {name = "npm";}
+        {name = "treesitter";}
       ];
-        formatting.fields = [ "kind" "abbr" "menu" ];
+      formatting.fields = ["kind" "abbr" "menu"];
       window.completion.border = "rounded";
     };
 
     nix.enable = true;
   };
 
-    extraPackages = [ angular-ls pkgs.nodePackages.typescript-language-server ];
+  extraPackages = [angular-ls pkgs.nodePackages.typescript-language-server];
   extraPlugins = with pkgs.vimPlugins; [
     nvim-treesitter-angular
     vim-startuptime
     darkman
   ];
-  }
+}

services.nix

@@ -1,5 +1,7 @@
-{ pkgs, homeDirectory }:
 {
+  pkgs,
+  homeDirectory,
+}: {
   gpg-agent = {
     enable = true;
     enableSshSupport = true;
@@ -24,7 +26,7 @@
 
       vendorHash = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY=";
 
-      nativeBuildInputs = [ pkgs.scdoc ];
+      nativeBuildInputs = [pkgs.scdoc];
 
       postPatch = ''
         substituteInPlace darkman.service \
@@ -51,7 +53,7 @@
         description = "Framework for dark-mode and light-mode transitions on Linux desktop";
         homepage = "https://gitlab.com/WhyNotHugo/darkman";
         license = licenses.isc;
-        maintainers = [ maintainers.ajgrf ];
+        maintainers = [maintainers.ajgrf];
         platforms = platforms.linux;
         mainProgram = "darkman";
       };
@@ -61,11 +63,19 @@
       lng = 13.405;
     };
     darkModeScripts = {
-      gtk-theme = /* bash */ ''
+      gtk-theme =
+        /*
+        bash
+        */
+        ''
           ${pkgs.dconf}/bin/dconf write \
             /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
         '';
-      kitty-theme = /* bash */ ''
+      kitty-theme =
+        /*
+        bash
+        */
+        ''
           ${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Frappe
         '';
       wallpaper = ''
@@ -73,11 +83,19 @@
       '';
     };
     lightModeScripts = {
-      gtk-theme = /* bash */ ''
+      gtk-theme =
+        /*
+        bash
+        */
+        ''
           ${pkgs.dconf}/bin/dconf write \
             /org/gnome/desktop/interface/color-scheme "'prefer-light'"
         '';
-      kitty-theme = /* bash */ ''
+      kitty-theme =
+        /*
+        bash
+        */
+        ''
           ${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Latte
         '';
       wallpaper = ''

update-intellij.sh

@@ -15,4 +15,3 @@ sed -i "s|sha256\s*=.*|sha256 = \"$checksum\";|" "$nixFile"
 
 echo ""
 echo "IntelliJ updated to $1"
-