diff --git a/hosts/dell/configuration.nix b/hosts/dell/configuration.nix index ef3da7f..081b305 100644 --- a/hosts/dell/configuration.nix +++ b/hosts/dell/configuration.nix @@ -1,23 +1,25 @@ -{ config, pkgs, inputs, ... }: - { - imports = - [ - ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - inputs.nixos-hardware.nixosModules.dell-xps-15-9560 - ../../modules/nixos/bootloader.nix - ../../modules/nixos/user.nix - ../../modules/nixos/i3.nix - ../../modules/nixos/nvidia.nix - ../../modules/nixos/nm.nix - ../../modules/nixos/sound.nix - ../../modules/nixos/env.nix - ../../modules/nixos/1password.nix - ]; + config, + pkgs, + inputs, + ... +}: { + imports = [ + ./hardware-configuration.nix + inputs.home-manager.nixosModules.default + inputs.nixos-hardware.nixosModules.dell-xps-15-9560 + ../../modules/nixos/bootloader.nix + ../../modules/nixos/user.nix + ../../modules/nixos/i3.nix + ../../modules/nixos/nvidia.nix + ../../modules/nixos/nm.nix + ../../modules/nixos/sound.nix + ../../modules/nixos/env.nix + ../../modules/nixos/1password.nix + ]; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = [ "psmouse.synaptics_intertouch=0" ]; + boot.kernelParams = ["psmouse.synaptics_intertouch=0"]; networking.hostName = "dell"; @@ -27,7 +29,7 @@ nixpkgs.config.allowUnfree = true; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; environment.systemPackages = with pkgs; [ wget @@ -36,7 +38,7 @@ ]; home-manager = { - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = {inherit inputs;}; useGlobalPkgs = true; useUserPackages = true; users = { @@ -45,5 +47,4 @@ }; system.stateVersion = "23.11"; - } diff --git a/hosts/dell/hardware-configuration.nix b/hosts/dell/hardware-configuration.nix index 67db52f..c1b8fde 100644 --- a/hosts/dell/hardware-configuration.nix +++ b/hosts/dell/hardware-configuration.nix @@ -1,31 +1,35 @@ # 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, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/32F4-C54C"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/32F4-C54C"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b";} + ]; # 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 diff --git a/hosts/dell/home.nix b/hosts/dell/home.nix index 0715106..412b9ae 100644 --- a/hosts/dell/home.nix +++ b/hosts/dell/home.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: - { + config, + pkgs, + ... +}: { imports = [ ../../modules/home-manager/i3 ../../modules/home-manager/ssh @@ -34,7 +36,7 @@ lutris pavucontrol pasystray - networkmanagerapplet + networkmanagerapplet upower acpi ]; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index e257fbd..a8a3ba3 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -1,24 +1,26 @@ -{ config, pkgs, inputs, ... }: - { - imports = - [ - ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - ../../modules/nixos/bootloader.nix - ../../modules/nixos/user.nix - ../../modules/nixos/ssh.nix - ../../modules/nixos/bluetooth.nix - ../../modules/nixos/nvidia.nix - ../../modules/nixos/i3.nix - ../../modules/nixos/nm.nix - ../../modules/nixos/sound.nix - ../../modules/nixos/steam.nix - ../../modules/nixos/env.nix - ../../modules/nixos/1password.nix - ../../modules/nixos/postgres.nix - ../../modules/nixos/docker.nix - ]; + config, + pkgs, + inputs, + ... +}: { + imports = [ + ./hardware-configuration.nix + inputs.home-manager.nixosModules.default + ../../modules/nixos/bootloader.nix + ../../modules/nixos/user.nix + ../../modules/nixos/ssh.nix + ../../modules/nixos/bluetooth.nix + ../../modules/nixos/nvidia.nix + ../../modules/nixos/i3.nix + ../../modules/nixos/nm.nix + ../../modules/nixos/sound.nix + ../../modules/nixos/steam.nix + ../../modules/nixos/env.nix + ../../modules/nixos/1password.nix + ../../modules/nixos/postgres.nix + ../../modules/nixos/docker.nix + ]; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -30,7 +32,7 @@ nixpkgs.config.allowUnfree = true; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; environment.systemPackages = with pkgs; [ wget @@ -40,7 +42,7 @@ ]; home-manager = { - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = {inherit inputs;}; useGlobalPkgs = true; useUserPackages = true; users = { @@ -49,5 +51,4 @@ }; system.stateVersion = "23.11"; - } diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index b39fa03..ddd0a3b 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -1,30 +1,34 @@ # 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, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/FDF5-4C02"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/FDF5-4C02"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - swapDevices = [ ]; + swapDevices = []; # 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 diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 5c7150d..bfd60fd 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: - { + config, + pkgs, + ... +}: { imports = [ ../../modules/home-manager/i3 ../../modules/home-manager/ssh diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix index 72a8f59..1205dc8 100644 --- a/hosts/macbook/configuration.nix +++ b/hosts/macbook/configuration.nix @@ -1,10 +1,12 @@ -{ config, pkgs, inputs, ... }: - { - imports = - [ - inputs.home-manager.darwinModules.default - ]; + config, + pkgs, + inputs, + ... +}: { + imports = [ + inputs.home-manager.darwinModules.default + ]; nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.config.allowUnfree = true; @@ -29,7 +31,7 @@ home = "/Users/mthomson"; }; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; environment.systemPackages = with pkgs; [ man-pages @@ -46,7 +48,7 @@ }; home-manager = { - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = {inherit inputs;}; useGlobalPkgs = true; useUserPackages = true; users = { diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 8a74ed8..4dbf89b 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: - { + config, + pkgs, + ... +}: { imports = [ ../../modules/home-manager/git ../../modules/home-manager/nixvim diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix index a4cf97f..7dd45a5 100644 --- a/hosts/thinkpad/configuration.nix +++ b/hosts/thinkpad/configuration.nix @@ -1,22 +1,24 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, inputs, ... }: - { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220 - ../../modules/nixos/user.nix - ../../modules/nixos/i3.nix - ../../modules/nixos/nm.nix - ../../modules/nixos/sound.nix - ../../modules/nixos/env.nix - ../../modules/nixos/1password.nix - ]; + config, + pkgs, + inputs, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + inputs.home-manager.nixosModules.default + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220 + ../../modules/nixos/user.nix + ../../modules/nixos/i3.nix + ../../modules/nixos/nm.nix + ../../modules/nixos/sound.nix + ../../modules/nixos/env.nix + ../../modules/nixos/1password.nix + ]; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -32,7 +34,7 @@ nixpkgs.config.allowUnfree = true; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; environment.systemPackages = with pkgs; [ wget @@ -41,7 +43,7 @@ ]; home-manager = { - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = {inherit inputs;}; useGlobalPkgs = true; useUserPackages = true; users = { diff --git a/hosts/thinkpad/hardware-configuration.nix b/hosts/thinkpad/hardware-configuration.nix index 346ed78..bb02357 100644 --- a/hosts/thinkpad/hardware-configuration.nix +++ b/hosts/thinkpad/hardware-configuration.nix @@ -1,26 +1,30 @@ # 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, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06";} + ]; # 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 diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix index 9314831..7c4ebfe 100644 --- a/hosts/thinkpad/home.nix +++ b/hosts/thinkpad/home.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: - { + config, + pkgs, + ... +}: { imports = [ ../../modules/home-manager/i3 ../../modules/home-manager/ssh diff --git a/modules/home-manager/email/default.nix b/modules/home-manager/email/default.nix index 52619cd..3461d0e 100644 --- a/modules/home-manager/email/default.nix +++ b/modules/home-manager/email/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { home.packages = with pkgs; [ w3m ]; @@ -114,11 +116,11 @@ vdirsyncer = { enable = true; auth = "basic"; - collections = [ "default" "shared" ]; + collections = ["default" "shared"]; }; khal = { enable = true; - addresses = [ "michael@michaelthomson.dev" ]; + addresses = ["michael@michaelthomson.dev"]; type = "discover"; }; }; @@ -142,12 +144,12 @@ vdirsyncer = { enable = true; auth = "basic"; - collections = [ "default" ]; + collections = ["default"]; }; khal = { enable = true; - addresses = [ "michael@michaelthomson.dev" ]; - collections = [ "default" ]; + addresses = ["michael@michaelthomson.dev"]; + collections = ["default"]; }; }; }; diff --git a/modules/home-manager/git/default.nix b/modules/home-manager/git/default.nix index 0aa120a..0763102 100644 --- a/modules/home-manager/git/default.nix +++ b/modules/home-manager/git/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { programs.git = { enable = true; userName = "Michael Thomson"; diff --git a/modules/home-manager/i3/default.nix b/modules/home-manager/i3/default.nix index 8ee92d0..baadd24 100644 --- a/modules/home-manager/i3/default.nix +++ b/modules/home-manager/i3/default.nix @@ -1,5 +1,7 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { home.file.".config/i3/config".source = ./config; } diff --git a/modules/home-manager/kitty/default.nix b/modules/home-manager/kitty/default.nix index 045e968..a59614d 100644 --- a/modules/home-manager/kitty/default.nix +++ b/modules/home-manager/kitty/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { programs.kitty = { enable = true; font = { diff --git a/modules/home-manager/nixvim/default.nix b/modules/home-manager/nixvim/default.nix index af193e9..5c4b47a 100644 --- a/modules/home-manager/nixvim/default.nix +++ b/modules/home-manager/nixvim/default.nix @@ -1,6 +1,9 @@ -{ inputs, pkgs, config, ... }: - { + inputs, + pkgs, + config, + ... +}: { imports = [ inputs.nixvim.homeManagerModules.nixvim ]; @@ -185,18 +188,18 @@ "" = "cmp.mapping.confirm { select = true }"; "" = "cmp.mapping.complete {}"; "" = '' - cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }) + cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { 'i', 's' }) ''; "" = '' - cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }) + cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { 'i', 's' }) ''; }; sources = [ @@ -234,7 +237,7 @@ enable = true; settings = { formatting = { - command = [ "alejandra" ]; + command = ["alejandra"]; }; options = { nix-darwin = { diff --git a/modules/home-manager/nixvim/plugins/treesitter.nix b/modules/home-manager/nixvim/plugins/treesitter.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/home-manager/password-store/default.nix b/modules/home-manager/password-store/default.nix index c51b7a9..2d4f157 100644 --- a/modules/home-manager/password-store/default.nix +++ b/modules/home-manager/password-store/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { home.packages = with pkgs; [ pinentry-curses ]; @@ -11,7 +13,7 @@ }; password-store = { enable = true; - package = pkgs.pass.withExtensions (exts: [ exts.pass-otp exts.pass-file exts.pass-import ]); + package = pkgs.pass.withExtensions (exts: [exts.pass-otp exts.pass-file exts.pass-import]); settings = { PASSWORD_STORE_DIR = "\${HOME}/.password-store"; }; diff --git a/modules/home-manager/ssh/default.nix b/modules/home-manager/ssh/default.nix index 8456684..8f88bb7 100644 --- a/modules/home-manager/ssh/default.nix +++ b/modules/home-manager/ssh/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { programs.ssh = { enable = true; }; diff --git a/modules/home-manager/syncthing/default.nix b/modules/home-manager/syncthing/default.nix index e420b02..c86b570 100644 --- a/modules/home-manager/syncthing/default.nix +++ b/modules/home-manager/syncthing/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { services = { syncthing = { enable = true; diff --git a/modules/home-manager/taskwarrior/default.nix b/modules/home-manager/taskwarrior/default.nix index 4e59871..b62e6f1 100644 --- a/modules/home-manager/taskwarrior/default.nix +++ b/modules/home-manager/taskwarrior/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { programs = { taskwarrior = { enable = true; diff --git a/modules/home-manager/tmux/default.nix b/modules/home-manager/tmux/default.nix index 799cf2a..d00d357 100644 --- a/modules/home-manager/tmux/default.nix +++ b/modules/home-manager/tmux/default.nix @@ -1,8 +1,10 @@ -{ pkgs, config, ... }: - +{ + pkgs, + config, + ... +}: # TODO: Remove the default shell and default-command once tmux sensibleOnTop fixes their shit # ref: https://github.com/nix-community/home-manager/issues/5952 - { programs = { tmux = { @@ -16,28 +18,28 @@ tmuxPlugins.vim-tmux-navigator ]; extraConfig = '' - bind '"' split-window -c "#{pane_current_path}" - bind % split-window -h -c "#{pane_current_path}" - set-option -sa terminal-overrides ",xterm*:Tc" - set -s escape-time 0 - set -g status-left-length 30 # could be any number - fg="#CBCCC6" - bg="#212732" - status_bg="#34455A" - border_fg="#70748C" - border_active_fg="#FECB6E" - status_left_bg="#FFA759" + bind '"' split-window -c "#{pane_current_path}" + bind % split-window -h -c "#{pane_current_path}" + set-option -sa terminal-overrides ",xterm*:Tc" + set -s escape-time 0 + set -g status-left-length 30 # could be any number + fg="#CBCCC6" + bg="#212732" + status_bg="#34455A" + border_fg="#70748C" + border_active_fg="#FECB6E" + status_left_bg="#FFA759" - set -g status-style "bg=$status_bg,fg=$fg" + set -g status-style "bg=$status_bg,fg=$fg" - set -g pane-border-style "bg=$bg,fg=$border_fg" - set -g pane-active-border-style "bg=$bg,fg=$border_active_fg" + set -g pane-border-style "bg=$bg,fg=$border_fg" + set -g pane-active-border-style "bg=$bg,fg=$border_active_fg" - set -g window-status-current-style "fg=$border_active_fg" - set -g window-status-style "fg=$fg" + set -g window-status-current-style "fg=$border_active_fg" + set -g window-status-style "fg=$fg" - set -gu default-command - set -g default-shell "$SHELL" + set -gu default-command + set -g default-shell "$SHELL" ''; }; }; diff --git a/modules/home-manager/wezterm/default.nix b/modules/home-manager/wezterm/default.nix index 03cb275..ca2fa1d 100644 --- a/modules/home-manager/wezterm/default.nix +++ b/modules/home-manager/wezterm/default.nix @@ -1,55 +1,57 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { programs.wezterm = { enable = true; extraConfig = '' - return { - -- color_scheme = 'Ayu Dark (Gogh)', - font = wezterm.font('JetBrainsMono Nerd Font'), - font_size = 16, - use_fancy_tab_bar = false, - native_macos_fullscreen_mode = false, - enable_scroll_bar = false, - window_decorations = "RESIZE", - enable_kitty_graphics = true, - hide_tab_bar_if_only_one_tab = true, - keys = { - { - key = 'n', - mods = 'CMD|SHIFT', - action = wezterm.action.ToggleFullScreen, + return { + -- color_scheme = 'Ayu Dark (Gogh)', + font = wezterm.font('JetBrainsMono Nerd Font'), + font_size = 16, + use_fancy_tab_bar = false, + native_macos_fullscreen_mode = false, + enable_scroll_bar = false, + window_decorations = "RESIZE", + enable_kitty_graphics = true, + hide_tab_bar_if_only_one_tab = true, + keys = { + { + key = 'n', + mods = 'CMD|SHIFT', + action = wezterm.action.ToggleFullScreen, + }, }, - }, - window_padding = { - left = 0, - right = 0, - top = 0, - bottom = 0, - }, - window_background_opacity = 1, - macos_window_background_blur = 0, - front_end = "WebGpu", - force_reverse_video_cursor = true, - colors = { - foreground = "#dcd7ba", - background = "#1f1f28", + window_padding = { + left = 0, + right = 0, + top = 0, + bottom = 0, + }, + window_background_opacity = 1, + macos_window_background_blur = 0, + front_end = "WebGpu", + force_reverse_video_cursor = true, + colors = { + foreground = "#dcd7ba", + background = "#1f1f28", - cursor_bg = "#c8c093", - cursor_fg = "#c8c093", - cursor_border = "#c8c093", + cursor_bg = "#c8c093", + cursor_fg = "#c8c093", + cursor_border = "#c8c093", - selection_fg = "#c8c093", - selection_bg = "#2d4f67", + selection_fg = "#c8c093", + selection_bg = "#2d4f67", - scrollbar_thumb = "#16161d", - split = "#16161d", + scrollbar_thumb = "#16161d", + split = "#16161d", - ansi = { "#090618", "#c34043", "#76946a", "#c0a36e", "#7e9cd8", "#957fb8", "#6a9589", "#c8c093" }, - brights = { "#727169", "#e82424", "#98bb6c", "#e6c384", "#7fb4ca", "#938aa9", "#7aa89f", "#dcd7ba" }, - indexed = { [16] = "#ffa066", [17] = "#ff5d62" }, - }, - } + ansi = { "#090618", "#c34043", "#76946a", "#c0a36e", "#7e9cd8", "#957fb8", "#6a9589", "#c8c093" }, + brights = { "#727169", "#e82424", "#98bb6c", "#e6c384", "#7fb4ca", "#938aa9", "#7aa89f", "#dcd7ba" }, + indexed = { [16] = "#ffa066", [17] = "#ff5d62" }, + }, + } ''; }; } diff --git a/modules/home-manager/zathura/default.nix b/modules/home-manager/zathura/default.nix index c2489b8..e92db2f 100644 --- a/modules/home-manager/zathura/default.nix +++ b/modules/home-manager/zathura/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { programs = { zathura = { enable = true; diff --git a/modules/home-manager/zoxide/default.nix b/modules/home-manager/zoxide/default.nix index 4e4843d..da5adea 100644 --- a/modules/home-manager/zoxide/default.nix +++ b/modules/home-manager/zoxide/default.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { programs = { zoxide = { enable = true; diff --git a/modules/home-manager/zsh/default.nix b/modules/home-manager/zsh/default.nix index fc16c68..91e9aa3 100644 --- a/modules/home-manager/zsh/default.nix +++ b/modules/home-manager/zsh/default.nix @@ -1,7 +1,8 @@ -{ pkgs, config, ... }: - { - + pkgs, + config, + ... +}: { programs = { fzf = { enable = true; diff --git a/modules/nixos/1password.nix b/modules/nixos/1password.nix index 80dfd3d..94ba2c8 100644 --- a/modules/nixos/1password.nix +++ b/modules/nixos/1password.nix @@ -3,7 +3,7 @@ _1password.enable = true; _1password-gui = { enable = true; - polkitPolicyOwners = [ "mthomson" ]; + polkitPolicyOwners = ["mthomson"]; }; }; } diff --git a/modules/nixos/bluetooth.nix b/modules/nixos/bluetooth.nix index 77ef058..7ccb28d 100644 --- a/modules/nixos/bluetooth.nix +++ b/modules/nixos/bluetooth.nix @@ -3,4 +3,3 @@ hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot services.blueman.enable = true; } - diff --git a/modules/nixos/i3.nix b/modules/nixos/i3.nix index 88e7973..1306ba9 100644 --- a/modules/nixos/i3.nix +++ b/modules/nixos/i3.nix @@ -1,7 +1,5 @@ -{ pkgs, ... }: - -{ - environment.pathsToLink = [ "/libexec" ]; +{pkgs, ...}: { + environment.pathsToLink = ["/libexec"]; services.xserver = { enable = true; @@ -19,11 +17,11 @@ package = pkgs.i3-gaps; extraPackages = with pkgs; [ dmenu - i3status - i3lock - i3blocks - feh - arandr + i3status + i3lock + i3blocks + feh + arandr ]; }; diff --git a/modules/nixos/nix-ld.nix b/modules/nixos/nix-ld.nix index db9883b..434d4bc 100644 --- a/modules/nixos/nix-ld.nix +++ b/modules/nixos/nix-ld.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; []; } diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 8449410..0ee1634 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -1,6 +1,8 @@ -{ pkgs, config, ... }: - { + pkgs, + config, + ... +}: { hardware.opengl = { enable = true; }; @@ -10,5 +12,5 @@ hardware.nvidia.open = false; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = ["nvidia"]; } diff --git a/modules/nixos/postgres.nix b/modules/nixos/postgres.nix index abd45f4..c94feca 100644 --- a/modules/nixos/postgres.nix +++ b/modules/nixos/postgres.nix @@ -1,9 +1,7 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { services.postgresql = { enable = true; - ensureDatabases = [ "mydatabase" ]; + ensureDatabases = ["mydatabase"]; enableTCPIP = true; port = 5432; authentication = pkgs.lib.mkOverride 10 '' diff --git a/modules/nixos/user.nix b/modules/nixos/user.nix index e48ac51..e01204f 100644 --- a/modules/nixos/user.nix +++ b/modules/nixos/user.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{pkgs, ...}: { programs.zsh.enable = true; nix.settings = { @@ -16,12 +14,11 @@ ]; }; - users.users.mthomson = { shell = pkgs.zsh; isNormalUser = true; description = "Michael Thomson"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = ["networkmanager" "wheel"]; packages = with pkgs; []; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqLd5MRSD5GdVmFOgKGRq8t/I8I9xjH2gRMmNHSqtSPYWFx8xT8uOfwyHx1um73tMg99jb4LCs+OpTaTdEyitFygxF/UdSYvAwzP+Lg4p7n6vLljmt0V1i5Zbct3oPM5CKXsUaRZkNyJxB5gJEXe/wKQ3+xj59HV3+m6uw9MO72sI5PKSFIKQFA2LTCYkA2NfO+/VtrLwopcZ+fvIutdUgmaltA3ESWCglocQ+EDXFsdO/h2KUFN6sereT+EBVPC0ePbxWpT9gHZlpeHyPPDnDuj1lUYQisTVKiaRnyFk6FyLYyxquqk+kHX0vSGD/+tBQ/+NoE/ckp2XvjrM48M3+LqtTcOi5RnTHZFuP9NgKxUQyCGOntocNVJ50puLWgr1joFUdHABo3Xjaik0np0FL5QsfYFbNxY6x94OWUxYFUu+/ZRLMWhA3qab6+FcYo4nYB+VszNYv0kE0Lo0jk9EjACoDc/omS0i5P38wvMekwkE2k54U8CkkE+zB3gXtCATE+kN9/ueOy5W4xHhvnoRmMpFza2xO3LPIVB8mVTUiBRfwgz2+psb/AHQwsmORS9BzfA8QdaM1kbbmZo1F1iw8+m1ZCatos2xkcWgMwKfiT2224hZ7DsM+DAZ4IYQzxT7OBYknh7lX3kQeeficqF3Dlg2QLuAlOdnDqb2xyCSDyQ== mthomson"