Refactor Nix configurations: comment out unused user directories, update default browser to zen_twilight, and adjust package imports for development and gaming
This commit is contained in:
parent
eacc091c52
commit
3c370913f8
13 changed files with 31 additions and 31 deletions
|
@ -55,12 +55,12 @@
|
||||||
userDirs = {
|
userDirs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
createDirectories = true;
|
createDirectories = true;
|
||||||
desktop = "${config.home.homeDirectory}/.desktop";
|
# desktop = "${config.home.homeDirectory}/.desktop";
|
||||||
documents = "${config.home.homeDirectory}/doc";
|
# documents = "${config.home.homeDirectory}/doc";
|
||||||
download = "${config.home.homeDirectory}/downloads";
|
# download = "${config.home.homeDirectory}/downloads";
|
||||||
music = "${config.home.homeDirectory}/media/audio";
|
# music = "${config.home.homeDirectory}/media/audio";
|
||||||
pictures = "${config.home.homeDirectory}/media/images";
|
# pictures = "${config.home.homeDirectory}/media/images";
|
||||||
videos = "${config.home.homeDirectory}/media/video";
|
# videos = "${config.home.homeDirectory}/media/video";
|
||||||
# publicshare = "/var/empty"; #using this option with null or "/var/empty" barfs so it is set properly in extraConfig below
|
# publicshare = "/var/empty"; #using this option with null or "/var/empty" barfs so it is set properly in extraConfig below
|
||||||
# templates = "/var/empty"; #using this option with null or "/var/empty" barfs so it is set properly in extraConfig below
|
# templates = "/var/empty"; #using this option with null or "/var/empty" barfs so it is set properly in extraConfig below
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.mimeApps.defaultApplications = {
|
xdg.mimeApps.defaultApplications = {
|
||||||
"text/html" = [ "zen.desktop" ];
|
"text/html" = [ "zen_twilight.desktop" ];
|
||||||
"text/xml" = [ "zen.desktop" ];
|
"text/xml" = [ "zen_twilight.desktop" ];
|
||||||
"x-scheme-handler/http" = [ "zen.desktop" ];
|
"x-scheme-handler/http" = [ "zen_twilight.desktop" ];
|
||||||
"x-scheme-handler/https" = [ "zen.desktop" ];
|
"x-scheme-handler/https" = [ "zen_twilight.desktop" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
"org.gnome.Nautilus.desktop"
|
"org.gnome.Nautilus.desktop"
|
||||||
"org.wezfurlong.wezterm.desktop"
|
"org.wezfurlong.wezterm.desktop"
|
||||||
"win11.desktop"
|
"win11.desktop"
|
||||||
"zen.desktop"
|
"zen_twilight.desktop"
|
||||||
"spotify.desktop"
|
"spotify.desktop"
|
||||||
"vesktop.desktop"
|
"vesktop.desktop"
|
||||||
"org.telegram.desktop.desktop"
|
"org.telegram.desktop.desktop"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = lib.custom.scanPaths ./.;
|
# imports = lib.custom.scanPaths ./.;
|
||||||
|
|
||||||
home.packages = lib.flatten [
|
home.packages = lib.flatten [
|
||||||
(builtins.attrValues {
|
(builtins.attrValues {
|
||||||
|
@ -18,6 +18,8 @@
|
||||||
logisim-evolution
|
logisim-evolution
|
||||||
mcaselector
|
mcaselector
|
||||||
prettierd
|
prettierd
|
||||||
|
jetbrains-toolbox
|
||||||
|
vscode-fhs
|
||||||
|
|
||||||
# nix
|
# nix
|
||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
|
@ -38,7 +40,6 @@
|
||||||
;
|
;
|
||||||
inherit (pkgs.jetbrains)
|
inherit (pkgs.jetbrains)
|
||||||
idea-ultimate
|
idea-ultimate
|
||||||
jetbrains-toolbox
|
|
||||||
;
|
;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
@ -8,20 +8,20 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
monitor = lib.head (lib.filter (m: m.primary) config.monitors);
|
# monitor = lib.head (lib.filter (m: m.primary) config.monitors);
|
||||||
|
|
||||||
steam-session =
|
steam-session =
|
||||||
let
|
let
|
||||||
gamescope = lib.concatStringsSep " " [
|
gamescope = lib.concatStringsSep " " [
|
||||||
(lib.getExe pkgs.gamescope)
|
(lib.getExe pkgs.gamescope)
|
||||||
"--output-width ${toString monitor.width}"
|
# "--output-width ${toString monitor.width}"
|
||||||
"--output-height ${toString monitor.height}"
|
# "--output-height ${toString monitor.height}"
|
||||||
"--framerate-limit ${toString monitor.refreshRate}"
|
# "--framerate-limit ${toString monitor.refreshRate}"
|
||||||
"--prefer-output ${monitor.name}"
|
# "--prefer-output ${monitor.name}"
|
||||||
"--adaptive-sync"
|
"--adaptive-sync"
|
||||||
"--expose-wayland"
|
"--expose-wayland"
|
||||||
"--steam"
|
"--steam"
|
||||||
"--hdr-enabled"
|
# "--hdr-enabled"
|
||||||
];
|
];
|
||||||
steam = lib.concatStringsSep " " [
|
steam = lib.concatStringsSep " " [
|
||||||
"steam"
|
"steam"
|
||||||
|
@ -37,7 +37,7 @@ let
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home.packages = [
|
home.packages = with pkgs; [
|
||||||
steam-session
|
steam-session
|
||||||
prismlauncher
|
prismlauncher
|
||||||
];
|
];
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
# FIXME(xdg): That should use config options and just reference whatever is configured as the default
|
# FIXME(xdg): That should use config options and just reference whatever is configured as the default
|
||||||
browser = [ "zen.desktop" ];
|
browser = [ "zen_twilight.desktop" ];
|
||||||
editor = [ "code.desktop" ];
|
editor = [ "code.desktop" ];
|
||||||
# Extensive list of associations here:
|
# Extensive list of associations here:
|
||||||
# https://github.com/iggut/GamiNiX/blob/8070528de419703e13b4d234ef39f05966a7fafb/system/desktop/home-main.nix#L77
|
# https://github.com/iggut/GamiNiX/blob/8070528de419703e13b4d234ef39f05966a7fafb/system/desktop/home-main.nix#L77
|
||||||
|
|
|
@ -32,10 +32,6 @@
|
||||||
## Productivity ##
|
## Productivity ##
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
|
|
||||||
## Fonts ##
|
|
||||||
monocraft
|
|
||||||
nerd-fonts
|
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,8 @@
|
||||||
## Host-specific Optional Configs ##
|
## Host-specific Optional Configs ##
|
||||||
../common/optional/browsers
|
../common/optional/browsers
|
||||||
../common/optional/desktops
|
../common/optional/desktops
|
||||||
|
../common/optional/development
|
||||||
|
../common/optional/gaming
|
||||||
../common/optional/xdg.nix # file associations
|
../common/optional/xdg.nix # file associations
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ in
|
||||||
|
|
||||||
# System-wide packages, in case we log in as root
|
# System-wide packages, in case we log in as root
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
plocate
|
||||||
openssh
|
openssh
|
||||||
ranger
|
ranger
|
||||||
sshfs
|
sshfs
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
# sound.enable = true; #deprecated in 24.11 TODO remove this line when 24.11 release
|
# sound.enable = true; #deprecated in 24.11 TODO remove this line when 24.11 release
|
||||||
hardware.pulseaudio.enable = false;
|
services.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
with pkgs;
|
with pkgs;
|
||||||
[
|
[
|
||||||
atomix # puzzle game
|
atomix # puzzle game
|
||||||
# epiphany # web browser
|
epiphany # web browser
|
||||||
evince # document viewer
|
evince # document viewer
|
||||||
gedit # text editor
|
gedit # text editor
|
||||||
gnome-maps
|
gnome-maps
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
];
|
];
|
||||||
plymouth = {
|
plymouth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = lib.mkForce "hexagon_hud";
|
theme = lib.mkForce "motion";
|
||||||
themePackages = [
|
themePackages = [
|
||||||
(pkgs.adi1090x-plymouth-themes.override { selected_themes = [ "motion" ]; })
|
(pkgs.adi1090x-plymouth-themes.override { selected_themes = [ "motion" ]; })
|
||||||
];
|
];
|
||||||
|
|
|
@ -27,8 +27,10 @@ in
|
||||||
|
|
||||||
## Optional Configs ##
|
## Optional Configs ##
|
||||||
"hosts/common/optional/audio.nix" # pipewire and cli controls
|
"hosts/common/optional/audio.nix" # pipewire and cli controls
|
||||||
|
"hosts/common/optional/gaming.nix" # steam, gamescope, gamemode, and related hardware
|
||||||
"hosts/common/optional/gnome.nix" # desktop
|
"hosts/common/optional/gnome.nix" # desktop
|
||||||
# "hosts/common/optional/plymouth.nix" # fancy boot screen
|
"hosts/common/optional/nvtop.nix" # GPU monitor (not available in home-manager)
|
||||||
|
"hosts/common/optional/plymouth.nix" # fancy boot screen
|
||||||
|
|
||||||
## Misc Inputs ##
|
## Misc Inputs ##
|
||||||
|
|
||||||
|
@ -60,7 +62,6 @@ in
|
||||||
ranger
|
ranger
|
||||||
sshfs
|
sshfs
|
||||||
wget
|
wget
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://wiki.nixos.org/wiki/FAQ/When_do_I_update_stateVersion
|
# https://wiki.nixos.org/wiki/FAQ/When_do_I_update_stateVersion
|
||||||
|
|
Loading…
Add table
Reference in a new issue