dotnix @main -
refs -
log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
chore: re-organize
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmTxZu8ACgkQuFOtpdp7
v3qP5A/+P50YEusLKYQ8g7v0GH7WRjZkxz52JRyOAFpHjymfSYlSL/Y/tGTEgCqQ
3/vlVFCamDocOcz3YwAhC72ixFAXt/SihHCfOBLqQqCn4QR1pYS+KeO+7JJMOVo5
hVnyE3XuXnCu7n9rRk5GEtZfgkpA6NNEQkHro+ECGKDTZ+Z2JPLhpqSoed/hYZ+C
RLm+G9gRUhPLhbgpkEgRj5hJh9cwYYEdAEBhnoq04mKCtIVHPSDcJyhSyGtpEX/E
bHZuxammxHWZpLyR7sicK5+uuuJG7NQoZgUI76aXmXEzMGMbVEQYiwcnwfTf7v8Q
4EGMyIT+0hQcyxRQVJve/sRTYIGiS3Entuprv3j+IP4I/f7UMJmc3/307cdippPr
ThqkUQ9E0zvGGHoFcJVlKODCy2Y5/9ga5eGgbZt49wH/aUbuTvrHp83qZiN1dCl7
wC2FTWpyVnM9SCOWNkT56G9LmPmiMHZQer9NyWtiDrkXiDKRge7mJ+iLLRT0DEBA
dnMv+g4uOJyoHyFhkdvDPiIU6kKRKuCssEXSHuQGEdOLPIX6VkwzIQNVlRA144Bh
eLqEkV1aTlvzqdAflG3mfFsfWzItYeNUYYMIrXQZZ+YZAKihdeqaUwYEnaXx4qGn
JacSlMXKvpU0DyWLHbGqe/nC1wr/qR0uO3rUVjxP919QgPFW6ns=
=/diZ
-----END PGP SIGNATURE-----
39 changed files, 65 additions(+), 93 deletions(-)
diff --git a/.git-age.yaml b/.git-age.yaml
index 0219812864cff938ae08a246e2a683f1c56cae81..acdb86124b6d79173ccd1fbbcd6fe0156f6d19fe 100644
--- a/.git-age.yaml
+++ b/.git-age.yaml
@@ -1,2 +1,2 @@
-"apps/firefox/work.nix":
+"apps/gui/firefox/work.nix":
- age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
diff --git a/.gitattributes b/.gitattributes
index ba293352689fb044936874aaaf18855645c43501..69d4ba9adf5831402078da784f6af9334921bf4a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-apps/firefox/work.nix filter=git-age diff=git-age
+apps/gui/firefox/work.nix filter=git-age diff=git-age
diff --git a/apps/bat.nix b/apps/nogui/bat.nix
rename from apps/bat.nix
rename to apps/nogui/bat.nix
diff --git a/apps/bottom.nix b/apps/nogui/bottom.nix
rename from apps/bottom.nix
rename to apps/nogui/bottom.nix
diff --git a/apps/common.nix b/apps/nogui/default.nix
rename from apps/common.nix
rename to apps/nogui/default.nix
index aa971bd3d1b83547455fd326f6a86442f94a03c5..0de7a0dcc34b5757fb4828456fa4d7aefc744617 100644
--- a/apps/common.nix
+++ b/apps/nogui/default.nix
@@ -9,9 +9,10 @@ ./bottom.nix
./exa.nix
./fzf.nix
{
-{
+ pkgs,
+ ./go.nix
{
- pkgs,
+{
./helix.nix
./jq.nix
./lazygit.nix
@@ -31,12 +32,19 @@ du-dust
fd
just
ripgrep
+ usql
# LSPs
+ gopls
nil
# Formatters
alejandra
+ gofumpt
+
+ # Personal NUR
+ nur.repos.jolheiser.git-age
+ nur.repos.jolheiser.tclip
];
activation.report-changes = config.lib.dag.entryAnywhere ''
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath
diff --git a/apps/default.nix b/apps/gui/default.nix
rename from apps/default.nix
rename to apps/gui/default.nix
index 08c7d47fd76bd9ef409eb7af9ee5002503f403b0..1550be57386ddaee404665cc28691ee8a4c528a3 100644
--- a/apps/default.nix
+++ b/apps/gui/default.nix
@@ -1,9 +1,8 @@
{pkgs, ...}: {
imports = [
./common.nix
-
+ ./spotifyd.nix
./firefox.nix
- ./go.nix
./gtk.nix
./spotifyd.nix
./tiny.nix
@@ -19,23 +18,21 @@ spotify-tui
# LSPs
imports = [
- imports = [
{pkgs, ...}: {
marksman
nodePackages.yaml-language-server
# Formatters
- alejandra
+ nodePackages.lua-fmt
+ python3Packages.black
# IDEs
jetbrains.goland
# Personal NUR
- nur.repos.jolheiser.git-age
nur.repos.jolheiser.gomodinit
nur.repos.jolheiser.imp
nur.repos.jolheiser.kv
- nur.repos.jolheiser.tclip
nur.repos.jolheiser.tmpl
];
};
diff --git a/apps/exa.nix b/apps/nogui/exa.nix
rename from apps/exa.nix
rename to apps/nogui/exa.nix
diff --git a/apps/firefox.nix b/apps/gui/firefox.nix
rename from apps/firefox.nix
rename to apps/gui/firefox.nix
diff --git a/apps/firefox/work.nix b/apps/firefox/work.nix
deleted file mode 100644
index 7e20945db2e3d418b38f9fdd874574b8f3ec2e07..0000000000000000000000000000000000000000
Binary files a/apps/firefox/work.nix and /dev/null differ
diff --git a/apps/fzf.nix b/apps/nogui/fzf.nix
rename from apps/fzf.nix
rename to apps/nogui/fzf.nix
diff --git a/apps/git.nix b/apps/nogui/git.nix
rename from apps/git.nix
rename to apps/nogui/git.nix
diff --git a/apps/go.nix b/apps/nogui/go.nix
rename from apps/go.nix
rename to apps/nogui/go.nix
diff --git a/apps/gpg.nix b/apps/nogui/gpg.nix
rename from apps/gpg.nix
rename to apps/nogui/gpg.nix
diff --git a/apps/gtk.nix b/apps/gui/gtk.nix
rename from apps/gtk.nix
rename to apps/gui/gtk.nix
diff --git a/apps/gui/firefox/work.nix b/apps/gui/firefox/work.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ef67b2449129b4a23087bf84314ff8914acc4b2d
Binary files /dev/null and b/apps/gui/firefox/work.nix differ
diff --git a/apps/helix.nix b/apps/nogui/helix.nix
rename from apps/helix.nix
rename to apps/nogui/helix.nix
diff --git a/apps/jq.nix b/apps/nogui/jq.nix
rename from apps/jq.nix
rename to apps/nogui/jq.nix
diff --git a/apps/lazygit.nix b/apps/nogui/lazygit.nix
rename from apps/lazygit.nix
rename to apps/nogui/lazygit.nix
diff --git a/apps/nushell.nix b/apps/nogui/nushell.nix
rename from apps/nushell.nix
rename to apps/nogui/nushell.nix
diff --git a/apps/nushell/config.nu b/apps/nogui/nushell/config.nu
rename from apps/nushell/config.nu
rename to apps/nogui/nushell/config.nu
diff --git a/apps/nushell/env.nu b/apps/nogui/nushell/env.nu
rename from apps/nushell/env.nu
rename to apps/nogui/nushell/env.nu
diff --git a/apps/nushell/jolheiser.nu b/apps/nogui/nushell/jolheiser.nu
rename from apps/nushell/jolheiser.nu
rename to apps/nogui/nushell/jolheiser.nu
diff --git a/apps/nushell/ohmyposh.nu b/apps/nogui/nushell/ohmyposh.nu
rename from apps/nushell/ohmyposh.nu
rename to apps/nogui/nushell/ohmyposh.nu
diff --git a/apps/nushell/zoxide.nu b/apps/nogui/nushell/zoxide.nu
rename from apps/nushell/zoxide.nu
rename to apps/nogui/nushell/zoxide.nu
diff --git a/apps/oh-my-posh.nix b/apps/nogui/oh-my-posh.nix
rename from apps/oh-my-posh.nix
rename to apps/nogui/oh-my-posh.nix
diff --git a/apps/ohmyposh/config.json b/apps/nogui/ohmyposh/config.json
rename from apps/ohmyposh/config.json
rename to apps/nogui/ohmyposh/config.json
diff --git a/apps/spotifyd.nix b/apps/gui/spotifyd.nix
rename from apps/spotifyd.nix
rename to apps/gui/spotifyd.nix
diff --git a/apps/ssh.nix b/apps/nogui/ssh.nix
rename from apps/ssh.nix
rename to apps/nogui/ssh.nix
diff --git a/apps/tiny.nix b/apps/gui/tiny.nix
rename from apps/tiny.nix
rename to apps/gui/tiny.nix
diff --git a/apps/wezterm.nix b/apps/gui/wezterm.nix
rename from apps/wezterm.nix
rename to apps/gui/wezterm.nix
diff --git a/apps/wezterm/wezterm.lua b/apps/gui/wezterm/wezterm.lua
rename from apps/wezterm/wezterm.lua
rename to apps/gui/wezterm/wezterm.lua
diff --git a/apps/xdg.nix b/apps/nogui/xdg.nix
rename from apps/xdg.nix
rename to apps/nogui/xdg.nix
diff --git a/apps/zoxide.nix b/apps/nogui/zoxide.nix
rename from apps/zoxide.nix
rename to apps/nogui/zoxide.nix
diff --git a/flake.nix b/flake.nix
index 8d631b9b473de2ef9a330bdeedaa3be3e762487a..07a543e0c464c8499f3f3f68ebd43e941a0d670d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@ jolheiser = import jolheiser-nur {pkgs = prev;};
};
};
};
- commonConfig = {server ? false}: {
+ commonConfig = {gui ? true}: {
config,
pkgs,
...
@@ -46,47 +46,40 @@ file = path;
owner = username;
};
in {
- config =
- {
- nixpkgs.overlays = [overlays];
- home-manager = {
- useGlobalPkgs = true;
- useUserPackages = true;
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
{
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
description = "jolheiser's nixos config";
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
home-manager.url = "github:nix-community/home-manager";
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
agenix.url = "github:ryantm/agenix";
- nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ };
agenix.inputs = {
- home-manager.url = "github:nix-community/home-manager";
+ flake-utils.url = "github:numtide/flake-utils";
- home-manager.url = "github:nix-community/home-manager";
+ };
+ };
+ flake-utils.url = "github:numtide/flake-utils";
{
- home-manager.url = "github:nix-community/home-manager";
+ flake-utils.url = "github:numtide/flake-utils";
description = "jolheiser's nixos config";
- home-manager.url = "github:nix-community/home-manager";
+ flake-utils.url = "github:numtide/flake-utils";
- home-manager.url = "github:nix-community/home-manager";
+ flake-utils.url = "github:numtide/flake-utils";
inputs = {
- spotify-pw = userSecret ./secrets/shared/spotify-pw.age;
- irc-pw = userSecret ./secrets/shared/irc-pw.age;
+ flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
- home-manager.url = "github:nix-community/home-manager";
- }
- else {}
+ };
- );
+ };
};
username = "jolheiser";
in
@@ -97,10 +90,9 @@ system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
agenix.nixosModules.default
- ./machines/common
./machines/chai
- agenix.url = "github:ryantm/agenix";
{
+ config,
({pkgs, ...}: {
config = {
nixpkgs.overlays = [
@@ -110,8 +102,8 @@ })
];
home-manager.users.${username}.programs = {
git.package = pkgs.gitSVN;
- agenix.inputs = {
{
+ pkgs,
};
age.secrets = {
netrc = {
@@ -134,19 +126,19 @@ system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
agenix.nixosModules.default
- ./machines/common
./machines/matcha
- agenix.url = "github:ryantm/agenix";
{
+ config,
];
};
"dragonwell" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
+ agenix.nixosModules.default
./machines/dragonwell
{
- agenix.inputs = {
+ ...
];
};
};
diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index ccbd57aab21902d38a392c210c9ac2a1bf1b4899..837f4b9927b6641e54f7c63029248b5e0e2f6f29 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -1,7 +1,7 @@
{pkgs, ...}: let
username = "jolheiser";
in {
- imports = [./hardware.nix ../common];
+ imports = [./hardware.nix ../common/gui];
boot = {
kernelPackages = pkgs.linuxPackages_latest;
diff --git a/machines/common/default.nix b/machines/common/nogui/default.nix
rename from machines/common/default.nix
rename to machines/common/nogui/default.nix
index 7aadb458b7ed3252f22bd5e07a3cd13827dc91eb..e08ef1b2c6efadb24d55665ca20ad60af0c88cc9 100644
--- a/machines/common/default.nix
+++ b/machines/common/nogui/default.nix
@@ -1,6 +1,4 @@
{pkgs, ...}: {
- imports = [./sound.nix ./xserver.nix];
-
console.colors = [
"1e1e2e"
"585b70"
diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c09fe135c526add2a0d347d143976bab5a32fa49
--- /dev/null
+++ b/machines/common/gui/default.nix
@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+ imports = [../nogui];
+
+ sound.enable = true;
+ hardware.pulseaudio.enable = false;
+ security = {rtkit.enable = true;};
+ services = {
+ pipewire = {
+ enable = true;
+ pulse.enable = true;
+ alsa.enable = true;
+ };
+ };
+
+ services.xserver = {
+ enable = true;
+ displayManager.lightdm.enable = true;
+ desktopManager.cinnamon.enable = true;
+ layout = "us";
+ xkbVariant = "";
+ };
+}
diff --git a/machines/common/sound.nix b/machines/common/sound.nix
deleted file mode 100644
index aa630608409417081dca06ed78155f14c27a9ea0..0000000000000000000000000000000000000000
--- a/machines/common/sound.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- sound.enable = true;
- hardware.pulseaudio.enable = false;
- security = {rtkit.enable = true;};
- services = {
- pipewire = {
- enable = true;
- pulse.enable = true;
- alsa.enable = true;
- };
- };
-}
diff --git a/machines/common/xserver.nix b/machines/common/xserver.nix
deleted file mode 100644
index de0d030d95a15afc1506b4497b1462bcb958d903..0000000000000000000000000000000000000000
--- a/machines/common/xserver.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{pkgs, ...}: {
- services.xserver = {
- enable = true;
- displayManager.lightdm.enable = true;
- desktopManager.cinnamon.enable = true;
- layout = "us";
- xkbVariant = "";
- };
-}
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 589e707bc4db59f6690d203d6987a0f41a607960..c35fef6c1cbc43d44411ff1943b68602a1d11e0b 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -1,28 +1,8 @@
{pkgs, ...}: let
username = "jolheiser";
in {
- imports = [./hardware.nix];
-
- nixpkgs.config.allowUnfree = true;
-
- nix = {
- gc.automatic = true;
- package = pkgs.nixVersions.nix_2_15;
- settings = {
- experimental-features = ["flakes" "nix-command" "repl-flake"];
- auto-optimise-store = true;
-{pkgs, ...}: let
in {
- };
- };
-
- system.activationScripts.diff = {
- supportsDryActivation = true;
- text = ''
-{pkgs, ...}: let
package = pkgs.nixVersions.nix_2_15;
- '';
- };
boot.tmp.cleanOnBoot = true;
zramSwap.enable = true;
@@ -34,11 +14,7 @@ firewall.enable = true;
};
services = {
- openssh = {
- enable = true;
-{pkgs, ...}: let
imports = [./hardware.nix];
-
tailscale.enable = true;
};
diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix
index 149312deaded55ab88a002392837d5af1859fac9..a73bd3145c627b28735541da363e9a0d485de37a 100644
--- a/machines/matcha/default.nix
+++ b/machines/matcha/default.nix
@@ -1,7 +1,7 @@
{pkgs, ...}: let
username = "jolheiser";
in {
- imports = [./hardware.nix ../common];
+ imports = [./hardware.nix ../common/gui];
boot = {
kernelPackages = pkgs.linuxPackages_latest;