summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorJon Santmyer <jon@jonsantmyer.com>2026-01-31 15:10:46 -0500
committerJon Santmyer <jon@jonsantmyer.com>2026-01-31 15:10:46 -0500
commitf061e0b0c7ed745f372a89d5ec5f69dbd818c731 (patch)
tree6df41e1666046bb9292a3be74b278b2ba68bf78d /modules
parent968c8b2ad3459c9834c3d4ccb799031f9be5b6ca (diff)
downloadnix-config-f061e0b0c7ed745f372a89d5ec5f69dbd818c731.tar.gz
nix-config-f061e0b0c7ed745f372a89d5ec5f69dbd818c731.tar.bz2
nix-config-f061e0b0c7ed745f372a89d5ec5f69dbd818c731.zip
desktop changes 2026-01-31
Diffstat (limited to 'modules')
-rw-r--r--modules/desktop/apps/browsers/librewolf.nix66
-rw-r--r--modules/desktop/apps/editors/vscode.nix4
-rw-r--r--modules/desktop/apps/games/prism.nix3
-rw-r--r--modules/desktop/apps/games/vintagestory.nix31
-rw-r--r--modules/desktop/apps/mpd.nix2
-rw-r--r--modules/desktop/apps/virt.nix7
-rw-r--r--modules/hardware/gpu.nix3
-rw-r--r--modules/options.nix2
-rw-r--r--modules/shell/zsh.nix2
9 files changed, 75 insertions, 45 deletions
diff --git a/modules/desktop/apps/browsers/librewolf.nix b/modules/desktop/apps/browsers/librewolf.nix
new file mode 100644
index 0000000..1700754
--- /dev/null
+++ b/modules/desktop/apps/browsers/librewolf.nix
@@ -0,0 +1,66 @@
+{
+ config,
+ options,
+ lib,
+ pkgs,
+ ...
+}: let
+ librewolfConf = config.modules.desktop.apps.browsers.librewolf;
+in
+{
+ options.modules.desktop.apps.browsers.librewolf = {
+ enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ };
+ };
+ config = lib.mkIf (librewolfConf.enable) {
+ home.manager.programs.librewolf = {
+ enable = true;
+ profiles = {
+ "user" = {
+ id = 0;
+ isDefault = true;
+
+ search.engines = {
+ "Nix Packages" = {
+ urls = [{
+ template = "https://search.nixos.org/packages";
+ params = [
+ { name = "query"; value = "{searchTerms}"; }
+ ];
+ }];
+ icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+ definedAliases = [ "@np" ];
+ };
+ "Nix Options" = {
+ urls = [{
+ template = "https://search.nixos.org/options";
+ params = [
+ { name = "query"; value = "{searchTerms}"; }
+ ];
+ }];
+ definedAliases = [ "@no" ];
+ };
+ "Nix Wiki" = {
+ urls = [{
+ template = "https://wiki.nixos.org/w/index.php";
+ params = [
+ { name = "search"; value = "{searchTerms}"; }
+ ];
+ }];
+ definedAliases = [ "@nw" ];
+ };
+ };
+ };
+ };
+ };
+
+ modules.desktop.defaultApplications.apps.browser = rec {
+ package = pkgs.librewolf;
+ install = false;
+ cmd = "${package}/bin/librewolf";
+ desktop = "librewolf";
+ };
+ };
+}
diff --git a/modules/desktop/apps/editors/vscode.nix b/modules/desktop/apps/editors/vscode.nix
index a775be8..d9f3bd4 100644
--- a/modules/desktop/apps/editors/vscode.nix
+++ b/modules/desktop/apps/editors/vscode.nix
@@ -5,10 +5,10 @@
pkgs,
...
}: let
- codeConf = config.modules.desktop.apps.editors.vscode;
+ codeConf = config.modules.desktop.apps.editors.vscodium;
configDir = config.nixosConfig.configDir;
in {
- options.modules.desktop.apps.editors.vscode = {
+ options.modules.desktop.apps.editors.vscodium = {
enable = lib.mkOption {
type = lib.types.bool;
default = false;
diff --git a/modules/desktop/apps/games/prism.nix b/modules/desktop/apps/games/prism.nix
index d3ceee7..b586451 100644
--- a/modules/desktop/apps/games/prism.nix
+++ b/modules/desktop/apps/games/prism.nix
@@ -16,7 +16,8 @@ in {
};
config = lib.mkIf (prismConf.enable) {
- environment.systemPackages = [
+ home.packages = [
+ pkgs.javaPackages.compiler.temurin-bin.jre-25
pkgs.prismlauncher
];
};
diff --git a/modules/desktop/apps/games/vintagestory.nix b/modules/desktop/apps/games/vintagestory.nix
deleted file mode 100644
index a15935a..0000000
--- a/modules/desktop/apps/games/vintagestory.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- config,
- options,
- lib,
- pkgs,
- rootPath,
- ...
-}: let
- vsConf = config.modules.desktop.apps.games.vintagestory;
- configDir = config.nixosConfig.configDir;
-in {
- options.modules.desktop.apps.games.vintagestory = {
- enable = lib.mkOption {
- type = lib.types.bool;
- default = false;
- };
- };
-
- config = lib.mkIf (vsConf.enable) {
- home.manager.xdg.mimeApps = {
- defaultApplications = {
- "x-scheme-handler/vintagestoryjoin" = [ "Vintagestory_url_connect.desktop" ];
- "x-scheme-handler/vintagestorymodinstall" = [ "Vintagestory_url_mod.desktop" ];
- };
- };
-
- home.packages = with pkgs; [
- (callPackage (rootPath + /packages/vintagestory/default.nix) {})
- ];
- };
-}
diff --git a/modules/desktop/apps/mpd.nix b/modules/desktop/apps/mpd.nix
index 17b22ec..3ec86e4 100644
--- a/modules/desktop/apps/mpd.nix
+++ b/modules/desktop/apps/mpd.nix
@@ -17,7 +17,7 @@ in
config = lib.mkIf (mpdConfig.enable) {
home.packages = [
- pkgs.mpc-cli
+ pkgs.mpc
];
services.mpd = {
diff --git a/modules/desktop/apps/virt.nix b/modules/desktop/apps/virt.nix
index a9eaef4..ec4a41a 100644
--- a/modules/desktop/apps/virt.nix
+++ b/modules/desktop/apps/virt.nix
@@ -26,13 +26,6 @@ in
package = pkgs.qemu_kvm;
runAsRoot = true;
swtpm.enable = true;
- ovmf = {
- enable = true;
- packages = [(pkgs.OVMF.override {
- secureBoot = true;
- tpmSupport = true;
- }).fd];
- };
};
};
programs.virt-manager.enable = true;
diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu.nix
index a71d9d3..32fdf68 100644
--- a/modules/hardware/gpu.nix
+++ b/modules/hardware/gpu.nix
@@ -42,12 +42,11 @@ in {
hardware.nvidia = {
modesetting.enable = true;
- powerManagement.enable = false;
+ powerManagement.enable = true;
powerManagement.finegrained = false;
open = true;
nvidiaSettings = true;
- package = config.boot.kernelPackages.nvidiaPackages.latest;
};
environment.systemPackages = with pkgs; [
diff --git a/modules/options.nix b/modules/options.nix
index c2463b4..04566eb 100644
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -6,6 +6,7 @@
home-manager,
...
}: {
+
options = {
user = lib.mkOption {
type = lib.types.attrs;
@@ -111,6 +112,7 @@
xdg = {
enable = true;
configFile = lib.mkAliasDefinitions options.home.configFile;
+ configHome = config.user.home + "/.config";
};
};
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
index c844564..b786356 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -44,7 +44,7 @@ in {
syntaxHighlighting.enable = true;
autocd = true;
defaultKeymap = "viins";
- dotDir = ".config/zsh";
+ dotDir = config.home.manager.xdg.configHome;
history = {
size = 10000;