aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hosts/ganymede/nixos.nix23
-rw-r--r--hosts/jupiter/config.nix5
-rw-r--r--hosts/jupiter/nixos.nix15
-rw-r--r--hosts/mercury/config.nix28
-rw-r--r--hosts/mercury/hjem.nix1
-rw-r--r--hosts/mercury/nixos.nix11
-rw-r--r--modules/desktop/nixos/fonts.nix3
-rw-r--r--modules/nix/nixos/default.nix10
-rw-r--r--modules/services/nixos/audio.nix5
-rw-r--r--modules/services/options.nix8
-rw-r--r--modules/user/nixos/default.nix3
11 files changed, 34 insertions, 78 deletions
diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix
index ce30973..9dc6dec 100644
--- a/hosts/ganymede/nixos.nix
+++ b/hosts/ganymede/nixos.nix
@@ -1,6 +1,5 @@
{
config,
- lib,
inputs,
...
}: {
@@ -23,24 +22,6 @@
networkConfig.DHCP = "yes";
};
- services.openssh.settings.PasswordAuthentication = lib.mkForce true;
-
- # services.tsnsrv = {
- # enable = true;
- # defaults = {
- # authKeyPath = config.collinux.secrets."tsnsrv-authkey".path;
- # ephemeral = true;
- # loginServerUrl = "https://williamsfam.us.com";
- # };
-
- # services = {
- # "adguard" = {
- # listenAddr = ":80";
- # toURL = "http://localhost:8001";
- # };
- # };
- # };
-
- nixpkgs.hostPlatform = "x86_64-linux";
- system.stateVersion = "25.05";
+ # i broke something and this fixes it
+ environment.etc."systemd/resolved.conf.d/10-dns.conf".text = config.environment.etc."systemd/resolved.conf".text;
}
diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index a0c1583..decaa61 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -57,10 +57,7 @@
sshd.enable = true;
};
- audio = {
- enable = true;
- pulse.enable = true;
- };
+ audio.enable = true;
bluetooth.enable = true;
};
diff --git a/hosts/jupiter/nixos.nix b/hosts/jupiter/nixos.nix
index e39328a..80ab0f4 100644
--- a/hosts/jupiter/nixos.nix
+++ b/hosts/jupiter/nixos.nix
@@ -1,21 +1,8 @@
-{
- inputs,
- pkgs,
- ...
-}: {
+{inputs, ...}: {
imports = [
./disks.nix
inputs.nixos-facter-modules.nixosModules.facter
];
- boot.blacklistedKernelModules = ["snd_seq_dummy"];
-
- systemd.network.wait-online.enable = false; # fix for weird wifi issue
-
- fonts.packages = [pkgs.nerd-fonts.iosevka];
-
facter.reportPath = ./facter.json;
- time.timeZone = "America/Chicago";
- nixpkgs.hostPlatform = "x86_64-linux";
- system.stateVersion = "25.05";
}
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix
index 9ee29d0..3fb4753 100644
--- a/hosts/mercury/config.nix
+++ b/hosts/mercury/config.nix
@@ -1,20 +1,19 @@
-{pkgs, ...}: {
+{
collinux = {
theme = "catppuccin";
user.name = "collin";
desktop = {
wallpaper = ./wallpaper.jpg;
-
- # gtk.enable = true;
-
+ gtk.enable = true;
greetd.enable = true;
wm = {
- # sway.enable = true;
niri.enable = true;
- components.fuzzel.enable = true;
- components.dunst.enable = true;
+ components = {
+ fuzzel.enable = true;
+ dunst.enable = true;
+ };
};
programs = {
@@ -43,26 +42,23 @@
shells.bash.enable = true; # for nix-shells
programs = {
- lazygit.enable = true;
starship.enable = true;
-
fzf.enable = true;
bat.enable = true;
eza.enable = true;
+ helix = {
+ enable = true;
+ hardMode = true;
+ };
+ lazygit.enable = true;
+ nh.enable = true;
git = {
enable = true;
userName = "Collin Williams";
userEmail = "96917990+bluedragon1221@users.noreply.github.com";
installKey = true;
};
-
- nh.enable = true;
-
- helix = {
- enable = true;
- hardMode = true;
- };
};
};
diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index 6eba4c9..1db654f 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -6,7 +6,6 @@
kdePackages.kleopatra
mpv
musescore
- zed-editor # experimenting
kew # music player
prismlauncher
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 558ae60..631a537 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -12,10 +12,11 @@
inputs.lanzaboote.nixosModules.lanzaboote
];
- systemd.services.systemd-udev-settle.enable = false;
- networking.interfaces.wlp2s0.useDHCP = false;
-
- services.sshd.enable = true;
+ services.syncthing = {
+ enable = true;
+ user = "collin";
+ dataDir = "/home/collin/.local/syncthing";
+ };
facter.reportPath = ./facter.json;
@@ -25,6 +26,4 @@
allowedUDPPorts = [445];
allowedTCPPorts = [8000];
};
-
- system.stateVersion = "25.05";
}
diff --git a/modules/desktop/nixos/fonts.nix b/modules/desktop/nixos/fonts.nix
index 3f10d92..5ac17ec 100644
--- a/modules/desktop/nixos/fonts.nix
+++ b/modules/desktop/nixos/fonts.nix
@@ -1,8 +1,7 @@
{pkgs, ...}: {
fonts = {
enableDefaultPackages = false;
- # fontDir.enable = true;
fontconfig.enable = true;
- packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot)
+ packages = [pkgs.nerd-fonts.iosevka pkgs.ibm-plex]; # for terminal (blackbox or foot or ghostty)
};
}
diff --git a/modules/nix/nixos/default.nix b/modules/nix/nixos/default.nix
index 7116371..c817859 100644
--- a/modules/nix/nixos/default.nix
+++ b/modules/nix/nixos/default.nix
@@ -1,12 +1,9 @@
{
- inputs,
config,
pkgs,
...
}: {
nix = {
- # package = inputs.determinate.packages.${pkgs.system}.default;
-
gc.automatic = false; # use nh cleaner instead
# Make builds run with low priority so my system stays responsive
@@ -27,9 +24,12 @@
programs.nh = {
enable = true;
- flake = "/home/collin/nixos";
+ flake = "/home/${config.collinux.user.name}/nixos";
clean.enable = true;
};
- hjem.users."${config.collinux.user.name}".packages = [pkgs.cached-nix-shell];
+ environment.systemPackages = [pkgs.cached-nix-shell];
+
+ nixpkgs.hostPlatform = "x86_64-linux";
+ system.stateVersion = "25.05";
}
diff --git a/modules/services/nixos/audio.nix b/modules/services/nixos/audio.nix
index 93f8289..8f2f23e 100644
--- a/modules/services/nixos/audio.nix
+++ b/modules/services/nixos/audio.nix
@@ -12,9 +12,10 @@ in
enable = true;
wireplumber.enable = true;
alsa.enable = true;
-
- pulse.enable = cfg.pulse.enable;
+ pulse.enable = false;
};
+ boot.blacklistedKernelModules = ["snd_seq_dummy"]; # remove extraneous alsa midi devices
+
environment.systemPackages = [pkgs.pwvucontrol];
}
diff --git a/modules/services/options.nix b/modules/services/options.nix
index df8bc52..16bf5ac 100644
--- a/modules/services/options.nix
+++ b/modules/services/options.nix
@@ -46,11 +46,9 @@ in {
};
};
};
- audio = {
- enable = mkEnableOption "pipewire + wireplumber";
- pulse.enable = mkEnableOption "pipewire-pulse";
- # some config to make audio work with wine (TODO for jupiter)
- };
+
+ audio.enable = mkEnableOption "pipewire + wireplumber";
+
bluetooth = {
enable = mkEnableOption "bluetooth";
blueman.enable = mkEnableOption "graphical bluetooth manager";
diff --git a/modules/user/nixos/default.nix b/modules/user/nixos/default.nix
index b14e52d..0b0ae41 100644
--- a/modules/user/nixos/default.nix
+++ b/modules/user/nixos/default.nix
@@ -1,13 +1,12 @@
{
config,
- hostname,
lib,
...
}: let
cfg = config.collinux.user;
in {
users = {
- mutableUsers = true;
+ mutableUsers = true; # system passwords stored mutably
users."${cfg.name}" = {
isNormalUser = true;