This commit is contained in:
joy 2024-11-09 16:24:20 +01:00
parent 5bae1ba8c3
commit f7d11a4919
6 changed files with 13 additions and 7 deletions

View file

@ -12,6 +12,7 @@
username = "joy"; username = "joy";
domain = "joygnu.org"; domain = "joygnu.org";
mail = "contact@joygnu.org"; mail = "contact@joygnu.org";
nixpath = "nix/";
systemConfig = {modules}: systemConfig = {modules}:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
@ -19,6 +20,7 @@
inherit username; inherit username;
inherit domain; inherit domain;
inherit mail; inherit mail;
inherit nixpath;
}; };
modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops]; modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops];
}; };

View file

@ -2,6 +2,7 @@
inputs, inputs,
username, username,
domain, domain,
nixpath,
... ...
}: let }: let
mail = { mail = {
@ -16,6 +17,7 @@ in {
inherit username; inherit username;
inherit mail; inherit mail;
inherit domain; inherit domain;
inherit nixpath;
}; };
users = { users = {
"${username}" = import ./home.nix; "${username}" = import ./home.nix;

View file

@ -2,6 +2,7 @@
pkgs, pkgs,
domain, domain,
username, username,
nixpath,
... ...
}: { }: {
programs.zsh = { programs.zsh = {
@ -22,10 +23,10 @@
rs = "z ~ && ssh root@45.145.42.193"; rs = "z ~ && ssh root@45.145.42.193";
hs = "z ~ && ssh ${username}@${domain}"; hs = "z ~ && ssh ${username}@${domain}";
su = "z ~ && su"; su = "z ~ && su";
ip = "sh ~/nix/modules/programs/zsh/scripts/ip.sh"; ip = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh";
rb = "sh ~/nix/modules/programs/zsh/scripts/rebuild.sh"; rb = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh";
fr = "doas systemctl reboot --firmware"; fr = "doas systemctl reboot --firmware";
up = "nix flake update --flake ~/nix/"; up = "nix flake update --flake ~/${nixpath}";
del = "doas nix-collect-garbage -d"; del = "doas nix-collect-garbage -d";
dn = "dotnet new console"; dn = "dotnet new console";
dr = "dotnet run"; dr = "dotnet run";

View file

@ -1,12 +1,12 @@
{ {
pkgs, pkgs,
lib, nixpath,
... ...
}: { }: {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
theme = lib.mkForce "~/nix/modules/wm/home/rofi/gruvbox-material.rasi"; theme = "~/${nixpath}modules/wm/home/rofi/gruvbox-material.rasi";
extraConfig = { extraConfig = {
display-drun = ""; display-drun = "";
show-icons = true; show-icons = true;

View file

@ -1,6 +1,7 @@
{ {
pkgs, pkgs,
username, username,
nixpath,
... ...
}: { }: {
programs.hyprland = { programs.hyprland = {
@ -12,7 +13,7 @@
enable = true; enable = true;
settings = { settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
"$sciPath" = "~/nix/modules/wm/hyprland/scripts"; "$sciPath" = "~/${nixpath}modules/wm/hyprland/scripts";
cursor = { cursor = {
inactive_timeout = "3"; inactive_timeout = "3";
}; };

View file

@ -58,6 +58,6 @@ in {
}; };
home-manager.users.${username}.stylix.targets = { home-manager.users.${username}.stylix.targets = {
foot.enable = false; foot.enable = false;
# hyprland.enable = false; rofi.enable = false;
}; };
} }