Migrate global configuration to and expand home
- Move lots of system config to home (browser, editors, etc.)
- Improve catppuccin support (kitty, cursors, etc.)
- Improve overall theme (fonts, icons in kitty)
- Add coded's system hardware configuration ("shorthair")
- Add the ed editor
- Split minion's system hardware configuration ("greylag") into several files
- Improve shell support (aliases, useful packages, replacements, etc.)
Change-Id: Ie6d40f809b2662268a9a6fa8b241641bbfef9442
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/383
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/modules/nixos/bluetooth/default.nix b/modules/nixos/bluetooth/default.nix
index d2a2666..19b603d 100644
--- a/modules/nixos/bluetooth/default.nix
+++ b/modules/nixos/bluetooth/default.nix
@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/browsers/default.nix b/modules/nixos/browsers/default.nix
deleted file mode 100644
index 1d72a8d..0000000
--- a/modules/nixos/browsers/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
- environment.systemPackages = [ pkgs.firefox ];
-}
diff --git a/modules/nixos/editors/default.nix b/modules/nixos/editors/default.nix
index 4c12f30..cd527e8 100644
--- a/modules/nixos/editors/default.nix
+++ b/modules/nixos/editors/default.nix
@@ -1,8 +1,4 @@
{ pkgs, ... }:
{
- environment.systemPackages = [
- pkgs.emacs
- pkgs.neovim
- pkgs.vscode-fhs
- ];
+ environment.systemPackages = [ pkgs.vscode-fhs ];
}
diff --git a/modules/nixos/git/default.nix b/modules/nixos/git/default.nix
deleted file mode 100644
index 8a64e0d..0000000
--- a/modules/nixos/git/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
- environment.systemPackages = [ pkgs.git ];
-}
diff --git a/modules/nixos/hyprland/default.nix b/modules/nixos/hyprland/default.nix
deleted file mode 100644
index 40f30df..0000000
--- a/modules/nixos/hyprland/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
- programs.hyprland.enable = true;
-
- users.users.minion.extraGroups = [ "input" ];
-}
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index dff4f4f..252382b 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -1,7 +1,6 @@
-{ ... }:
+{ system, ... }:
{
system.stateVersion = "24.05";
- console.keyMap = "dvorak";
nix.settings = {
builders-use-substitutes = true;
@@ -21,4 +20,6 @@
"flakes"
];
};
+
+ nixpkgs.hostPlatform = system;
}
diff --git a/modules/nixos/terminals/default.nix b/modules/nixos/terminals/default.nix
deleted file mode 100644
index b28aa04..0000000
--- a/modules/nixos/terminals/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
- environment.systemPackages = [ pkgs.kitty ];
-}
diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix
index 58c28df..997288c 100644
--- a/modules/nixos/users/default.nix
+++ b/modules/nixos/users/default.nix
@@ -2,10 +2,9 @@
{
users.users.minion = {
isNormalUser = true;
- extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
- packages = [
- pkgs.firefox
- pkgs.tree
+ extraGroups = [
+ "wheel"
+ "input"
];
initialPassword = "nixos";
};