mthomson/nixos
1
0
Fork 0
Code Issues Pull Requests Actions 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
33 changed files with 310 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"];
};
};
};

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

@@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.git = {
enable = true;
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;
}

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

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

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

@@ -1,6 +1,9 @@
{ inputs, pkgs, config, ... }:
{
inputs,
pkgs,
config,
...
}: {
imports = [
inputs.nixvim.homeManagerModules.nixvim
];
@@ -185,18 +188,18 @@
"<C-y>" = "cmp.mapping.confirm { select = true }";
"<C-Space>" = "cmp.mapping.complete {}";
"<C-l>" = ''
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' })
'';
"<C-h>" = ''
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 = {

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; [
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";
};

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

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

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

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

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

@@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs = {
taskwarrior = {
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
# 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"
'';
};
};

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

@@ -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" },
},
}
'';
};
}

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

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

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

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

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

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

2
modules/nixos/1password.nix
View File

@@ -3,7 +3,7 @@
_1password.enable = true;
_1password-gui = {
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
services.blueman.enable = true;
}

16
modules/nixos/i3.nix
View File

@@ -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
];
};

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

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

8
modules/nixos/nvidia.nix
View File

@@ -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"];
}

6
modules/nixos/postgres.nix
View File

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

7
modules/nixos/user.nix
View File

@@ -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"