mthomson/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting

Browse Source 
Signed-off-by: Michael Thomson <michael@michaelthomson.dev>
This commit is contained in:
Michael Thomson 2024-11-17 21:07:58 -05:00
parent f3e9f9e031
commit 5a9eafc05c
No known key found for this signature in database
GPG Key ID: 8EFECCD347C72F7D
33 changed files with 310 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hosts/dell/configuration.nix
View File

@ -1,23 +1,25 @@
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ pkgs,
./hardware-configuration.nix inputs,
inputs.home-manager.nixosModules.default ...
inputs.nixos-hardware.nixosModules.dell-xps-15-9560 }: {
../../modules/nixos/bootloader.nix imports = [
../../modules/nixos/user.nix ./hardware-configuration.nix
../../modules/nixos/i3.nix inputs.home-manager.nixosModules.default
../../modules/nixos/nvidia.nix inputs.nixos-hardware.nixosModules.dell-xps-15-9560
../../modules/nixos/nm.nix ../../modules/nixos/bootloader.nix
../../modules/nixos/sound.nix ../../modules/nixos/user.nix
../../modules/nixos/env.nix ../../modules/nixos/i3.nix
../../modules/nixos/1password.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.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelParams = [ "psmouse.synaptics_intertouch=0" ]; boot.kernelParams = ["psmouse.synaptics_intertouch=0"];
networking.hostName = "dell"; networking.hostName = "dell";
@ -27,7 +29,7 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
@ -36,7 +38,7 @@
]; ];
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {
@ -45,5 +47,4 @@
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

44
hosts/dell/hardware-configuration.nix
View File

@ -1,31 +1,35 @@
# 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, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") 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.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
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/b0a1038d-556d-46e9-9289-fc5544d911c7"; device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/32F4-C54C"; device = "/dev/disk/by-uuid/32F4-C54C";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b"; } {device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

6
hosts/dell/home.nix
View File

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
imports = [ imports = [
../../modules/home-manager/i3 ../../modules/home-manager/i3
../../modules/home-manager/ssh ../../modules/home-manager/ssh

47
hosts/desktop/configuration.nix
View File

@ -1,24 +1,26 @@
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ pkgs,
./hardware-configuration.nix inputs,
inputs.home-manager.nixosModules.default ...
../../modules/nixos/bootloader.nix }: {
../../modules/nixos/user.nix imports = [
../../modules/nixos/ssh.nix ./hardware-configuration.nix
../../modules/nixos/bluetooth.nix inputs.home-manager.nixosModules.default
../../modules/nixos/nvidia.nix ../../modules/nixos/bootloader.nix
../../modules/nixos/i3.nix ../../modules/nixos/user.nix
../../modules/nixos/nm.nix ../../modules/nixos/ssh.nix
../../modules/nixos/sound.nix ../../modules/nixos/bluetooth.nix
../../modules/nixos/steam.nix ../../modules/nixos/nvidia.nix
../../modules/nixos/env.nix ../../modules/nixos/i3.nix
../../modules/nixos/1password.nix ../../modules/nixos/nm.nix
../../modules/nixos/postgres.nix ../../modules/nixos/sound.nix
../../modules/nixos/docker.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; boot.kernelPackages = pkgs.linuxPackages_latest;
@ -30,7 +32,7 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
@ -40,7 +42,7 @@
]; ];
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {
@ -49,5 +51,4 @@
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

42
hosts/desktop/hardware-configuration.nix
View File

@ -1,30 +1,34 @@
# 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, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c"; device = "/dev/disk/by-uuid/f8d20844-226c-4375-9856-6ee29e08019c";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/FDF5-4C02"; device = "/dev/disk/by-uuid/FDF5-4C02";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = ["fmask=0022" "dmask=0022"];
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

6
hosts/desktop/home.nix
View File

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
imports = [ imports = [
../../modules/home-manager/i3 ../../modules/home-manager/i3
../../modules/home-manager/ssh ../../modules/home-manager/ssh

18
hosts/macbook/configuration.nix
View File

@ -1,10 +1,12 @@
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ pkgs,
inputs.home-manager.darwinModules.default inputs,
]; ...
}: {
imports = [
inputs.home-manager.darwinModules.default
];
nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.hostPlatform = "aarch64-darwin";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -29,7 +31,7 @@
home = "/Users/mthomson"; home = "/Users/mthomson";
}; };
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
man-pages man-pages
@ -46,7 +48,7 @@
}; };
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {

6
hosts/macbook/home.nix
View File

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
imports = [ imports = [
../../modules/home-manager/git ../../modules/home-manager/git
../../modules/home-manager/nixvim ../../modules/home-manager/nixvim

36
hosts/thinkpad/configuration.nix
View File

@ -1,22 +1,24 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. pkgs,
./hardware-configuration.nix inputs,
inputs.home-manager.nixosModules.default ...
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220 }: {
../../modules/nixos/user.nix imports = [
../../modules/nixos/i3.nix # Include the results of the hardware scan.
../../modules/nixos/nm.nix ./hardware-configuration.nix
../../modules/nixos/sound.nix inputs.home-manager.nixosModules.default
../../modules/nixos/env.nix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x220
../../modules/nixos/1password.nix ../../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; boot.kernelPackages = pkgs.linuxPackages_latest;
@ -32,7 +34,7 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = ["nix-command" "flakes"];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
@ -41,7 +43,7 @@
]; ];
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = {inherit inputs;};
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {

36
hosts/thinkpad/hardware-configuration.nix
View File

@ -1,26 +1,30 @@
# 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, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc"; device = "/dev/disk/by-uuid/08ecde1d-02ae-4308-a6d1-93ec9361a2fc";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06"; } {device = "/dev/disk/by-uuid/add2134a-831a-42bd-8822-8a4f0702aa06";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

6
hosts/thinkpad/home.nix
View File

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
imports = [ imports = [
../../modules/home-manager/i3 ../../modules/home-manager/i3
../../modules/home-manager/ssh ../../modules/home-manager/ssh

16
modules/home-manager/email/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
w3m w3m
]; ];
@ -114,11 +116,11 @@
vdirsyncer = { vdirsyncer = {
enable = true; enable = true;
auth = "basic"; auth = "basic";
collections = [ "default" "shared" ]; collections = ["default" "shared"];
}; };
khal = { khal = {
enable = true; enable = true;
addresses = [ "michael@michaelthomson.dev" ]; addresses = ["michael@michaelthomson.dev"];
type = "discover"; type = "discover";
}; };
}; };
@ -142,12 +144,12 @@
vdirsyncer = { vdirsyncer = {
enable = true; enable = true;
auth = "basic"; auth = "basic";
collections = [ "default" ]; collections = ["default"];
}; };
khal = { khal = {
enable = true; enable = true;
addresses = [ "michael@michaelthomson.dev" ]; addresses = ["michael@michaelthomson.dev"];
collections = [ "default" ]; collections = ["default"];
}; };
}; };
}; };

6
modules/home-manager/git/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Michael Thomson"; userName = "Michael Thomson";

6
modules/home-manager/i3/default.nix
View File

@ -1,5 +1,7 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
home.file.".config/i3/config".source = ./config; home.file.".config/i3/config".source = ./config;
} }

6
modules/home-manager/kitty/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = { font = {

29
modules/home-manager/nixvim/default.nix
View File

@ -1,6 +1,9 @@
{ inputs, pkgs, config, ... }:
{ {
inputs,
pkgs,
config,
...
}: {
imports = [ imports = [
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
]; ];
@ -185,18 +188,18 @@
"<C-y>" = "cmp.mapping.confirm { select = true }"; "<C-y>" = "cmp.mapping.confirm { select = true }";
"<C-Space>" = "cmp.mapping.complete {}"; "<C-Space>" = "cmp.mapping.complete {}";
"<C-l>" = '' "<C-l>" = ''
cmp.mapping(function() cmp.mapping(function()
if luasnip.expand_or_locally_jumpable() then if luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump() luasnip.expand_or_jump()
end end
end, { 'i', 's' }) end, { 'i', 's' })
''; '';
"<C-h>" = '' "<C-h>" = ''
cmp.mapping(function() cmp.mapping(function()
if luasnip.locally_jumpable(-1) then if luasnip.locally_jumpable(-1) then
luasnip.jump(-1) luasnip.jump(-1)
end end
end, { 'i', 's' }) end, { 'i', 's' })
''; '';
}; };
sources = [ sources = [
@ -234,7 +237,7 @@
enable = true; enable = true;
settings = { settings = {
formatting = { formatting = {
command = [ "alejandra" ]; command = ["alejandra"];
}; };
options = { options = {
nix-darwin = { nix-darwin = {

0
modules/home-manager/nixvim/plugins/treesitter.nix
View File

8
modules/home-manager/password-store/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
pinentry-curses pinentry-curses
]; ];
@ -11,7 +13,7 @@
}; };
password-store = { password-store = {
enable = true; 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 = { settings = {
PASSWORD_STORE_DIR = "\${HOME}/.password-store"; PASSWORD_STORE_DIR = "\${HOME}/.password-store";
}; };

6
modules/home-manager/ssh/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
}; };

6
modules/home-manager/syncthing/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
services = { services = {
syncthing = { syncthing = {
enable = true; enable = true;

6
modules/home-manager/taskwarrior/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs = { programs = {
taskwarrior = { taskwarrior = {
enable = true; enable = true;

44
modules/home-manager/tmux/default.nix
View File

@ -1,8 +1,10 @@
{ pkgs, config, ... }: {
pkgs,
config,
...
}:
# TODO: Remove the default shell and default-command once tmux sensibleOnTop fixes their shit # TODO: Remove the default shell and default-command once tmux sensibleOnTop fixes their shit
# ref: https://github.com/nix-community/home-manager/issues/5952 # ref: https://github.com/nix-community/home-manager/issues/5952
{ {
programs = { programs = {
tmux = { tmux = {
@ -16,28 +18,28 @@
tmuxPlugins.vim-tmux-navigator tmuxPlugins.vim-tmux-navigator
]; ];
extraConfig = '' extraConfig = ''
bind '"' split-window -c "#{pane_current_path}" bind '"' split-window -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}" bind % split-window -h -c "#{pane_current_path}"
set-option -sa terminal-overrides ",xterm*:Tc" set-option -sa terminal-overrides ",xterm*:Tc"
set -s escape-time 0 set -s escape-time 0
set -g status-left-length 30 # could be any number set -g status-left-length 30 # could be any number
fg="#CBCCC6" fg="#CBCCC6"
bg="#212732" bg="#212732"
status_bg="#34455A" status_bg="#34455A"
border_fg="#70748C" border_fg="#70748C"
border_active_fg="#FECB6E" border_active_fg="#FECB6E"
status_left_bg="#FFA759" 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-border-style "bg=$bg,fg=$border_fg"
set -g pane-active-border-style "bg=$bg,fg=$border_active_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-current-style "fg=$border_active_fg"
set -g window-status-style "fg=$fg" set -g window-status-style "fg=$fg"
set -gu default-command set -gu default-command
set -g default-shell "$SHELL" set -g default-shell "$SHELL"
''; '';
}; };
}; };

88
modules/home-manager/wezterm/default.nix
View File

@ -1,55 +1,57 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
return { return {
-- color_scheme = 'Ayu Dark (Gogh)', -- color_scheme = 'Ayu Dark (Gogh)',
font = wezterm.font('JetBrainsMono Nerd Font'), font = wezterm.font('JetBrainsMono Nerd Font'),
font_size = 16, font_size = 16,
use_fancy_tab_bar = false, use_fancy_tab_bar = false,
native_macos_fullscreen_mode = false, native_macos_fullscreen_mode = false,
enable_scroll_bar = false, enable_scroll_bar = false,
window_decorations = "RESIZE", window_decorations = "RESIZE",
enable_kitty_graphics = true, enable_kitty_graphics = true,
hide_tab_bar_if_only_one_tab = true, hide_tab_bar_if_only_one_tab = true,
keys = { keys = {
{ {
key = 'n', key = 'n',
mods = 'CMD|SHIFT', mods = 'CMD|SHIFT',
action = wezterm.action.ToggleFullScreen, action = wezterm.action.ToggleFullScreen,
},
}, },
}, window_padding = {
window_padding = { left = 0,
left = 0, right = 0,
right = 0, top = 0,
top = 0, bottom = 0,
bottom = 0, },
}, window_background_opacity = 1,
window_background_opacity = 1, macos_window_background_blur = 0,
macos_window_background_blur = 0, front_end = "WebGpu",
front_end = "WebGpu", force_reverse_video_cursor = true,
force_reverse_video_cursor = true, colors = {
colors = { foreground = "#dcd7ba",
foreground = "#dcd7ba", background = "#1f1f28",
background = "#1f1f28",
cursor_bg = "#c8c093", cursor_bg = "#c8c093",
cursor_fg = "#c8c093", cursor_fg = "#c8c093",
cursor_border = "#c8c093", cursor_border = "#c8c093",
selection_fg = "#c8c093", selection_fg = "#c8c093",
selection_bg = "#2d4f67", selection_bg = "#2d4f67",
scrollbar_thumb = "#16161d", scrollbar_thumb = "#16161d",
split = "#16161d", split = "#16161d",
ansi = { "#090618", "#c34043", "#76946a", "#c0a36e", "#7e9cd8", "#957fb8", "#6a9589", "#c8c093" }, ansi = { "#090618", "#c34043", "#76946a", "#c0a36e", "#7e9cd8", "#957fb8", "#6a9589", "#c8c093" },
brights = { "#727169", "#e82424", "#98bb6c", "#e6c384", "#7fb4ca", "#938aa9", "#7aa89f", "#dcd7ba" }, brights = { "#727169", "#e82424", "#98bb6c", "#e6c384", "#7fb4ca", "#938aa9", "#7aa89f", "#dcd7ba" },
indexed = { [16] = "#ffa066", [17] = "#ff5d62" }, indexed = { [16] = "#ffa066", [17] = "#ff5d62" },
}, },
} }
''; '';
}; };
} }

6
modules/home-manager/zathura/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs = { programs = {
zathura = { zathura = {
enable = true; enable = true;

6
modules/home-manager/zoxide/default.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs = { programs = {
zoxide = { zoxide = {
enable = true; enable = true;

7
modules/home-manager/zsh/default.nix
View File

@ -1,7 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
programs = { programs = {
fzf = { fzf = {
enable = true; enable = true;

2
modules/nixos/1password.nix
View File

@ -3,7 +3,7 @@
_1password.enable = true; _1password.enable = true;
_1password-gui = { _1password-gui = {
enable = true; enable = true;
polkitPolicyOwners = [ "mthomson" ]; polkitPolicyOwners = ["mthomson"];
}; };
}; };
} }

1
modules/nixos/bluetooth.nix
View File

@ -3,4 +3,3 @@
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
services.blueman.enable = true; services.blueman.enable = true;
} }

16
modules/nixos/i3.nix
View File

@ -1,7 +1,5 @@
{ pkgs, ... }: {pkgs, ...}: {
environment.pathsToLink = ["/libexec"];
{
environment.pathsToLink = [ "/libexec" ];
services.xserver = { services.xserver = {
enable = true; enable = true;
@ -19,11 +17,11 @@
package = pkgs.i3-gaps; package = pkgs.i3-gaps;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
dmenu dmenu
i3status i3status
i3lock i3lock
i3blocks i3blocks
feh feh
arandr arandr
]; ];
}; };

4
modules/nixos/nix-ld.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; []; programs.nix-ld.libraries = with pkgs; [];
} }

8
modules/nixos/nvidia.nix
View File

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
}; };
@ -10,5 +12,5 @@
hardware.nvidia.open = false; hardware.nvidia.open = false;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = ["nvidia"];
} }

6
modules/nixos/postgres.nix
View File

@ -1,9 +1,7 @@
{ pkgs, ... }: {pkgs, ...}: {
{
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ "mydatabase" ]; ensureDatabases = ["mydatabase"];
enableTCPIP = true; enableTCPIP = true;
port = 5432; port = 5432;
authentication = pkgs.lib.mkOverride 10 '' authentication = pkgs.lib.mkOverride 10 ''

7
modules/nixos/user.nix
View File

@ -1,6 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
programs.zsh.enable = true; programs.zsh.enable = true;
nix.settings = { nix.settings = {
@ -16,12 +14,11 @@
]; ];
}; };
users.users.mthomson = { users.users.mthomson = {
shell = pkgs.zsh; shell = pkgs.zsh;
isNormalUser = true; isNormalUser = true;
description = "Michael Thomson"; description = "Michael Thomson";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; []; packages = with pkgs; [];
openssh.authorizedKeys.keys = [ 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" "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"