nix fmt
All checks were successful
/ check (push) Successful in 1m39s

This commit is contained in:
Oliver Davies 2025-07-10 22:55:59 +01:00
parent b32493780d
commit 6a87e455bd
16 changed files with 105 additions and 46 deletions

View file

@ -1,28 +1,43 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (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.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/40649879-4ee6-4668-8257-fe81a7773024"; device = "/dev/disk/by-uuid/40649879-4ee6-4668-8257-fe81a7773024";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/24B1-88CB"; device = "/dev/disk/by-uuid/24B1-88CB";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
}; "fmask=0077"
"dmask=0077"
];
};
swapDevices = [ ]; swapDevices = [ ];

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.features.cli.${service}; cfg = config.features.cli.${service};
@ -18,10 +23,12 @@ in
enable = true; enable = true;
keybindings = { 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 + BackSpace" = "/home/opdavies/sysact";
"super + shift + b" = "/etc/profiles/per-user/opdavies/bin/bookmarkthis"; "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 + shift + p" = "${getExe pkgs.passmenu-otp} -i";
"super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}"; "super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}";
"@F3" = "${getExe pkgs.displayselect}"; "@F3" = "${getExe pkgs.displayselect}";

View file

@ -38,7 +38,7 @@
settings.flavour = "mocha"; settings.flavour = "mocha";
}; };
diagnostic.settings = { diagnostic.settings = {
signs = true; signs = true;
underline = false; underline = false;
update_in_insert = false; update_in_insert = false;

View file

@ -31,7 +31,10 @@
{ {
action = "\"+y"; action = "\"+y";
key = "<leader>y"; key = "<leader>y";
mode = ["n" "x"]; mode = [
"n"
"x"
];
} }
{ {
@ -48,7 +51,10 @@
{ {
action = "<Esc>:w<CR>"; action = "<Esc>:w<CR>";
key = "<C-s>"; key = "<C-s>";
mode = ["i" "n"]; mode = [
"i"
"n"
];
} }
{ {

View file

@ -5,8 +5,8 @@
keymaps = lib.mkIf config.plugins.fugitive.enable [ keymaps = lib.mkIf config.plugins.fugitive.enable [
{ {
key = "<leader>gc"; key = "<leader>gc";
action = "<cmd>Git commit<CR><C-w>K"; action = "<cmd>Git commit<CR><C-w>K";
} }
{ {

View file

@ -27,7 +27,10 @@
{ {
action = "<cmd>Gitsigns stage_hunk<CR>"; action = "<cmd>Gitsigns stage_hunk<CR>";
key = "<leader>hs"; key = "<leader>hs";
mode = ["n" "v"]; mode = [
"n"
"v"
];
} }
{ {

View file

@ -3,13 +3,13 @@
enable = true; enable = true;
modules = { modules = {
ai = {}; ai = { };
align = {}; align = { };
bracketed = {}; bracketed = { };
move = {}; move = { };
operators = {}; operators = { };
splitjoin = {}; splitjoin = { };
surround = {}; surround = { };
}; };
}; };
} }

View file

@ -15,6 +15,9 @@
}; };
keymaps = lib.mkIf config.plugins.oil.enable [ keymaps = lib.mkIf config.plugins.oil.enable [
{ action = "<cmd>Oil<CR>"; key = "-"; } {
action = "<cmd>Oil<CR>";
key = "-";
}
]; ];
} }

View file

@ -6,8 +6,8 @@
enableTelescope = true; enableTelescope = true;
}; };
keymaps = keymaps = lib.mkIf config.plugins.refactoring.enable (
lib.mkIf config.plugins.refactoring.enable ([ [
{ {
key = "<leader>ri"; key = "<leader>ri";
action = "<cmd>Refactor inline_var<CR>"; action = "<cmd>Refactor inline_var<CR>";
@ -43,5 +43,6 @@
''; '';
options.silent = true; options.silent = true;
} }
]); ]
);
} }

View file

@ -29,4 +29,3 @@
settings.pickers.find_files.hidden = true; settings.pickers.find_files.hidden = true;
}; };
} }

View file

@ -44,4 +44,3 @@
treesitter-textobjects.enable = true; treesitter-textobjects.enable = true;
}; };
} }

View file

@ -4,6 +4,9 @@
plugins.undotree.enable = true; plugins.undotree.enable = true;
keymaps = lib.mkIf config.plugins.undotree.enable [ keymaps = lib.mkIf config.plugins.undotree.enable [
{ action = "<cmd>UndotreeToggle<CR>"; key = "<leader>u"; } {
action = "<cmd>UndotreeToggle<CR>";
key = "<leader>u";
}
]; ];
} }

View file

@ -4,8 +4,17 @@
plugins.vim-test.enable = true; plugins.vim-test.enable = true;
keymaps = lib.mkIf config.plugins.vim-test.enable [ keymaps = lib.mkIf config.plugins.vim-test.enable [
{ key = "<leader>tf"; action = "<cmd>TestFile<CR>"; } {
{ key = "<leader>tl"; action = "<cmd>TestLast<CR>"; } key = "<leader>tf";
{ key = "<leader>tn"; action = "<cmd>TestNearest<CR>"; } action = "<cmd>TestFile<CR>";
}
{
key = "<leader>tl";
action = "<cmd>TestLast<CR>";
}
{
key = "<leader>tn";
action = "<cmd>TestNearest<CR>";
}
]; ];
} }

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
@ -6,8 +11,7 @@ let
cfg = config.features.desktop.browsers.qutebrowser; cfg = config.features.desktop.browsers.qutebrowser;
in in
{ {
options.features.desktop.browsers.qutebrowser.enable = options.features.desktop.browsers.qutebrowser.enable = mkEnableOption "Enable qutebrowser";
mkEnableOption "Enable qutebrowser";
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.qutebrowser = { programs.qutebrowser = {

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;

View file

@ -4,14 +4,19 @@ let
cfg = config.features.cli.${service}; cfg = config.features.cli.${service};
service = "kanata"; service = "kanata";
inherit (lib) mkEnableOption mkIf mkOption types; inherit (lib)
mkEnableOption
mkIf
mkOption
types
;
in in
{ {
options.features.cli.${service} = { options.features.cli.${service} = {
enable = mkEnableOption "Enable ${service}"; enable = mkEnableOption "Enable ${service}";
devices = mkOption { devices = mkOption {
default = []; default = [ ];
type = types.listOf types.str; type = types.listOf types.str;
}; };
}; };