diff --git a/flake.lock b/flake.lock
index 9082744f..8c3f3419 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,83 @@
"type": "github"
}
},
+ "flake-compat_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "neovim-nightly",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1680392223,
+ "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_2": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib"
+ },
+ "locked": {
+ "lastModified": 1678379998,
+ "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
+ "type": "github"
+ },
+ "original": {
+ "id": "flake-parts",
+ "type": "indirect"
+ }
+ },
+ "flake-parts_3": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "neovim-nightly",
+ "hercules-ci-effects",
+ "hercules-ci-agent",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1678379998,
+ "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
"flake-utils": {
"locked": {
"lastModified": 1667395993,
@@ -31,6 +108,105 @@
"type": "github"
}
},
+ "flake-utils_2": {
+ "locked": {
+ "lastModified": 1667395993,
+ "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "neovim-nightly",
+ "hercules-ci-effects",
+ "hercules-ci-agent",
+ "pre-commit-hooks-nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1660459072,
+ "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "haskell-flake": {
+ "locked": {
+ "lastModified": 1678138103,
+ "narHash": "sha256-D0lao82bV3t2gEFjHiU6RN233t+1MnkQV+bq8MEu2ic=",
+ "owner": "hercules-ci",
+ "repo": "haskell-flake",
+ "rev": "1e1660e6dd00838ba73bc7952e6e73be67da18d1",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "ref": "0.1-extraLibraries",
+ "repo": "haskell-flake",
+ "type": "github"
+ }
+ },
+ "hercules-ci-agent": {
+ "inputs": {
+ "flake-parts": "flake-parts_3",
+ "haskell-flake": "haskell-flake",
+ "nix-darwin": "nix-darwin",
+ "nixpkgs": "nixpkgs",
+ "pre-commit-hooks-nix": "pre-commit-hooks-nix"
+ },
+ "locked": {
+ "lastModified": 1678446614,
+ "narHash": "sha256-Z6Gsba5ahn/N0QlF0vJfIEfnZgCs4qr1IZtXAqjbE7s=",
+ "owner": "hercules-ci",
+ "repo": "hercules-ci-agent",
+ "rev": "0b90d1a87c117a5861785cb85833dd1c9df0b6ef",
+ "type": "github"
+ },
+ "original": {
+ "id": "hercules-ci-agent",
+ "type": "indirect"
+ }
+ },
+ "hercules-ci-effects": {
+ "inputs": {
+ "flake-parts": "flake-parts_2",
+ "hercules-ci-agent": "hercules-ci-agent",
+ "nixpkgs": [
+ "neovim-nightly",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1681898675,
+ "narHash": "sha256-nIJ7CAdiHv4i1no/VgDoeTJLzbLYwu5+/Ycoyzn0S78=",
+ "owner": "hercules-ci",
+ "repo": "hercules-ci-effects",
+ "rev": "15ff4f63e5f28070391a5b09a82f6d5c6cc5c9d0",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "hercules-ci-effects",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -53,7 +229,7 @@
},
"neovim-flake": {
"inputs": {
- "flake-utils": "flake-utils",
+ "flake-utils": "flake-utils_2",
"nixpkgs": [
"neovim-nightly",
"nixpkgs"
@@ -61,11 +237,11 @@
},
"locked": {
"dir": "contrib",
- "lastModified": 1682920343,
- "narHash": "sha256-G/WhTxlm5BIRoXSK0zAWe+Qw8xZmdhZb+eiHIao2yB8=",
+ "lastModified": 1682581904,
+ "narHash": "sha256-9P4T2erXXrPxXTTLgD29U/IdKCOYqP4xbwdYswtVBA8=",
"owner": "neovim",
"repo": "neovim",
- "rev": "37bc73e9bc2d8af878e49b81c5f49f861bba905c",
+ "rev": "d321deb4a9b05e9d81b79ac166274f4a6e7981bf",
"type": "github"
},
"original": {
@@ -78,15 +254,17 @@
"neovim-nightly": {
"inputs": {
"flake-compat": "flake-compat",
+ "flake-parts": "flake-parts",
+ "hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1682928826,
- "narHash": "sha256-9IpQEFAB2hypFv2M502nNuKcM4fCOEvkuiP/gqy5+/k=",
+ "lastModified": 1682955971,
+ "narHash": "sha256-6Orm5CIh/Zz3X/RHbMbLnii5jSyEjLxV9KF7lrrI5pA=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "a0c77dcf972a01257af78e2a475366c18d55e74f",
+ "rev": "a9719c5050b1abbb0adada7dd9f98e0cdbd3ed53",
"type": "github"
},
"original": {
@@ -95,29 +273,102 @@
"type": "github"
}
},
- "nixpkgs": {
+ "nix-darwin": {
+ "inputs": {
+ "nixpkgs": [
+ "neovim-nightly",
+ "hercules-ci-effects",
+ "hercules-ci-agent",
+ "nixpkgs"
+ ]
+ },
"locked": {
- "lastModified": 1682900373,
- "narHash": "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "8b3bc690e201c8d3cbd14633dbf3462a820e73f2",
+ "lastModified": 1673295039,
+ "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+ "owner": "LnL7",
+ "repo": "nix-darwin",
+ "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "nixpkgs-unstable",
+ "owner": "LnL7",
+ "repo": "nix-darwin",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1678293141,
+ "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-lib": {
+ "locked": {
+ "dir": "lib",
+ "lastModified": 1678375444,
+ "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
+ "type": "github"
+ },
+ "original": {
+ "dir": "lib",
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-stable": {
+ "locked": {
+ "lastModified": 1673800717,
+ "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1682786779,
- "narHash": "sha256-m7QFzPS/CE8hbkbIVK4UStihAQMtczr0vSpOgETOM1g=",
+ "lastModified": 1682929865,
+ "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "f2e9a130461950270f87630b11132323706b4d91",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1682879489,
+ "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "08e4dc3a907a6dfec8bb3bbf1540d8abbffea22b",
+ "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github"
},
"original": {
@@ -127,11 +378,38 @@
"type": "github"
}
},
+ "pre-commit-hooks-nix": {
+ "inputs": {
+ "flake-compat": "flake-compat_2",
+ "flake-utils": "flake-utils",
+ "gitignore": "gitignore",
+ "nixpkgs": [
+ "neovim-nightly",
+ "hercules-ci-effects",
+ "hercules-ci-agent",
+ "nixpkgs"
+ ],
+ "nixpkgs-stable": "nixpkgs-stable"
+ },
+ "locked": {
+ "lastModified": 1678376203,
+ "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=",
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"home-manager": "home-manager",
"neovim-nightly": "neovim-nightly",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs_3"
}
}
},
diff --git a/flake.nix b/flake.nix
index 7a7a986c..0c22668e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,12 +8,15 @@
};
outputs = { self, home-manager, neovim-nightly, nixpkgs, ... }:
- let overlays = [ neovim-nightly.overlay ];
- in {
+ let
+ overlays = [ neovim-nightly.overlay ];
+ system = "x86_64-linux";
+ in
+ {
+ formatter.${system} = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
+
nixosConfigurations = {
apollo = nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
-
modules = [
{ nixpkgs.overlays = overlays; }
@@ -29,8 +32,6 @@
};
nixedo = nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
-
modules = [
{ nixpkgs.overlays = overlays; }
@@ -48,7 +49,7 @@
homeConfigurations = {
wsl2 = home-manager.lib.homeManagerConfiguration {
- modules = [ { nixpkgs.overlays = overlays; } ./system/wsl2.nix ];
+ modules = [{ nixpkgs.overlays = overlays; } ./system/wsl2.nix];
pkgs = nixpkgs.legacyPackages.x86_64-linux;
};
};
diff --git a/home-manager/apollo.nix b/home-manager/apollo.nix
index 1f3897c3..1710c5ee 100644
--- a/home-manager/apollo.nix
+++ b/home-manager/apollo.nix
@@ -32,9 +32,7 @@
glyph_offset.y = 6;
};
- shell = {
- program = "zsh";
- };
+ shell = { program = "zsh"; };
};
};
}
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index f35a1860..40a3b08d 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -69,24 +69,23 @@ let
sha256 = "n8jd6fy30XukZ9NFZX5qclSlMfziP/Ew9dXfkysRl4Y=";
};
};
-in {
- nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
- "intelephense"
- "postman"
- ];
+in
+{
+ nixpkgs.config.allowUnfreePredicate = pkg:
+ builtins.elem (lib.getName pkg) [ "intelephense" "postman" ];
home.packages = (import ./packages.nix) { inherit pkgs; };
home.file."nodemon.json".text = ''
- {
- "ignore": [
- ".git"
- ],
- "verbose": true,
- "events": {
- "start": "clear"
+ {
+ "ignore": [
+ ".git"
+ ],
+ "verbose": true,
+ "events": {
+ "start": "clear"
+ }
}
- }
'';
programs.bat.enable = true;
@@ -213,18 +212,20 @@ in {
nodePackages.vls
nodePackages.vscode-langservers-extracted
nodePackages.yaml-language-server
+ phpactor
php81Packages.phpcbf
php81Packages.phpcs
php81Packages.phpstan
proselint
rnix-lsp
+ rstfmt
shellcheck
];
};
- home.sessionPath = [
- "$HOME/.config/bin"
- ];
+ programs.nnn.enable = true;
+
+ home.sessionPath = [ "$HOME/.config/bin" ];
xdg.configFile.bin = {
source = ../../bin;
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
index 33e0e7d3..20fffcb2 100644
--- a/home-manager/modules/git.nix
+++ b/home-manager/modules/git.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, lib, libs, ... }:
-{
+{ config, pkgs, lib, libs, ... }: {
programs.git = {
enable = true;
userName = "Oliver Davies";
@@ -19,10 +18,12 @@
current-branch = "rev-parse --abbrev-ref HEAD";
dc = "diff --color --word-diff --cached";
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";
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 -";
nah = "!git reset --hard && git clean -fd";
no-ff = "merge --no-ff";
pl = "pull";
@@ -35,10 +36,12 @@
repush = "!git pull --rebase && git push";
ri = "rebase --interactive";
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)";
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%";
sl = "log --oneline --decorate -20";
sla = "log --oneline --decorate --graph --all -20";
@@ -61,9 +64,7 @@
};
checkout.defaultRemote = "origin";
color.ui = true;
- commit = {
- template = "~/.gitmessage";
- };
+ commit = { template = "~/.gitmessage"; };
core = {
editor = "nvim";
excludesFile = "~/.gitignore-global";
diff --git a/home-manager/modules/home-manager.nix b/home-manager/modules/home-manager.nix
index 21e6d675..780a25da 100644
--- a/home-manager/modules/home-manager.nix
+++ b/home-manager/modules/home-manager.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, ... }:
-{
+{ config, pkgs, ... }: {
home.username = "opdavies";
home.homeDirectory = "/home/opdavies";
diff --git a/home-manager/modules/tmux.nix b/home-manager/modules/tmux.nix
index ee4ad560..decd7aee 100644
--- a/home-manager/modules/tmux.nix
+++ b/home-manager/modules/tmux.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, lib, libs, ... }:
-{
+{ config, pkgs, lib, libs, ... }: {
programs.tmux = {
enable = true;
terminal = "tmux-256color";
diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix
index a42aed87..83670f18 100644
--- a/home-manager/modules/zsh.nix
+++ b/home-manager/modules/zsh.nix
@@ -1,5 +1,4 @@
-{ config, pkgs, lib, libs, ... }:
-{
+{ config, pkgs, lib, libs, ... }: {
programs.zsh = {
enable = true;
enableCompletion = false;
@@ -119,9 +118,18 @@
enable = true;
plugins = [
- { name = "themes/robbyrussell"; tags = [from:oh-my-zsh as:theme]; }
- { name = "plugin/git"; tags = [from:oh-my-zsh]; }
- { name = "plugin/vi-mode"; tags = [from:oh-my-zsh]; }
+ {
+ name = "themes/robbyrussell";
+ tags = [ "from:oh-my-zsh" "as:theme" ];
+ }
+ {
+ name = "plugin/git";
+ tags = [ "from:oh-my-zsh" ];
+ }
+ {
+ name = "plugin/vi-mode";
+ tags = [ "from:oh-my-zsh" ];
+ }
{ name = "mollifier/cd-gitroot"; }
{ name = "zsh-users/zsh-autosuggestions"; }
{ name = "zsh-users/zsh-completions"; }
diff --git a/home-manager/nixedo.nix b/home-manager/nixedo.nix
index 9d5742e1..f1fec04c 100644
--- a/home-manager/nixedo.nix
+++ b/home-manager/nixedo.nix
@@ -26,25 +26,15 @@
font = {
size = 12.0;
- normal.family = "Meslo LG M";
+ normal.family = "JetBrainsMono Nerd Font";
offset.y = 12;
glyph_offset.y = 6;
};
- shell = {
- program = "zsh";
- };
+ shell = { program = "zsh"; };
};
};
- home.packages = with pkgs; [
- discord
- meslo-lg
- slack
- teams
- vlc
- xcape
- zoom-us
- ];
+ home.packages = with pkgs; [ discord meslo-lg slack teams vlc xcape zoom-us ];
}
diff --git a/system/nixos/apollo/configuration.nix b/system/nixos/apollo/configuration.nix
index 0e86fcd2..33b3dca8 100644
--- a/system/nixos/apollo/configuration.nix
+++ b/system/nixos/apollo/configuration.nix
@@ -5,13 +5,14 @@
{ config, pkgs, ... }:
let
- home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
+ home-manager = builtins.fetchTarball
+ "https://github.com/nix-community/home-manager/archive/master.tar.gz";
in
{
- imports =
- [ # Include the results of the hardware scan.
- ./hardware-configuration.nix
- ];
+ imports = [
+ # Include the results of the hardware scan.
+ ./hardware-configuration.nix
+ ];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
@@ -97,10 +98,8 @@ in
];
};
- environment.gnome.excludePackages = (with pkgs; [
- gnome-photos
- gnome-tour
- ]) ++ (with pkgs.gnome; [
+ environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour ])
+ ++ (with pkgs.gnome; [
atomix
cheese
evince
@@ -120,10 +119,11 @@ in
# List packages installed in system profile. To search, run:
# $ nix search wget
- environment.systemPackages = with pkgs; [
- # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
- # wget
- ];
+ environment.systemPackages = with pkgs;
+ [
+ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+ # wget
+ ];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
@@ -159,9 +159,8 @@ in
users.defaultUserShell = "/etc/profiles/per-user/opdavies/bin/zsh";
- fonts.fonts = with pkgs; [
- (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; })
- ];
+ fonts.fonts = with pkgs;
+ [ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ];
services.cron = {
enable = true;
diff --git a/system/nixos/apollo/default.nix b/system/nixos/apollo/default.nix
index 515387a9..9c9b2695 100644
--- a/system/nixos/apollo/default.nix
+++ b/system/nixos/apollo/default.nix
@@ -4,15 +4,12 @@
imports = [
# ./configuration.nix
-# ../../../home-manager/modules/common.nix
-# ../../../home-manager/modules/git.nix
-# ../../../home-manager/modules/home-manager.nix
-# ../../../home-manager/modules/tmux.nix
-# ../../../home-manager/modules/zsh.nix
+ # ../../../home-manager/modules/common.nix
+ # ../../../home-manager/modules/git.nix
+ # ../../../home-manager/modules/home-manager.nix
+ # ../../../home-manager/modules/tmux.nix
+ # ../../../home-manager/modules/zsh.nix
];
- home.packages = with pkgs; [
- docker
- docker-compose
- ];
+ home.packages = with pkgs; [ docker docker-compose ];
}
diff --git a/system/nixos/apollo/hardware-configuration.nix b/system/nixos/apollo/hardware-configuration.nix
index 68db6d81..f3fb9e5c 100644
--- a/system/nixos/apollo/hardware-configuration.nix
+++ b/system/nixos/apollo/hardware-configuration.nix
@@ -4,28 +4,26 @@
{ config, lib, pkgs, modulesPath, ... }:
{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
- boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+ boot.initrd.availableKernelModules =
+ [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/62b28eee-5b67-41af-9fcf-95e8171e1897";
- fsType = "ext4";
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/62b28eee-5b67-41af-9fcf-95e8171e1897";
+ fsType = "ext4";
+ };
- fileSystems."/boot/efi" =
- { device = "/dev/disk/by-uuid/378D-387D";
- fsType = "vfat";
- };
+ fileSystems."/boot/efi" = {
+ device = "/dev/disk/by-uuid/378D-387D";
+ fsType = "vfat";
+ };
swapDevices =
- [ { device = "/dev/disk/by-uuid/f95ef42e-09d9-4198-b8f3-2e22ea8c4f9e"; }
- ];
+ [{ device = "/dev/disk/by-uuid/f95ef42e-09d9-4198-b8f3-2e22ea8c4f9e"; }];
# 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
@@ -36,7 +34,8 @@
# networking.interfaces.wlp54s0.useDHCP = lib.mkDefault true;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
- hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+ hardware.cpu.intel.updateMicrocode =
+ lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.bluetooth.enable = true;
}
diff --git a/system/nixos/nixedo/configuration.nix b/system/nixos/nixedo/configuration.nix
index 808dde4d..f4e7e206 100644
--- a/system/nixos/nixedo/configuration.nix
+++ b/system/nixos/nixedo/configuration.nix
@@ -4,13 +4,12 @@
{ config, pkgs, ... }:
-let
- nixpkgs = import ../../shared/nixpkgs.nix { };
-in
-{
+let nixpkgs = import ../../shared/nixpkgs.nix { };
+in {
nixpkgs = nixpkgs;
- imports = [ # Include the results of the hardware scan.
+ imports = [
+ # Include the results of the hardware scan.
./hardware-configuration.nix
];
@@ -141,5 +140,9 @@ in
programs.zsh.histSize = 5000;
users.defaultUserShell = "/etc/profiles/per-user/opdavies/bin/zsh";
+
+ fonts.fonts = with pkgs;
+ [ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ];
+
}
diff --git a/system/shared/nixpkgs.nix b/system/shared/nixpkgs.nix
index c0aa10c3..a39e65de 100644
--- a/system/shared/nixpkgs.nix
+++ b/system/shared/nixpkgs.nix
@@ -1,7 +1,5 @@
-{ }: {
- config = {
- allowUnfree = true;
- };
+{}: {
+ config = { allowUnfree = true; };
overlays = [ (import ./overlays.nix) ];
}
diff --git a/system/shared/overlays.nix b/system/shared/overlays.nix
index 434e0cef..ddb4f237 100644
--- a/system/shared/overlays.nix
+++ b/system/shared/overlays.nix
@@ -1,4 +1 @@
-self: super: {
- customVim = with self; {
- };
-}
+self: super: { }