diff --git a/hosts/nixedo/hardware-configuration.nix b/hosts/nixedo/hardware-configuration.nix index 2164da42..c2508935 100644 --- a/hosts/nixedo/hardware-configuration.nix +++ b/hosts/nixedo/hardware-configuration.nix @@ -1,28 +1,43 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/40649879-4ee6-4668-8257-fe81a7773024"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/40649879-4ee6-4668-8257-fe81a7773024"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/24B1-88CB"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/24B1-88CB"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; swapDevices = [ ]; diff --git a/modules/home-manager/cli/sxhkd.nix b/modules/home-manager/cli/sxhkd.nix index 2495ef8b..5a242e3e 100644 --- a/modules/home-manager/cli/sxhkd.nix +++ b/modules/home-manager/cli/sxhkd.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.features.cli.${service}; @@ -18,10 +23,12 @@ in enable = true; keybindings = { - "{_, shift +, super +}XF86MonBrightness{Down,Up}" = "${getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet"; + "{_, shift +, super +}XF86MonBrightness{Down,Up}" = + "${getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet"; "super + BackSpace" = "/home/opdavies/sysact"; "super + shift + b" = "/etc/profiles/per-user/opdavies/bin/bookmarkthis"; - "super + shift + i" = "${pkgs.xdotool}/bin/xdotool type $(cat ~/.local/share/snippets.txt | grep -v '^#' | grep -v '^$' | sort | dmenu -i -l 50 | cut -d' ' -f1)"; + "super + shift + i" = + "${pkgs.xdotool}/bin/xdotool type $(cat ~/.local/share/snippets.txt | grep -v '^#' | grep -v '^$' | sort | dmenu -i -l 50 | cut -d' ' -f1)"; "super + shift + p" = "${getExe pkgs.passmenu-otp} -i"; "super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}"; "@F3" = "${getExe pkgs.displayselect}"; diff --git a/modules/home-manager/coding/neovim/config/default.nix b/modules/home-manager/coding/neovim/config/default.nix index 93c3dcb7..b2886b2d 100644 --- a/modules/home-manager/coding/neovim/config/default.nix +++ b/modules/home-manager/coding/neovim/config/default.nix @@ -38,7 +38,7 @@ settings.flavour = "mocha"; }; - diagnostic.settings = { + diagnostic.settings = { signs = true; underline = false; update_in_insert = false; diff --git a/modules/home-manager/coding/neovim/config/keymaps.nix b/modules/home-manager/coding/neovim/config/keymaps.nix index 0c51a5bd..7ecaa6ee 100644 --- a/modules/home-manager/coding/neovim/config/keymaps.nix +++ b/modules/home-manager/coding/neovim/config/keymaps.nix @@ -31,7 +31,10 @@ { action = "\"+y"; key = "y"; - mode = ["n" "x"]; + mode = [ + "n" + "x" + ]; } { @@ -48,7 +51,10 @@ { action = ":w"; key = ""; - mode = ["i" "n"]; + mode = [ + "i" + "n" + ]; } { diff --git a/modules/home-manager/coding/neovim/config/plugins/fugitive.nix b/modules/home-manager/coding/neovim/config/plugins/fugitive.nix index 6fc46e10..87c01ce6 100644 --- a/modules/home-manager/coding/neovim/config/plugins/fugitive.nix +++ b/modules/home-manager/coding/neovim/config/plugins/fugitive.nix @@ -5,8 +5,8 @@ keymaps = lib.mkIf config.plugins.fugitive.enable [ { - key = "gc"; - action = "Git commitK"; + key = "gc"; + action = "Git commitK"; } { diff --git a/modules/home-manager/coding/neovim/config/plugins/gitsigns.nix b/modules/home-manager/coding/neovim/config/plugins/gitsigns.nix index c4f7fb4b..7c2d2b0b 100644 --- a/modules/home-manager/coding/neovim/config/plugins/gitsigns.nix +++ b/modules/home-manager/coding/neovim/config/plugins/gitsigns.nix @@ -27,7 +27,10 @@ { action = "Gitsigns stage_hunk"; key = "hs"; - mode = ["n" "v"]; + mode = [ + "n" + "v" + ]; } { diff --git a/modules/home-manager/coding/neovim/config/plugins/mini.nix b/modules/home-manager/coding/neovim/config/plugins/mini.nix index 6f05654d..53176bae 100644 --- a/modules/home-manager/coding/neovim/config/plugins/mini.nix +++ b/modules/home-manager/coding/neovim/config/plugins/mini.nix @@ -3,13 +3,13 @@ enable = true; modules = { - ai = {}; - align = {}; - bracketed = {}; - move = {}; - operators = {}; - splitjoin = {}; - surround = {}; + ai = { }; + align = { }; + bracketed = { }; + move = { }; + operators = { }; + splitjoin = { }; + surround = { }; }; }; } diff --git a/modules/home-manager/coding/neovim/config/plugins/oil.nix b/modules/home-manager/coding/neovim/config/plugins/oil.nix index bf91a77f..cbe9645a 100644 --- a/modules/home-manager/coding/neovim/config/plugins/oil.nix +++ b/modules/home-manager/coding/neovim/config/plugins/oil.nix @@ -15,6 +15,9 @@ }; keymaps = lib.mkIf config.plugins.oil.enable [ - { action = "Oil"; key = "-"; } + { + action = "Oil"; + key = "-"; + } ]; } diff --git a/modules/home-manager/coding/neovim/config/plugins/refactoring.nix b/modules/home-manager/coding/neovim/config/plugins/refactoring.nix index e696e538..fc4c84a1 100644 --- a/modules/home-manager/coding/neovim/config/plugins/refactoring.nix +++ b/modules/home-manager/coding/neovim/config/plugins/refactoring.nix @@ -6,8 +6,8 @@ enableTelescope = true; }; - keymaps = - lib.mkIf config.plugins.refactoring.enable ([ + keymaps = lib.mkIf config.plugins.refactoring.enable ( + [ { key = "ri"; action = "Refactor inline_var"; @@ -43,5 +43,6 @@ ''; options.silent = true; } - ]); + ] + ); } diff --git a/modules/home-manager/coding/neovim/config/plugins/telescope.nix b/modules/home-manager/coding/neovim/config/plugins/telescope.nix index 70d49d2b..86d0bbd3 100644 --- a/modules/home-manager/coding/neovim/config/plugins/telescope.nix +++ b/modules/home-manager/coding/neovim/config/plugins/telescope.nix @@ -29,4 +29,3 @@ settings.pickers.find_files.hidden = true; }; } - diff --git a/modules/home-manager/coding/neovim/config/plugins/treesitter.nix b/modules/home-manager/coding/neovim/config/plugins/treesitter.nix index fd6647a1..1d509575 100644 --- a/modules/home-manager/coding/neovim/config/plugins/treesitter.nix +++ b/modules/home-manager/coding/neovim/config/plugins/treesitter.nix @@ -44,4 +44,3 @@ treesitter-textobjects.enable = true; }; } - diff --git a/modules/home-manager/coding/neovim/config/plugins/undotree.nix b/modules/home-manager/coding/neovim/config/plugins/undotree.nix index 4a262eb9..2f523549 100644 --- a/modules/home-manager/coding/neovim/config/plugins/undotree.nix +++ b/modules/home-manager/coding/neovim/config/plugins/undotree.nix @@ -4,6 +4,9 @@ plugins.undotree.enable = true; keymaps = lib.mkIf config.plugins.undotree.enable [ - { action = "UndotreeToggle"; key = "u"; } + { + action = "UndotreeToggle"; + key = "u"; + } ]; } diff --git a/modules/home-manager/coding/neovim/config/plugins/vim-test.nix b/modules/home-manager/coding/neovim/config/plugins/vim-test.nix index e6e443d4..e35fbdef 100644 --- a/modules/home-manager/coding/neovim/config/plugins/vim-test.nix +++ b/modules/home-manager/coding/neovim/config/plugins/vim-test.nix @@ -4,8 +4,17 @@ plugins.vim-test.enable = true; keymaps = lib.mkIf config.plugins.vim-test.enable [ - { key = "tf"; action = "TestFile"; } - { key = "tl"; action = "TestLast"; } - { key = "tn"; action = "TestNearest"; } + { + key = "tf"; + action = "TestFile"; + } + { + key = "tl"; + action = "TestLast"; + } + { + key = "tn"; + action = "TestNearest"; + } ]; } diff --git a/modules/home-manager/desktop/browsers/qutebrowser.nix b/modules/home-manager/desktop/browsers/qutebrowser.nix index 000c00d0..407424bf 100644 --- a/modules/home-manager/desktop/browsers/qutebrowser.nix +++ b/modules/home-manager/desktop/browsers/qutebrowser.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; @@ -6,8 +11,7 @@ let cfg = config.features.desktop.browsers.qutebrowser; in { - options.features.desktop.browsers.qutebrowser.enable = - mkEnableOption "Enable qutebrowser"; + options.features.desktop.browsers.qutebrowser.enable = mkEnableOption "Enable qutebrowser"; config = mkIf cfg.enable { programs.qutebrowser = { diff --git a/modules/home-manager/desktop/media/mpv.nix b/modules/home-manager/desktop/media/mpv.nix index 36252b52..4e685082 100644 --- a/modules/home-manager/desktop/media/mpv.nix +++ b/modules/home-manager/desktop/media/mpv.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; diff --git a/modules/nixos/cli/kanata.nix b/modules/nixos/cli/kanata.nix index 394b4c6f..dc56a4a6 100644 --- a/modules/nixos/cli/kanata.nix +++ b/modules/nixos/cli/kanata.nix @@ -4,14 +4,19 @@ let cfg = config.features.cli.${service}; service = "kanata"; - inherit (lib) mkEnableOption mkIf mkOption types; + inherit (lib) + mkEnableOption + mkIf + mkOption + types + ; in { options.features.cli.${service} = { enable = mkEnableOption "Enable ${service}"; devices = mkOption { - default = []; + default = [ ]; type = types.listOf types.str; }; };