Regenerated
This commit is contained in:
+43
-43
@@ -213,7 +213,7 @@ The Nix flake definition for Droidnix.
|
||||
emacs-overlay, zen-browser, flatpak, ... }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
flakeRoot = self;
|
||||
repoPath = self;
|
||||
buildUser = "henrov";
|
||||
repoPath = "/home/${buildUser}/Repos/nixos/Droidnix";
|
||||
mutableConfigPath = "${repoPath}/generated/.config";
|
||||
@@ -231,7 +231,7 @@ The Nix flake definition for Droidnix.
|
||||
];
|
||||
specialArgs = {
|
||||
inherit
|
||||
flakeRoot
|
||||
repoPath
|
||||
home-manager
|
||||
import-tree
|
||||
stylix
|
||||
@@ -251,7 +251,7 @@ The Nix flake definition for Droidnix.
|
||||
** =generated/modules/traveldroid/system/colors.nix=
|
||||
Setting the colors for Droidnix.
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/colors.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
let
|
||||
colors = {
|
||||
crust = "#11111b";
|
||||
@@ -300,7 +300,7 @@ in
|
||||
home-manager.users.${username} = {
|
||||
home.file = {
|
||||
".config/shared/colors.css" = {
|
||||
source = "${flakeRoot}/generated/.config/shared/colors.css";
|
||||
source = "${repoPath}/generated/.config/shared/colors.css";
|
||||
force = true;
|
||||
};
|
||||
".config/quickshell/Colors.qml" = {
|
||||
@@ -323,7 +323,7 @@ in
|
||||
** =generated/hosts/traveldroid/boot.nix=
|
||||
#+BEGIN_SRC nix :tangle generated/hosts/traveldroid/boot.nix :noweb yes :mkdirp yes :eval never
|
||||
# --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. ---
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
{ config, pkgs, lib, repoPath, ... }:
|
||||
{
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
@@ -443,11 +443,11 @@ in
|
||||
|
||||
** =generated/hosts/traveldroid/host.nix=
|
||||
#+BEGIN_SRC nix :tangle generated/hosts/traveldroid/host.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
|
||||
{ lib, config, pkgs, repoPath, import-tree, home-manager, ... }:
|
||||
|
||||
let
|
||||
hostname = "traveldroid";
|
||||
modulesPath = "${flakeRoot}/generated/modules/${hostname}";
|
||||
modulesPath = "${repoPath}/generated/modules/${hostname}";
|
||||
hostModules = import-tree modulesPath;
|
||||
allModules = hostModules.imports;
|
||||
in
|
||||
@@ -502,13 +502,13 @@ in
|
||||
** =generated/modules/traveldroid/apps/2_b_installed.nix=
|
||||
This installs a list of apps
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/2_b_installed.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
|
||||
let
|
||||
#################################
|
||||
# FILE
|
||||
#################################
|
||||
confPath = "${flakeRoot}/generated/assets/2_b_installed.conf";
|
||||
confPath = "${repoPath}/generated/assets/2_b_installed.conf";
|
||||
raw = builtins.readFile confPath;
|
||||
lines = lib.splitString "\n" raw;
|
||||
|
||||
@@ -606,12 +606,12 @@ in {
|
||||
** =generated/modules/traveldroid/apps/emacs/emacs.nix=
|
||||
This installs emacs
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/emacs/emacs.nix :noweb yes :mkdirp yes :eval never
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
{ config, pkgs, lib, repoPath, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
|
||||
assetPath = "${flakeRoot}/generated/.config/emacs";
|
||||
assetPath = "${repoPath}/generated/.config/emacs";
|
||||
|
||||
# Emacs package with Tree-sitter support
|
||||
emacsPkg = pkgs.emacs-pgtk.override { withTreeSitter = true; };
|
||||
@@ -779,11 +779,11 @@ in
|
||||
** =generated/modules/traveldroid/apps/kitty.nix=
|
||||
This file sets up Kitty terminal
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/kitty.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, pkgs, config, flakeRoot, ... }:
|
||||
{ lib, pkgs, config, repoPath, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
extraConfigFile = "${flakeRoot}/generated/.config/kitty/extra.conf";
|
||||
extraConfigFile = "${repoPath}/generated/.config/kitty/extra.conf";
|
||||
extraConfig =
|
||||
if builtins.pathExists extraConfigFile
|
||||
then builtins.readFile extraConfigFile
|
||||
@@ -827,14 +827,14 @@ in
|
||||
** =generated/modules/traveldroid/apps/starship.nix=
|
||||
This file sets up starship prompt
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/starship.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
|
||||
let
|
||||
# Default username fallback
|
||||
username = config.defaultUser or "henrov";
|
||||
|
||||
# Path to the starship config in assets
|
||||
starshipConfSrc = "${flakeRoot}/generated/.config/starship.toml";
|
||||
starshipConfSrc = "${repoPath}/generated/.config/starship.toml";
|
||||
in
|
||||
{
|
||||
#################################
|
||||
@@ -907,11 +907,11 @@ in
|
||||
** =generated/modules/traveldroid/apps/wofi.nix=
|
||||
This is the install for Wofi, the launcher
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/wofi.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
assetPath = "${flakeRoot}/generated/.config/wofi";
|
||||
assetPath = "${repoPath}/generated/.config/wofi";
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [ pkgs.wofi ];
|
||||
@@ -954,19 +954,19 @@ in
|
||||
** =generated/modules/traveldroid/apps/zsh.nix=
|
||||
This sets up the zsh in the terminal
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/zsh.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
|
||||
let
|
||||
#################################
|
||||
# User config
|
||||
#################################
|
||||
username = config.defaultUser or "henrov";
|
||||
generatedZsh = "${flakeRoot}/generated/.config/zsh/.zshrc";
|
||||
generatedZsh = "${repoPath}/generated/.config/zsh/.zshrc";
|
||||
|
||||
#################################
|
||||
# Alias parsing
|
||||
#################################
|
||||
aliasFile = "${flakeRoot}/generated/assets/aliases.conf";
|
||||
aliasFile = "${repoPath}/generated/assets/aliases.conf";
|
||||
content = builtins.readFile aliasFile;
|
||||
|
||||
lines =
|
||||
@@ -1101,10 +1101,10 @@ in
|
||||
** =generated/modules/traveldroid/desktop/hyprland.nix=
|
||||
Setting up Hyprland
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/hyprland.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, home-manager, inputs, ... }:
|
||||
{ lib, config, pkgs, repoPath, home-manager, inputs, ... }:
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
assetPath = "${flakeRoot}/generated/.config/hypr";
|
||||
assetPath = "${repoPath}/generated/.config/hypr";
|
||||
hyprlandPkg =
|
||||
pkgs.hyprland or
|
||||
pkgs.hyprland-git or
|
||||
@@ -1143,13 +1143,13 @@ in
|
||||
|
||||
** =generated/modules/traveldroid/desktop/stylix.nix=
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/stylix.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, stylix, ... }:
|
||||
{ lib, config, pkgs, repoPath, stylix, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
moduleName = "stylix";
|
||||
|
||||
assetPath = "${flakeRoot}/generated/.config/${moduleName}";
|
||||
assetPath = "${repoPath}/generated/.config/${moduleName}";
|
||||
|
||||
stylixConfFile = "${assetPath}/stylix.conf";
|
||||
stylixConf =
|
||||
@@ -1182,7 +1182,7 @@ in
|
||||
stylix = {
|
||||
enable = true;
|
||||
|
||||
base16Scheme = "${flakeRoot}/assets/traveldroid/theming/stylix/catppuccin-mocha.yaml";
|
||||
base16Scheme = "${repoPath}/assets/traveldroid/theming/stylix/catppuccin-mocha.yaml";
|
||||
polarity = "dark";
|
||||
|
||||
targets = {
|
||||
@@ -1229,12 +1229,12 @@ in
|
||||
** =generated/modules/traveldroid/desktop/wallpaper.nix=
|
||||
Setting up wallpaper engine + wallpaper gui
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/wallpaper.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
wallpaperSrc = "${flakeRoot}/assets/traveldroid/Wallpapers";
|
||||
wallpaperSrc = "${repoPath}/assets/traveldroid/Wallpapers";
|
||||
wallpaperDst = "${homeDir}/Wallpapers";
|
||||
randoScript = "${homeDir}/Wallpapers/scripts/randomizeWallpapers.sh";
|
||||
in
|
||||
@@ -1324,7 +1324,7 @@ in
|
||||
** =generated/modules/traveldroid/desktop/waybar.nix=
|
||||
This file installs and configures waybar
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, buildUser, repoPath, mutableConfigPath,... }:
|
||||
{ lib, config, pkgs, repoPath, buildUser, mutableConfigPath,... }:
|
||||
let
|
||||
# Use the config option defaultUser directly, fallback to "henrov"
|
||||
username = config.defaultUser or "henrov";
|
||||
@@ -1411,7 +1411,7 @@ in
|
||||
** =generated/modules/traveldroid/desktop/xdg.nix=
|
||||
This sets the XDG implementation
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/xdg.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
@@ -1535,15 +1535,15 @@ in
|
||||
** =generated/modules/traveldroid/system/copy_scripts.nix=
|
||||
This copies any scripts from /generated/.config/scripts to ~/.config/scripts and makes any .sh files executable.
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/copy_scripts.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
configPath = flakeRoot + "/generated/.config/scripts";
|
||||
configPath = repoPath + "/generated/.config/scripts";
|
||||
allFiles = lib.filesystem.listFilesRecursive configPath;
|
||||
|
||||
toRelative = file:
|
||||
let
|
||||
base = toString flakeRoot + "/generated/";
|
||||
base = toString repoPath + "/generated/";
|
||||
relative = lib.removePrefix base (toString file);
|
||||
in
|
||||
builtins.unsafeDiscardStringContext relative;
|
||||
@@ -1672,12 +1672,12 @@ This sets the firewall.
|
||||
** =generated/modules/traveldroid/system/hypridle.nix=
|
||||
This installs hypridle
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/hypridle.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
basePath = "${flakeRoot}/generated/.config";
|
||||
assetPath = "${flakeRoot}/generated/.config/hypr";
|
||||
basePath = "${repoPath}/generated/.config";
|
||||
assetPath = "${repoPath}/generated/.config/hypr";
|
||||
in
|
||||
{
|
||||
#################################
|
||||
@@ -1724,12 +1724,12 @@ in
|
||||
** =generated/modules/traveldroid/system/hyprlock.nix=
|
||||
This installs hyprlock
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/hyprlock.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
basePath = "${flakeRoot}/generated/.config";
|
||||
assetPath = "${flakeRoot}/generated/.config/hypr";
|
||||
basePath = "${repoPath}/generated/.config";
|
||||
assetPath = "${repoPath}/generated/.config/hypr";
|
||||
in
|
||||
{
|
||||
#################################
|
||||
@@ -1950,15 +1950,15 @@ This sets the dbus implementation
|
||||
** =generated/modules/traveldroid/system/quickshell.nix=
|
||||
This sets the dbus implementation
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/quickshell.nix :noweb yes :mkdirp yes :eval never
|
||||
{ pkgs, lib, config, flakeRoot, ... }:
|
||||
{ pkgs, lib, config, repoPath, ... }:
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
quickshellPath = flakeRoot + "/generated/.config/quickshell";
|
||||
quickshellPath = repoPath + "/generated/.config/quickshell";
|
||||
allFiles = lib.filesystem.listFilesRecursive quickshellPath;
|
||||
|
||||
toRelative = file:
|
||||
let
|
||||
base = toString flakeRoot + "/generated/";
|
||||
base = toString repoPath + "/generated/";
|
||||
relative = lib.removePrefix base (toString file);
|
||||
in
|
||||
builtins.unsafeDiscardStringContext relative;
|
||||
@@ -1998,10 +1998,10 @@ in
|
||||
** =generated/modules/traveldroid/system/swaync.nix=
|
||||
This sets the dbus implementation
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/system/swaync.nix :noweb yes :mkdirp yes :eval never
|
||||
{ lib, config, pkgs, flakeRoot, ... }:
|
||||
{ lib, config, pkgs, repoPath, ... }:
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
assetPath = "${flakeRoot}/generated/.config/swaync";
|
||||
assetPath = "${repoPath}/generated/.config/swaync";
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [ pkgs.swaynotificationcenter pkgs.libnotify ];
|
||||
|
||||
Reference in New Issue
Block a user