From 3c370913f8846c0d83ca29943aa33f496810d61f Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Tue, 4 Mar 2025 23:43:53 -0500 Subject: [PATCH] Refactor Nix configurations: comment out unused user directories, update default browser to zen_twilight, and adjust package imports for development and gaming --- home/toph/common/core/default.nix | 12 ++++++------ home/toph/common/optional/browsers/zen.nix | 8 ++++---- .../common/optional/desktops/gnome/default.nix | 2 +- home/toph/common/optional/development/default.nix | 5 +++-- home/toph/common/optional/gaming/default.nix | 14 +++++++------- home/toph/common/optional/xdg.nix | 2 +- home/toph/rune/default.nix | 4 ---- home/toph/vm/default.nix | 3 ++- hosts/common/core/default.nix | 1 + hosts/common/optional/audio.nix | 2 +- hosts/common/optional/gnome.nix | 2 +- hosts/common/optional/plymouth.nix | 2 +- hosts/nixos/vm/default.nix | 5 +++-- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/home/toph/common/core/default.nix b/home/toph/common/core/default.nix index b6be362..4128b86 100644 --- a/home/toph/common/core/default.nix +++ b/home/toph/common/core/default.nix @@ -55,12 +55,12 @@ userDirs = { enable = true; createDirectories = true; - desktop = "${config.home.homeDirectory}/.desktop"; - documents = "${config.home.homeDirectory}/doc"; - download = "${config.home.homeDirectory}/downloads"; - music = "${config.home.homeDirectory}/media/audio"; - pictures = "${config.home.homeDirectory}/media/images"; - videos = "${config.home.homeDirectory}/media/video"; + # desktop = "${config.home.homeDirectory}/.desktop"; + # documents = "${config.home.homeDirectory}/doc"; + # download = "${config.home.homeDirectory}/downloads"; + # music = "${config.home.homeDirectory}/media/audio"; + # pictures = "${config.home.homeDirectory}/media/images"; + # 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 # templates = "/var/empty"; #using this option with null or "/var/empty" barfs so it is set properly in extraConfig below diff --git a/home/toph/common/optional/browsers/zen.nix b/home/toph/common/optional/browsers/zen.nix index 8e87845..9eb1dbc 100644 --- a/home/toph/common/optional/browsers/zen.nix +++ b/home/toph/common/optional/browsers/zen.nix @@ -12,9 +12,9 @@ }; xdg.mimeApps.defaultApplications = { - "text/html" = [ "zen.desktop" ]; - "text/xml" = [ "zen.desktop" ]; - "x-scheme-handler/http" = [ "zen.desktop" ]; - "x-scheme-handler/https" = [ "zen.desktop" ]; + "text/html" = [ "zen_twilight.desktop" ]; + "text/xml" = [ "zen_twilight.desktop" ]; + "x-scheme-handler/http" = [ "zen_twilight.desktop" ]; + "x-scheme-handler/https" = [ "zen_twilight.desktop" ]; }; } diff --git a/home/toph/common/optional/desktops/gnome/default.nix b/home/toph/common/optional/desktops/gnome/default.nix index 9ace16b..5e5404c 100644 --- a/home/toph/common/optional/desktops/gnome/default.nix +++ b/home/toph/common/optional/desktops/gnome/default.nix @@ -51,7 +51,7 @@ "org.gnome.Nautilus.desktop" "org.wezfurlong.wezterm.desktop" "win11.desktop" - "zen.desktop" + "zen_twilight.desktop" "spotify.desktop" "vesktop.desktop" "org.telegram.desktop.desktop" diff --git a/home/toph/common/optional/development/default.nix b/home/toph/common/optional/development/default.nix index f92dd49..e644920 100644 --- a/home/toph/common/optional/development/default.nix +++ b/home/toph/common/optional/development/default.nix @@ -5,7 +5,7 @@ ... }: { - imports = lib.custom.scanPaths ./.; + # imports = lib.custom.scanPaths ./.; home.packages = lib.flatten [ (builtins.attrValues { @@ -18,6 +18,8 @@ logisim-evolution mcaselector prettierd + jetbrains-toolbox + vscode-fhs # nix nixpkgs-review @@ -38,7 +40,6 @@ ; inherit (pkgs.jetbrains) idea-ultimate - jetbrains-toolbox ; }) ]; diff --git a/home/toph/common/optional/gaming/default.nix b/home/toph/common/optional/gaming/default.nix index b7c261f..c74dff5 100644 --- a/home/toph/common/optional/gaming/default.nix +++ b/home/toph/common/optional/gaming/default.nix @@ -8,20 +8,20 @@ }: let - monitor = lib.head (lib.filter (m: m.primary) config.monitors); + # monitor = lib.head (lib.filter (m: m.primary) config.monitors); steam-session = let gamescope = lib.concatStringsSep " " [ (lib.getExe pkgs.gamescope) - "--output-width ${toString monitor.width}" - "--output-height ${toString monitor.height}" - "--framerate-limit ${toString monitor.refreshRate}" - "--prefer-output ${monitor.name}" + # "--output-width ${toString monitor.width}" + # "--output-height ${toString monitor.height}" + # "--framerate-limit ${toString monitor.refreshRate}" + # "--prefer-output ${monitor.name}" "--adaptive-sync" "--expose-wayland" "--steam" - "--hdr-enabled" + # "--hdr-enabled" ]; steam = lib.concatStringsSep " " [ "steam" @@ -37,7 +37,7 @@ let ''; in { - home.packages = [ + home.packages = with pkgs; [ steam-session prismlauncher ]; diff --git a/home/toph/common/optional/xdg.nix b/home/toph/common/optional/xdg.nix index e62bf52..0c20123 100644 --- a/home/toph/common/optional/xdg.nix +++ b/home/toph/common/optional/xdg.nix @@ -5,7 +5,7 @@ }: let # 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" ]; # Extensive list of associations here: # https://github.com/iggut/GamiNiX/blob/8070528de419703e13b4d234ef39f05966a7fafb/system/desktop/home-main.nix#L77 diff --git a/home/toph/rune/default.nix b/home/toph/rune/default.nix index 3e291b7..09cc53a 100644 --- a/home/toph/rune/default.nix +++ b/home/toph/rune/default.nix @@ -32,10 +32,6 @@ ## Productivity ## gimp inkscape - - ## Fonts ## - monocraft - nerd-fonts ; }; diff --git a/home/toph/vm/default.nix b/home/toph/vm/default.nix index e82bf61..8abe464 100644 --- a/home/toph/vm/default.nix +++ b/home/toph/vm/default.nix @@ -10,7 +10,8 @@ ## Host-specific Optional Configs ## ../common/optional/browsers ../common/optional/desktops - + ../common/optional/development + ../common/optional/gaming ../common/optional/xdg.nix # file associations ]; diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index 85c154b..383cbc2 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -33,6 +33,7 @@ in # System-wide packages, in case we log in as root environment.systemPackages = with pkgs; [ + plocate openssh ranger sshfs diff --git a/hosts/common/optional/audio.nix b/hosts/common/optional/audio.nix index 2d0ae5d..5c306da 100644 --- a/hosts/common/optional/audio.nix +++ b/hosts/common/optional/audio.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # 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; services.pipewire = { enable = true; diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix index 0a49de0..dba5b13 100644 --- a/hosts/common/optional/gnome.nix +++ b/hosts/common/optional/gnome.nix @@ -33,7 +33,7 @@ with pkgs; [ atomix # puzzle game - # epiphany # web browser + epiphany # web browser evince # document viewer gedit # text editor gnome-maps diff --git a/hosts/common/optional/plymouth.nix b/hosts/common/optional/plymouth.nix index 1f79f7d..ec16a8f 100644 --- a/hosts/common/optional/plymouth.nix +++ b/hosts/common/optional/plymouth.nix @@ -7,7 +7,7 @@ ]; plymouth = { enable = true; - theme = lib.mkForce "hexagon_hud"; + theme = lib.mkForce "motion"; themePackages = [ (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ "motion" ]; }) ]; diff --git a/hosts/nixos/vm/default.nix b/hosts/nixos/vm/default.nix index 969fd33..1c905b7 100644 --- a/hosts/nixos/vm/default.nix +++ b/hosts/nixos/vm/default.nix @@ -27,8 +27,10 @@ in ## Optional Configs ## "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/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 ## @@ -60,7 +62,6 @@ in ranger sshfs wget - ]; # https://wiki.nixos.org/wiki/FAQ/When_do_I_update_stateVersion