emmet/nixos-config
0
1
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Minor updates and got all systems to build!

Browse Source
This commit is contained in:
Emmet
2025-02-12 15:57:42 -06:00
parent 52ce2d1cb1
commit 25b7cbb919
13 changed files with 336 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
modules/system/phoenix/default.nix
View File

@@ -15,73 +15,70 @@
};
};
};
# TODO disabled for debugging
# config = {
# environment.systemPackages = [
# # TODO update script for config schema change
# (pkgs.writeScriptBin "phoenix" ''
# if [ "$1" = "sync" ]; then
# if [ "$#" = 1 ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/sync.sh;
# exit 0;
# elif [ "$2" = "user" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/sync-user.sh;
# exit 0;
# elif [ "$2" = "system" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/sync-system.sh;
# exit 0;
# else
# echo "Please pass 'system' or 'user' if supplying a second argument"
# fi
# elif [ "$1" = "refresh" ]; then
# if [ "$#" -gt 1 ]; then
# echo "Warning: The 'refresh' command has no subcommands (no $2 subcommand)";
# fi
# ''+config.systemSettings.dotfilesDir+''/scripts/sync-posthook.sh;
# exit 0;
# elif [ "$1" = "update" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/update.sh "''${@:2}";
# exit 0;
# elif [ "$1" = "upgrade" ]; then
# if [ "$#" -gt 1 ]; then
# echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)";
# fi
# ''+config.systemSettings.dotfilesDir+''/scripts/upgrade.sh;
# exit 0;
# elif [ "$1" = "pull" ]; then
# if [ "$#" -gt 1 ]; then
# echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)";
# fi
# ''+config.systemSettings.dotfilesDir+''/scripts/pull.sh;
# exit 0;
# elif [ "$1" = "harden" ]; then
# if [ "$#" -gt 1 ]; then
# echo "Warning: The 'harden' command has no subcommands (no $2 subcommand)";
# fi
# ''+config.systemSettings.dotfilesDir+''/scripts/harden.sh;
# exit 0;
# elif [ "$1" = "soften" ]; then
# if [ "$#" -gt 1 ]; then
# echo "Warning: The 'soften' command has no subcommands (no $2 subcommand)";
# fi
# ''+config.systemSettings.dotfilesDir+''/scripts/soften.sh;
# exit 0;
# elif [ "$1" = "gc" ]; then
# if [ "$#" -gt 2 ]; then
# echo "Warning: The 'gc' command only accepts one argument (collect_older_than)";
# fi
# if [ "$2" = "full" ]; then
# sudo nix-collect-garbage --delete-old;
# nix-collect-garbage --delete-old;
# elif [ "$2" ]; then
# sudo nix-collect-garbage --delete-older-than $2;
# nix-collect-garbage --delete-older-than $2;
# else
# sudo nix-collect-garbage --delete-older-than 30d;
# nix-collect-garbage --delete-older-than 30d;
# fi
# fi
# '')
# ];
# };
config = {
environment.systemPackages = with pkgs; [
attic-client
(pkgs.writeScriptBin "phoenix" ''
if [ "$1" = "sync" ]; then
if [ "$#" = 1 ]; then
${config.systemSettings.dotfilesDir}/scripts/sync.sh;
exit 0;
fi
elif [ "$1" = "refresh" ]; then
if [ "$#" -gt 1 ]; then
echo "Warning: The 'refresh' command has no subcommands (no $2 subcommand)";
fi
${config.systemSettings.dotfilesDir}/scripts/sync-posthook.sh;
exit 0;
elif [ "$1" = "update" ]; then
${config.systemSettings.dotfilesDir}/scripts/update.sh "''${@:2}";
exit 0;
elif [ "$1" = "upgrade" ]; then
if [ "$#" -gt 1 ]; then
echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)";
fi
${config.systemSettings.dotfilesDir}/scripts/upgrade.sh;
exit 0;
elif [ "$1" = "pull" ]; then
if [ "$#" -gt 1 ]; then
echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)";
fi
${config.systemSettings.dotfilesDir}/scripts/pull.sh;
exit 0;
elif [ "$1" = "build" ]; then
if [ "$#" -gt 1 ]; then
echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)";
fi
${config.systemSettings.dotfilesDir}/scripts/build.sh;
exit 0;
elif [ "$1" = "harden" ]; then
if [ "$#" -gt 1 ]; then
echo "Warning: The 'harden' command has no subcommands (no $2 subcommand)";
fi
${config.systemSettings.dotfilesDir}/scripts/harden.sh;
exit 0;
elif [ "$1" = "soften" ]; then
if [ "$#" -gt 1 ]; then
echo "Warning: The 'soften' command has no subcommands (no $2 subcommand)";
fi
${config.systemSettings.dotfilesDir}/scripts/soften.sh;
exit 0;
elif [ "$1" = "gc" ]; then
if [ "$#" -gt 2 ]; then
echo "Warning: The 'gc' command only accepts one argument (collect_older_than)";
fi
if [ "$2" = "full" ]; then
sudo nix-collect-garbage --delete-old;
nix-collect-garbage --delete-old;
elif [ "$2" ]; then
sudo nix-collect-garbage --delete-older-than $2;
nix-collect-garbage --delete-older-than $2;
else
sudo nix-collect-garbage --delete-older-than 30d;
nix-collect-garbage --delete-older-than 30d;
fi
fi
'')
];
};
}

2
modules/user/browser/default.nix
View File

@@ -24,7 +24,7 @@ in {
userSettings.spawnBrowser = lib.mkMerge [
(lib.mkIf ((browser == "brave") || (browser == "librewolf")) browser)
(lib.mkIf (!(config.userSettings.hyprland.hyprprofiles.enable) && (browser == "qutebrowser")) "qutebrowser --qt-flag ignore-gpu-blacklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag enable-accelerated-2d-canvas --qt-flag num-raster-threads=4")
(lib.mkIf config.userSettings.hyprland.hyprprofiles.enable "qutebrowser-hyprprofile")
(lib.mkIf (config.userSettings.hyprland.hyprprofiles.enable && (browser == "qutebrowser")) "qutebrowser-hyprprofile")
(lib.mkIf (browser == null) "")
];
};

2
modules/user/hyprland/default.nix
View File

@@ -13,7 +13,7 @@ in
};
};
config = {
config = lib.mkIf cfg.enable {
userSettings.alacritty.enable = true;
userSettings.kitty.enable = true;
userSettings.japanese.enable = true;

4
modules/user/plasma/default.nix
View File

@@ -1,4 +1,4 @@
{config, lib, pkgs, ...}:
{config, lib, pkgs, inputs, ...}:
let
cfg = config.userSettings.plasma;
in {
@@ -8,6 +8,8 @@ in {
};
};
imports = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
config = lib.mkIf cfg.enable {
programs.plasma = {
enable = true;