diff --git a/hardware/fcs-tristan-nixbook.nix b/hardware/fcs-tristan-nixbook.nix index 17d970e..a3370d4 100644 --- a/hardware/fcs-tristan-nixbook.nix +++ b/hardware/fcs-tristan-nixbook.nix @@ -60,7 +60,7 @@ in { boot.plymouth.enable = true; boot.initrd.verbose = false; boot.consoleLogLevel = 1; - boot.kernelParams = [ "quiet" "udev.log_level=3" ]; + boot.kernelParams = ["quiet" "udev.log_level=3"]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -110,5 +110,4 @@ in { }; } ]; - } diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 6d8b720..a398bec 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ ./pcmanfm.nix ./mpv.nix @@ -34,7 +31,6 @@ bitwarden ]; - xdg.mimeApps.defaultApplications = { "application/pdf" = "sioyek.desktop"; }; diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index 4685486..5508be3 100644 --- a/home/programs/neovim/default.nix +++ b/home/programs/neovim/default.nix @@ -1,9 +1,14 @@ -{config, pkgs, lib, ...}: { +{ + config, + pkgs, + lib, + ... +}: { programs.nixvim = { enable = true; } - // ( import ../../../lib/nixvim.nix {inherit pkgs;} ); + // (import ../../../lib/nixvim.nix {inherit pkgs;}); programs.vscode = { extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim]; diff --git a/home/programs/work.nix b/home/programs/work.nix index 4b26bc1..803b582 100644 --- a/home/programs/work.nix +++ b/home/programs/work.nix @@ -41,7 +41,6 @@ in { remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder') docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash '')) - ]; home.sessionVariables = { diff --git a/lib/nixvim.nix b/lib/nixvim.nix index b94c0e9..221fc0c 100644 --- a/lib/nixvim.nix +++ b/lib/nixvim.nix @@ -202,7 +202,7 @@ cmp = { enable = true; - settings = { + settings = { mapping = { "" = "cmp.mapping.complete()"; "" = "cmp.mapping.scroll_docs(4)"; @@ -213,9 +213,9 @@ "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; }; sources = [ - { name = "nvim_lsp"; } - { name = "path"; } - { name = "buffer"; } + {name = "nvim_lsp";} + {name = "path";} + {name = "buffer";} ]; }; }; @@ -256,9 +256,18 @@ enable = true; lookahead = true; keymaps = { - "af" = { query = "@function.outer"; desc = "Function Outer"; }; - "ac" = { query = "@comment.outer"; desc = "Comment Outer"; }; - "if" = { query = "@function.inner"; desc = "Function Inner"; }; + "af" = { + query = "@function.outer"; + desc = "Function Outer"; + }; + "ac" = { + query = "@comment.outer"; + desc = "Comment Outer"; + }; + "if" = { + query = "@function.inner"; + desc = "Function Inner"; + }; }; }; }; @@ -267,5 +276,4 @@ ts-autotag.enable = true; guess-indent.enable = true; }; - } diff --git a/nixos/modules/work.nix b/nixos/modules/work.nix index bd1427f..675ac39 100644 --- a/nixos/modules/work.nix +++ b/nixos/modules/work.nix @@ -17,7 +17,6 @@ in { "openssl-1.1.1w" # required for mongodb ]; - networking = { networkmanager = { plugins = [pkgs.networkmanager-openvpn]; diff --git a/pkgs/mongodb.nix b/pkgs/mongodb.nix index 6900602..46f2cac 100644 --- a/pkgs/mongodb.nix +++ b/pkgs/mongodb.nix @@ -1,6 +1,9 @@ -{stdenv, pkgs, ...}: -let - version = "6.0.14"; +{ + stdenv, + pkgs, + ... +}: let + version = "6.0.14"; in stdenv.mkDerivation { name = "mongodb"; @@ -29,4 +32,3 @@ in runHook postInstall ''; } -