opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Format using nixfmt

Browse source
This commit is contained in:
Oliver Davies 2024-03-18 20:33:28 +00:00
parent a33c74c580
commit b1421c97e1
30 changed files with 184 additions and 265 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
flake.nix
View file

@ -10,42 +10,31 @@
# opdavies-nvim.url = "path:/home/opdavies/Code/github.com/opdavies/opdavies.nvim"; # opdavies-nvim.url = "path:/home/opdavies/Code/github.com/opdavies/opdavies.nvim";
}; };
outputs = inputs @ { outputs = inputs@{ flake-parts, self, ... }:
flake-parts, let
self, username = "opdavies";
...
}: let
username = "opdavies";
mkNixos = import ./lib/nixos {inherit inputs self username;}; mkNixos = import ./lib/nixos { inherit inputs self username; };
mkWsl = import ./lib/wsl2 {inherit inputs self username;}; mkWsl = import ./lib/wsl2 { inherit inputs self username; };
in in flake-parts.lib.mkFlake { inherit inputs; } {
flake-parts.lib.mkFlake {inherit inputs;} { systems = [ "x86_64-linux" ];
systems = ["x86_64-linux"];
perSystem = { perSystem = { pkgs, self', ... }: {
pkgs, packages.default =
self', pkgs.mkShell { nativeBuildInputs = [ pkgs.nixfmt pkgs.just ]; };
...
}: {
packages.default = pkgs.mkShell {
nativeBuildInputs = [pkgs.just];
};
formatter = pkgs.alejandra; formatter = pkgs.nixfmt;
}; };
flake = { flake = {
lib = import ./lib {inherit inputs;}; lib = import ./lib { inherit inputs; };
nixosConfigurations = { nixosConfigurations = {
apollo = mkNixos {desktop = true;}; apollo = mkNixos { desktop = true; };
nixedo = mkNixos {desktop = true;}; nixedo = mkNixos { desktop = true; };
}; };
homeConfigurations = { homeConfigurations = { wsl2 = mkWsl; };
wsl2 = mkWsl;
};
}; };
}; };
} }

40
lib/nixos/configuration.nix
View file

@ -1,8 +1,6 @@
{ { inputs, desktop ? false, self, }:
inputs, { pkgs, ... }:
desktop ? false, let
self,
}: {pkgs, ...}: let
configure-gtk = pkgs.writeTextFile { configure-gtk = pkgs.writeTextFile {
name = "configure-gtk"; name = "configure-gtk";
destination = "/bin/configure-gtk"; destination = "/bin/configure-gtk";
@ -17,7 +15,7 @@
''; '';
}; };
theme = import "${self}/lib/theme" {inherit pkgs;}; theme = import "${self}/lib/theme" { inherit pkgs; };
username = "opdavies"; username = "opdavies";
in { in {
@ -76,7 +74,7 @@ in {
windowManager.i3 = { windowManager.i3 = {
enable = true; enable = true;
extraPackages = with pkgs; [i3status i3lock i3blocks]; extraPackages = with pkgs; [ i3status i3lock i3blocks ];
}; };
}; };
@ -111,8 +109,8 @@ in {
users.users.${username} = { users.users.${username} = {
isNormalUser = true; isNormalUser = true;
description = "Oliver Davies"; description = "Oliver Davies";
extraGroups = ["docker" "networkmanager" "wheel"]; extraGroups = [ "docker" "networkmanager" "wheel" ];
packages = with pkgs; []; packages = with pkgs; [ ];
}; };
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
@ -128,8 +126,7 @@ in {
xfce.thunar xfce.thunar
xfce.thunar-volman xfce.thunar-volman
xfce.tumbler xfce.tumbler
] ] ++ pkgs.lib.optionals desktop [
++ pkgs.lib.optionals desktop [
acpi acpi
arandr arandr
dunst dunst
@ -190,9 +187,7 @@ in {
fonts = { fonts = {
fontconfig = { fontconfig = {
enable = true; enable = true;
defaultFonts = { defaultFonts = { monospace = [ "JetBrainsMono Nerd Font Mono" ]; };
monospace = ["JetBrainsMono Nerd Font Mono"];
};
}; };
packages = with pkgs; packages = with pkgs;
@ -207,10 +202,7 @@ in {
"JetBrainsMono" "JetBrainsMono"
]; ];
}) })
] ] ++ [ theme.fonts.monospace.package ];
++ [
theme.fonts.monospace.package
];
}; };
zramSwap.enable = true; zramSwap.enable = true;
@ -226,7 +218,7 @@ in {
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
experimental-features = ["nix-command" "flakes"]; experimental-features = [ "nix-command" "flakes" ];
warn-dirty = false; warn-dirty = false;
}; };
}; };
@ -241,7 +233,8 @@ in {
''; '';
in { in {
enable = true; enable = true;
plugins = pkgs.lib.mkForce [pkgs.interception-tools-plugins.dual-function-keys]; plugins =
pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
udevmonConfig = '' udevmonConfig = ''
- JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE" - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
DEVICE: DEVICE:
@ -274,7 +267,7 @@ in {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
languagePacks = ["en-GB"]; languagePacks = [ "en-GB" ];
preferences = { preferences = {
"intl.accept_languages" = "en-GB, en"; "intl.accept_languages" = "en-GB, en";
"intl.regional_prefs.use_os_locales" = true; "intl.regional_prefs.use_os_locales" = true;
@ -286,9 +279,8 @@ in {
services.cron = { services.cron = {
enable = true; enable = true;
systemCronJobs = [ systemCronJobs =
"* * * * * opdavies /home/opdavies/.config/bin/notify-battery.sh" [ "* * * * * opdavies /home/opdavies/.config/bin/notify-battery.sh" ];
];
}; };
services.auto-cpufreq.enable = true; services.auto-cpufreq.enable = true;

43
lib/nixos/default.nix
View file

@ -1,26 +1,21 @@
{ { inputs, self, username, }:
inputs, { desktop ? false, }:
self, let
username, configuration = import ./configuration.nix { inherit desktop inputs self; };
}: {
desktop ? false,
}: let
configuration = import ./configuration.nix {inherit desktop inputs self;};
hardwareConfiguration = import ./hardware-configuration.nix; hardwareConfiguration = import ./hardware-configuration.nix;
in in inputs.nixpkgs.lib.nixosSystem {
inputs.nixpkgs.lib.nixosSystem { modules = [
modules = [ inputs.home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager {
{ home-manager = {
home-manager = { extraSpecialArgs = { inherit inputs desktop self username; };
extraSpecialArgs = {inherit inputs desktop self username;}; useGlobalPkgs = true;
useGlobalPkgs = true; useUserPackages = true;
useUserPackages = true; users."${username}" = import ./home-manager;
users."${username}" = import ./home-manager; };
}; }
}
configuration configuration
hardwareConfiguration hardwareConfiguration
]; ];
} }

23
lib/nixos/hardware-configuration.nix
View file

@ -1,17 +1,12 @@
{ { config, lib, pkgs, modulesPath, ... }: {
config, imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules =
boot.initrd.kernelModules = []; [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.kernelModules = ["kvm-intel"]; boot.initrd.kernelModules = [ ];
boot.kernelParams = ["i8042.reset"]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = []; boot.kernelParams = [ "i8042.reset" ];
boot.extraModulePackages = [ ];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
@ -26,7 +21,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [{device = "/dev/disk/by-label/swap";}]; swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
# 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

66
lib/nixos/home-manager/default.nix
View file

@ -1,44 +1,38 @@
{ { config, desktop, inputs, pkgs, self, username, ... }:
config, let
desktop, desktop-config =
inputs, import ./desktop.nix { inherit config inputs pkgs username; };
pkgs, shared-config = import "${self}/lib/shared/home-manager.nix" {
self, inherit inputs pkgs self username;
username, };
... shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
}: let inherit inputs pkgs;
desktop-config = import ./desktop.nix {inherit config inputs pkgs username;}; };
shared-config = import "${self}/lib/shared/home-manager.nix" {inherit inputs pkgs self username;};
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {inherit inputs pkgs;};
pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${pkgs.system}; pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${pkgs.system};
in { in {
imports = imports =
if desktop if desktop then [ desktop-config shared-config ] else [ shared-config ];
then [desktop-config shared-config]
else [shared-config];
home.packages = home.packages = shared-packages ++ pkgs.lib.optionals desktop [
shared-packages pkgs.discord
++ pkgs.lib.optionals desktop [ pkgs.gimp
pkgs.discord pkgs.gscan2pdf
pkgs.gimp pkgs-2311.kdenlive
pkgs.gscan2pdf pkgs.meslo-lg
pkgs-2311.kdenlive pkgs.obs-studio
pkgs.meslo-lg pkgs.okular
pkgs.obs-studio pkgs.pamixer
pkgs.okular pkgs.pass
pkgs.pamixer pkgs.pavucontrol
pkgs.pass pkgs.pinentry
pkgs.pavucontrol pkgs.slack
pkgs.pinentry pkgs.via
pkgs.slack pkgs.vlc
pkgs.via pkgs.xsel
pkgs.vlc pkgs.xcape
pkgs.xsel pkgs.zoom-us
pkgs.xcape ];
pkgs.zoom-us
];
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";

7
lib/nixos/home-manager/desktop.nix
View file

@ -1,9 +1,4 @@
{ { config, inputs, pkgs, username, }: {
config,
inputs,
pkgs,
username,
}: {
imports = [ imports = [
./modules/alacritty.nix ./modules/alacritty.nix
./modules/autorandr.nix ./modules/autorandr.nix

12
lib/nixos/home-manager/modules/alacritty.nix
View file

@ -1,13 +1,9 @@
{ { lib, pkgs, self, ... }:
lib, let
pkgs,
self,
...
}: let
inherit (lib) strings; inherit (lib) strings;
inherit (strings) toInt; inherit (strings) toInt;
theme = import "${self}/lib/theme" {inherit pkgs;}; theme = import "${self}/lib/theme" { inherit pkgs; };
in { in {
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
@ -30,7 +26,7 @@ in {
glyph_offset.y = 6; glyph_offset.y = 6;
}; };
shell = {program = "zsh";}; shell = { program = "zsh"; };
}; };
}; };
} }

8
lib/nixos/home-manager/modules/autorandr.nix
View file

@ -1,4 +1,4 @@
{username, ...}: { { username, ... }: {
services.autorandr.enable = true; services.autorandr.enable = true;
xdg.configFile."autorandr/postswitch" = { xdg.configFile."autorandr/postswitch" = {
@ -14,8 +14,10 @@
enable = true; enable = true;
profiles = let profiles = let
laptop = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb"; laptop =
monitor = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049"; "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
monitor =
"00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
in { in {
laptop = { laptop = {
config.eDP-1 = { config.eDP-1 = {

4
lib/nixos/home-manager/modules/copyq.nix
View file

@ -1,3 +1 @@
{ { services.copyq.enable = true; }
services.copyq.enable = true;
}

6
lib/nixos/home-manager/modules/dunst.nix
View file

@ -2,10 +2,6 @@
services.dunst = { services.dunst = {
enable = true; enable = true;
settings = { settings = { global = { follow = "keyboard"; }; };
global = {
follow = "keyboard";
};
};
}; };
} }

9
lib/nixos/home-manager/modules/espanso.nix
View file

@ -1,14 +1,9 @@
let let baseUrl = "https://www.oliverdavies.uk";
baseUrl = "https://www.oliverdavies.uk";
in { in {
services.espanso = { services.espanso = {
enable = true; enable = true;
configs = { configs = { default = { show_notifications = false; }; };
default = {
show_notifications = false;
};
};
matches = { matches = {
base = { base = {

4
lib/nixos/home-manager/modules/feh.nix
View file

@ -1,3 +1 @@
{ { programs.feh.enable = true; }
programs.feh.enable = true;
}

2
lib/nixos/home-manager/modules/flameshot.nix
View file

@ -1,4 +1,4 @@
{username, ...}: { { username, ... }: {
services.flameshot = { services.flameshot = {
enable = true; enable = true;

42
lib/nixos/home-manager/modules/i3.nix
View file

@ -1,11 +1,7 @@
{ { config, inputs, pkgs, self, username, ... }:
config, let
inputs, theme = import "${self}/lib/theme" { inherit pkgs; };
self,
username,
pkgs,
...
}: let
modifier = "Mod4"; modifier = "Mod4";
in { in {
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
@ -13,12 +9,9 @@ in {
config = { config = {
assigns = { assigns = {
"7" = [{class = "vlc";}]; "7" = [{ class = "vlc"; }];
"8" = [{class = "0ad";}]; "8" = [{ class = "0ad"; }];
"9" = [ "9" = [ { class = "Slack"; } { class = "discord"; } ];
{class = "Slack";}
{class = "discord";}
];
}; };
defaultWorkspace = "workspace number 1"; defaultWorkspace = "workspace number 1";
@ -52,10 +45,13 @@ in {
"XF86AudioRaiseVolume" = "exec pamixer -ui 2 && pamixer --get-volume"; "XF86AudioRaiseVolume" = "exec pamixer -ui 2 && pamixer --get-volume";
"XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume"; "XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume";
"XF86AudioMute" = "exec pamixer --toggle-mute && ( [ \"$(pamixer --get-mute)\" = \"true\" ] && echo 0"; "XF86AudioMute" = ''
exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0'';
"XF86MonBrightnessDown" = "exec brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p'"; "XF86MonBrightnessDown" =
"XF86MonBrightnessUp" = "exec brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p'"; "exec brightnessctl set 5%- | sed -En 's/.*(([0-9]+)%).*/1/p'";
"XF86MonBrightnessUp" =
"exec brightnessctl set +5% | sed -En 's/.*(([0-9]+)%).*/1/p'";
}; };
terminal = "alacritty"; terminal = "alacritty";
@ -80,14 +76,12 @@ in {
''; '';
config = { config = {
bars = [ bars = [{
{ position = "bottom";
position = "bottom"; statusCommand = "${pkgs.i3status}/bin/i3status";
statusCommand = "${pkgs.i3status}/bin/i3status"; }];
}
];
fonts.names = ["GeistMono"]; fonts.names = [ "${theme.fonts.monospace.name}" ];
gaps = { gaps = {
smartBorders = "on"; smartBorders = "on";

4
lib/nixos/home-manager/modules/rofi.nix
View file

@ -1,3 +1 @@
{ { programs.rofi.enable = true; }
programs.rofi.enable = true;
}

6
lib/shared/home-manager-packages.nix
View file

@ -1,8 +1,4 @@
{ { inputs, pkgs, ... }:
inputs,
pkgs,
...
}:
with pkgs; [ with pkgs; [
awscli2 awscli2
bitwarden-cli bitwarden-cli

9
lib/shared/home-manager.nix
View file

@ -1,9 +1,4 @@
{ { inputs, pkgs, username, self, }: {
inputs,
pkgs,
username,
self,
}: {
home.username = "${username}"; home.username = "${username}";
home.homeDirectory = "/home/${username}"; home.homeDirectory = "/home/${username}";
@ -12,7 +7,7 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
imports = [ imports = [
(import ./modules/neovim.nix {inherit inputs;}) (import ./modules/neovim.nix { inherit inputs; })
./modules/bat.nix ./modules/bat.nix
./modules/bin.nix ./modules/bin.nix
./modules/direnv.nix ./modules/direnv.nix

4
lib/shared/modules/bat.nix
View file

@ -1,3 +1 @@
{ { programs.bat.enable = true; }
programs.bat.enable = true;
}

4
lib/shared/modules/bin.nix
View file

@ -1,5 +1,5 @@
{self, ...}: { { self, ... }: {
home.sessionPath = ["$HOME/.config/bin"]; home.sessionPath = [ "$HOME/.config/bin" ];
xdg.configFile.bin = { xdg.configFile.bin = {
source = "${self}/bin"; source = "${self}/bin";

14
lib/shared/modules/git.nix
View file

@ -54,10 +54,12 @@
current-branch = "rev-parse --abbrev-ref HEAD"; current-branch = "rev-parse --abbrev-ref HEAD";
dc = "diff --color --word-diff --cached"; dc = "diff --color --word-diff --cached";
df = "diff --color --word-diff"; df = "diff --color --word-diff";
dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -"; dup =
"!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
fixup = "commit --fixup"; fixup = "commit --fixup";
issues = "!gh issue list --web"; issues = "!gh issue list --web";
mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -"; mup =
"!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
no-ff = "merge --no-ff"; no-ff = "merge --no-ff";
pl = "pull"; pl = "pull";
prune = "remote prune origin"; prune = "remote prune origin";
@ -69,10 +71,12 @@
repush = "!git pull --rebase && git push"; repush = "!git pull --rebase && git push";
ri = "rebase --interactive"; ri = "rebase --interactive";
rid = "!git rebase -i $(git merge-base develop HEAD)"; rid = "!git rebase -i $(git merge-base develop HEAD)";
rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)"; rim =
"!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
rip = "!git rebase -i $(git merge-base production HEAD)"; rip = "!git rebase -i $(git merge-base production HEAD)";
ris = "!git rebase -i $(git merge-base staging HEAD)"; ris = "!git rebase -i $(git merge-base staging HEAD)";
riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})"; riu =
"!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%"; rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
sl = "log --oneline --decorate -20"; sl = "log --oneline --decorate -20";
sla = "log --oneline --decorate --graph --all -20"; sla = "log --oneline --decorate --graph --all -20";
@ -97,7 +101,7 @@
checkout.defaultRemote = "origin"; checkout.defaultRemote = "origin";
color.ui = true; color.ui = true;
column.ui = "auto"; column.ui = "auto";
commit = {template = "~/.gitmessage";}; commit = { template = "~/.gitmessage"; };
core = { core = {
editor = "nvim"; editor = "nvim";
excludesFile = "~/.config/git/ignore"; excludesFile = "~/.config/git/ignore";

4
lib/shared/modules/lsd.nix
View file

@ -1,3 +1 @@
{ { programs.lsd.enable = true; }
programs.lsd.enable = true;
}

7
lib/shared/modules/neovim.nix
View file

@ -1,7 +1,8 @@
{inputs}: {pkgs, ...}: let { inputs }:
system = pkgs.system; { pkgs, ... }:
let system = pkgs.system;
in { in {
programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager {inherit system;}; programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager { inherit system; };
home.file.".markdownlint.yaml".text = '' home.file.".markdownlint.yaml".text = ''
default: true default: true

4
lib/shared/modules/nnn.nix
View file

@ -1,3 +1 @@
{ { programs.nnn.enable = true; }
programs.nnn.enable = true;
}

2
lib/shared/modules/phpactor.nix
View file

@ -1,4 +1,4 @@
{self, ...}: { { self, ... }: {
xdg.configFile.phpactor = { xdg.configFile.phpactor = {
source = "${self}/config/phpactor"; source = "${self}/config/phpactor";
recursive = true; recursive = true;

4
lib/shared/modules/ripgrep.nix
View file

@ -1,5 +1,5 @@
{pkgs, ...}: { { pkgs, ... }: {
home.packages = with pkgs; [ripgrep]; home.packages = with pkgs; [ ripgrep ];
xdg.configFile."ripgrep/config".text = '' xdg.configFile."ripgrep/config".text = ''
--follow --follow

4
lib/shared/modules/starship.nix
View file

@ -1,3 +1 @@
{ { programs.starship.enable = true; }
programs.starship.enable = true;
}

11
lib/shared/modules/tmux.nix
View file

@ -1,5 +1,5 @@
{pkgs, ...}: let { pkgs, ... }:
inherit (pkgs) tmuxPlugins; let inherit (pkgs) tmuxPlugins;
in { in {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
@ -102,10 +102,7 @@ in {
set -g @resurrect-strategy-nvim 'session' set -g @resurrect-strategy-nvim 'session'
''; '';
plugins = [ plugins =
tmuxPlugins.resurrect [ tmuxPlugins.resurrect tmuxPlugins.vim-tmux-navigator tmuxPlugins.yank ];
tmuxPlugins.vim-tmux-navigator
tmuxPlugins.yank
];
}; };
} }

12
lib/shared/modules/zsh.nix
View file

@ -200,19 +200,19 @@
plugins = [ plugins = [
{ {
name = "themes/robbyrussell"; name = "themes/robbyrussell";
tags = ["from:oh-my-zsh" "as:theme"]; tags = [ "from:oh-my-zsh" "as:theme" ];
} }
{ {
name = "plugin/git"; name = "plugin/git";
tags = ["from:oh-my-zsh"]; tags = [ "from:oh-my-zsh" ];
} }
{ {
name = "plugin/vi-mode"; name = "plugin/vi-mode";
tags = ["from:oh-my-zsh"]; tags = [ "from:oh-my-zsh" ];
} }
{name = "mollifier/cd-gitroot";} { name = "mollifier/cd-gitroot"; }
{name = "zsh-users/zsh-completions";} { name = "zsh-users/zsh-completions"; }
{name = "zsh-users/zsh-syntax-highlighting";} { name = "zsh-users/zsh-syntax-highlighting"; }
]; ];
}; };
}; };

8
lib/theme/default.nix
View file

@ -1,11 +1,11 @@
{pkgs, ...}: { { pkgs, ... }: {
fonts = { fonts = {
monospace = { monospace = {
name = "MesloLGSDZ Nerd Font Mono"; name = "JetBrainsMono Nerd Font Mono";
# fc-list : family | sort | grep "Nerd Font" # fc-list : family | sort | grep "Nerd Font"
package = pkgs.nerdfonts.override {fonts = ["Meslo"];}; package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
size = "10"; size = "8";
}; };
}; };
} }

45
lib/wsl2/default.nix
View file

@ -1,29 +1,26 @@
{ { inputs, self, system, username, }:
inputs, let
self,
system,
username,
}: let
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
shared-config = import "${self}/lib/shared/home-manager.nix" {inherit inputs pkgs self username;}; shared-config = import "${self}/lib/shared/home-manager.nix" {
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {inherit inputs pkgs;}; inherit inputs pkgs self username;
in };
inputs.home-manager.lib.homeManagerConfiguration { shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
inherit pkgs; inherit inputs pkgs;
};
in inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ modules = [{
{ imports = [ shared-config ];
imports = [shared-config];
home.packages = shared-packages; home.packages = shared-packages;
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
PATH = "$PATH:./vendor/bin:./node_modules/.bin"; PATH = "$PATH:./vendor/bin:./node_modules/.bin";
PULUMI_SKIP_UPDATE_CHECK = "true"; PULUMI_SKIP_UPDATE_CHECK = "true";
RIPGREP_CONFIG_PATH = "$HOME/.config/ripgrep/config"; RIPGREP_CONFIG_PATH = "$HOME/.config/ripgrep/config";
}; };
} }];
]; }
}