Recreated nix files
This commit is contained in:
+287
-288
File diff suppressed because it is too large
Load Diff
@@ -721,7 +721,6 @@ We also add a devshell that makes editing this repository easier in emacs.
|
|||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
hostname = machine;
|
hostname = machine;
|
||||||
inherit user;
|
inherit user;
|
||||||
|
|||||||
@@ -1,105 +0,0 @@
|
|||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
|
||||||
let
|
|
||||||
moduleName = "install-flatpaks";
|
|
||||||
flatpakConfPath = flakeRoot.outPath + "/assets/conf/apps/flatpaks.conf";
|
|
||||||
raw = builtins.readFile flatpakConfPath;
|
|
||||||
# Explicit "\n" so we never accidentally split into characters
|
|
||||||
rawLines = lib.splitString "\n" raw;
|
|
||||||
|
|
||||||
# Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
|
|
||||||
_guard = assert !(
|
|
||||||
builtins.stringLength raw > 1 &&
|
|
||||||
builtins.length rawLines == builtins.stringLength raw
|
|
||||||
); true;
|
|
||||||
|
|
||||||
cleanLine = l:
|
|
||||||
let
|
|
||||||
noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
|
|
||||||
noInlineComment = lib.head (lib.splitString "#" noCR);
|
|
||||||
in
|
|
||||||
lib.strings.trim noInlineComment;
|
|
||||||
|
|
||||||
entries =
|
|
||||||
builtins.filter (l: l != "")
|
|
||||||
(map cleanLine rawLines);
|
|
||||||
|
|
||||||
# Flatpak app IDs are reverse-DNS style like org.example.App (at least 2 dots).
|
|
||||||
# We'll validate and fail early with a clear message.
|
|
||||||
dotCount = s: builtins.length (lib.splitString "." s) - 1;
|
|
||||||
|
|
||||||
isValidId = s:
|
|
||||||
(dotCount s) >= 2; # matches the error you're seeing: "at least 2 periods"
|
|
||||||
|
|
||||||
_validate =
|
|
||||||
builtins.seq _guard (
|
|
||||||
builtins.map (id:
|
|
||||||
if isValidId id then true else
|
|
||||||
throw ''
|
|
||||||
${moduleName}: invalid Flatpak ID in flatpaks.conf (needs reverse-DNS with at least 2 dots)
|
|
||||||
|
|
||||||
Token : ${builtins.toJSON id}
|
|
||||||
flatpaks.conf : ${toString flatpakConfPath}
|
|
||||||
|
|
||||||
Fix: remove stray tokens/headers, or comment them out with '#'.
|
|
||||||
''
|
|
||||||
) entries
|
|
||||||
);
|
|
||||||
|
|
||||||
# Use validated entries
|
|
||||||
flatpakApps = builtins.seq _validate entries;
|
|
||||||
|
|
||||||
syncFlatpaks = pkgs.writeShellScript "sync-flatpaks" ''
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# Use the deployed config path (matches environment.etc below)
|
|
||||||
CONF="/etc/flatpak/flatpaks.conf"
|
|
||||||
if [[ -f "$CONF" ]]; then
|
|
||||||
echo "flatpak-sync: using $CONF"
|
|
||||||
else
|
|
||||||
echo "flatpak-sync: WARNING: $CONF not found, using embedded list"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! flatpak remotes --system --columns=name | grep -qx flathub; then
|
|
||||||
flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
|
||||||
fi
|
|
||||||
|
|
||||||
desired_apps=(
|
|
||||||
${lib.concatStringsSep "\n" (map (a: ''"${a}"'') flatpakApps)}
|
|
||||||
)
|
|
||||||
|
|
||||||
for app in "''${desired_apps[@]}"; do
|
|
||||||
if ! flatpak info --system "$app" >/dev/null 2>&1; then
|
|
||||||
flatpak install --system -y --noninteractive flathub "$app"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.flatpak.enable = true;
|
|
||||||
|
|
||||||
xdg.portal = {
|
|
||||||
enable = true;
|
|
||||||
extraPortals = with pkgs; [
|
|
||||||
xdg-desktop-portal-hyprland
|
|
||||||
xdg-desktop-portal-gtk
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Deploy the config file for runtime visibility/debugging
|
|
||||||
environment.etc."flatpak/flatpaks.conf".source = lib.mkForce flatpakConfPath;
|
|
||||||
|
|
||||||
systemd.services.flatpak-sync = {
|
|
||||||
description = "Install Flatpak apps listed in flatpaks.conf";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
wants = [ "network-online.target" ];
|
|
||||||
after = [ "network-online.target" ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = syncFlatpaks;
|
|
||||||
};
|
|
||||||
|
|
||||||
restartTriggers = [ flatpakConfPath ];
|
|
||||||
path = [ pkgs.flatpak pkgs.coreutils pkgs.gnugrep pkgs.gnused ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
{ config, lib, pkgs, flakeRoot, inputs, ... }:
|
|
||||||
let
|
|
||||||
packagesConfPath = flakeRoot.outPath + "/assets/conf/apps/packages.conf";
|
|
||||||
raw = builtins.readFile packagesConfPath;
|
|
||||||
# IMPORTANT: explicit "\n" so we never accidentally split into characters
|
|
||||||
rawLines = lib.splitString "\n" raw;
|
|
||||||
# Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
|
|
||||||
_guard = assert !(
|
|
||||||
builtins.stringLength raw > 1 &&
|
|
||||||
builtins.length rawLines == builtins.stringLength raw
|
|
||||||
); true;
|
|
||||||
cleanLine = l:
|
|
||||||
let
|
|
||||||
noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
|
|
||||||
noInlineComment = lib.head (lib.splitString "#" noCR);
|
|
||||||
in
|
|
||||||
lib.strings.trim noInlineComment;
|
|
||||||
entries =
|
|
||||||
builtins.filter (l: l != "")
|
|
||||||
(map cleanLine rawLines);
|
|
||||||
resolvePkg = name:
|
|
||||||
let
|
|
||||||
parts = lib.splitString "." name;
|
|
||||||
found = lib.attrByPath parts null pkgs;
|
|
||||||
in
|
|
||||||
if found == null then
|
|
||||||
throw ''
|
|
||||||
install_packages.nix: package not found in pkgs
|
|
||||||
Token : ${builtins.toJSON name}
|
|
||||||
packages.conf : ${toString packagesConfPath}
|
|
||||||
Hint : check the attribute name on search.nixos.org/packages
|
|
||||||
''
|
|
||||||
else
|
|
||||||
found;
|
|
||||||
packages = builtins.seq _guard (map resolvePkg entries);
|
|
||||||
zenBrowser =
|
|
||||||
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
environment.systemPackages =
|
|
||||||
packages
|
|
||||||
++ [ zenBrowser ];
|
|
||||||
}
|
|
||||||
@@ -90,7 +90,6 @@
|
|||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
hostname = machine;
|
hostname = machine;
|
||||||
inherit user;
|
inherit user;
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
|
||||||
{
|
|
||||||
home.activation.recreateConfig = {
|
|
||||||
text = ''
|
|
||||||
#!${pkgs.bash}/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
SOURCE_DIR="${flakeRoot}/assets/copy_stuff"
|
|
||||||
DEST_DIR="$HOME"
|
|
||||||
if [ ! -d "$SOURCE_DIR" ]; then
|
|
||||||
echo "Error: Source directory $SOURCE_DIR does not exist."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
mkdir -p "$DEST_DIR"
|
|
||||||
rsync -av --no-group --no-owner --delete "$SOURCE_DIR/" "$DEST_DIR/"
|
|
||||||
echo "Config files copied from $SOURCE_DIR to $DEST_DIR. Symlinks replaced with editable files."
|
|
||||||
hyprctl reload
|
|
||||||
'';
|
|
||||||
deps = [ pkgs.bash pkgs.rsync ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
# Ensure the script is executable and available
|
|
||||||
environment.systemPackages = [ pkgs.bash ];
|
|
||||||
|
|
||||||
# Add the activation script
|
|
||||||
system.activationScripts.recreateConfig = lib.mkAfter "setupNetworking" ''
|
|
||||||
${config.flakeRoot.outPath}/assets/scripts/recreate_config.sh
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
wayland.windowManager.hyprland = {
|
|
||||||
# Load the Hyprexpo plugin (from nixpkgs)
|
|
||||||
plugins = [
|
|
||||||
pkgs.hyprlandPlugins.hyprexpo
|
|
||||||
];
|
|
||||||
|
|
||||||
# Append plugin config + keybind after your existing hyprland.conf
|
|
||||||
extraConfig = lib.mkAfter ''
|
|
||||||
############################
|
|
||||||
# Hyprexpo (workspace/window overview)
|
|
||||||
############################
|
|
||||||
|
|
||||||
# Basic plugin config (tweak as you like)
|
|
||||||
plugin {
|
|
||||||
hyprexpo {
|
|
||||||
columns = 3
|
|
||||||
gaps_in = 5
|
|
||||||
gaps_out = 20
|
|
||||||
|
|
||||||
# Comment out if you don't want it
|
|
||||||
workspace_method = center current
|
|
||||||
}
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{ config, lib, pkgs, flakeRoot, inputs, ... }:
|
|
||||||
{
|
|
||||||
home.packages = with pkgs; [ jq ];
|
|
||||||
wayland.windowManager.hyprland = {
|
|
||||||
enable = true;
|
|
||||||
plugins = [ pkgs.hyprlandPlugins.hyprscrolling ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{ config, lib, pkgs, flakeRoot, ... }:
|
|
||||||
let
|
|
||||||
repoScript =
|
|
||||||
flakeRoot.outPath + "/assets/conf/desktop/hypr/scripts/powermenu.sh";
|
|
||||||
targetRel = ".config/hypr/scripts/powermenu.sh";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
# Ensure script exists in ~/.config/hypr/scripts/
|
|
||||||
home.file."${targetRel}" = {
|
|
||||||
source = lib.mkForce repoScript;
|
|
||||||
executable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
# Ensure the script is executable and available
|
|
||||||
environment.systemPackages = [ pkgs.bash ];
|
|
||||||
|
|
||||||
# Add the activation script
|
|
||||||
system.activationScripts.recreateConfig = lib.mkAfter "setupNetworking" ''
|
|
||||||
${config.flakeRoot.outPath}/assets/scripts/recreate_config.sh
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user