rrvsh/pantheon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(home): import desktop module using import-tree and move misc config to desktop module

Browse source
This commit is contained in:
Mohammad Rafiq 2025-06-14 18:22:53 +08:00
parent 2387ad9099
commit f5a046cd58
No known key found for this signature in database
10 changed files with 97 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -307,6 +307,21 @@
"type": "github"
}
},
"import-tree": {
"locked": {
"lastModified": 1745565707,
"narHash": "sha256-ccFeWWQ9RLgCd1k+xwV/ASUkJ7AGTTaGDhlRWZgytxY=",
"owner": "vic",
"repo": "import-tree",
"rev": "ed504db425c363b13f13d5ca52f1a2600c4a7703",
"type": "github"
},
"original": {
"owner": "vic",
"repo": "import-tree",
"type": "github"
}
},
"mnw": {
"locked": {
"lastModified": 1748710831,
@ -511,6 +526,7 @@
"flake-utils-plus": "flake-utils-plus",
"home-manager": "home-manager",
"impermanence": "impermanence",
"import-tree": "import-tree",
"mnw": "mnw",
"nil": "nil",
"nix-index-database": "nix-index-database",

1
flake.nix
View file

@ -1,6 +1,7 @@
{
inputs = {
import-tree.url = "github:vic/import-tree";
rrvsh-nixpkgs.url = "github:rrvsh/nixpkgs/librechat-module";
crane.url = "github:ipetkov/crane";
disko.inputs.nixpkgs.follows = "nixpkgs";

148
homes/x86_64-linux/rafiq/default.nix
View file

@ -3,11 +3,11 @@
inputs,
osConfig,
lib,
system,
...
}:
let
inherit (lib) mkMerge mkIf;
inherit (lib) optional;
inherit (inputs) import-tree;
mkEmailAccount = address: {
inherit address;
maildir.path = address;
@ -22,99 +22,65 @@ let
host = "smtp.forwardemail.net";
port = 465;
};
thunderbird.enable = true;
thunderbird.enable = osConfig.desktop.enable;
};
in
{
config = mkMerge [
(mkIf osConfig.desktop.enable (
import ./desktop {
inherit
lib
inputs
system
pkgs
osConfig
;
}
))
(mkIf osConfig.desktop.enable {
home.persistence."/persist/home/rafiq".directories = [
"docs"
"repos"
"vids"
"tmp"
".tor project"
".local/share/PrismLauncher"
];
programs = {
obs-studio.enable = true;
thunderbird.enable = true;
thunderbird.profiles.rafiq.isDefault = true;
};
home.packages = with pkgs; [
stremio
tor-browser
prismlauncher
];
})
{
accounts = {
email = {
maildirBasePath = "mail";
accounts = {
"rafiq@rrv.sh" = {
primary = true;
} // mkEmailAccount "rafiq@rrv.sh";
"mohammadrafiq@rrv.sh" = mkEmailAccount "mohammadrafiq@rrv.sh";
};
};
};
cli = {
shell = "zsh";
finder = "fzf";
screensaver.enable = true;
screensaver.timeout = "100";
screensaver.command = "cbonsai -S -w 0.1 -L 40 -M 2 -b 2";
editor = "nvf";
file-browser = "yazi";
multiplexer = "zellij";
fetch = "hyfetch";
git.name = "Mohammad Rafiq";
git.email = "rafiq@rrv.sh";
git.defaultBranch = "prime";
};
home = {
shellAliases = {
v = "nvim";
e = "edit";
};
imports = optional osConfig.desktop.enable (import-tree ./desktop);
packages = with pkgs; [
cbonsai
ripgrep
devenv
pantheon.rebuild
pantheon.deploy
pantheon.edit
pantheon.commit
pantheon.check
inputs.nixspect.packages."x86_64-linux".nixspect
];
persistence."/persist/home/rafiq".directories = [
];
};
programs = {
nh.enable = true;
tealdeer.enable = true;
tealdeer.settings.updates.auto_update = true;
pay-respects.enable = true;
direnv = {
enable = true;
nix-direnv.enable = true;
config = {
accounts = {
email = {
maildirBasePath = "mail";
accounts = {
"rafiq@rrv.sh" = {
primary = true;
} // mkEmailAccount "rafiq@rrv.sh";
"mohammadrafiq@rrv.sh" = mkEmailAccount "mohammadrafiq@rrv.sh";
};
};
}
];
};
cli = {
shell = "zsh";
finder = "fzf";
screensaver.enable = true;
screensaver.timeout = "100";
screensaver.command = "cbonsai -S -w 0.1 -L 40 -M 2 -b 2";
editor = "nvf";
file-browser = "yazi";
multiplexer = "zellij";
fetch = "hyfetch";
git.name = "Mohammad Rafiq";
git.email = "rafiq@rrv.sh";
git.defaultBranch = "prime";
};
home = {
shellAliases = {
v = "nvim";
e = "edit";
};
packages = with pkgs; [
cbonsai
ripgrep
devenv
pantheon.rebuild
pantheon.deploy
pantheon.edit
pantheon.commit
pantheon.check
inputs.nixspect.packages."x86_64-linux".nixspect
];
};
programs = {
nh.enable = true;
tealdeer.enable = true;
tealdeer.settings.updates.auto_update = true;
pay-respects.enable = true;
direnv = {
enable = true;
nix-direnv.enable = true;
};
};
};
}

1
homes/x86_64-linux/rafiq/desktop/browser.nix
View file

@ -2,6 +2,7 @@
lib,
inputs,
system,
...
}:
let
inherit (builtins) map listToAttrs;

20
homes/x86_64-linux/rafiq/desktop/default.nix
View file

@ -1,20 +0,0 @@
{
pkgs,
lib,
inputs,
system,
osConfig,
...
}:
let
inherit (lib) mkMerge;
in
mkMerge [
(import ./browser.nix { inherit lib inputs system; })
(import ./lockscreen.nix)
(import ./launcher.nix)
(import ./media-player.nix)
(import ./status-bar.nix { inherit pkgs; })
(import ./terminal.nix)
(import ./window-manager { inherit pkgs osConfig lib; })
]

21
homes/x86_64-linux/rafiq/desktop/misc.nix Normal file
View file

@ -0,0 +1,21 @@
{ pkgs, ... }:
{
persistDirs = [
"docs"
"repos"
"vids"
"tmp"
".tor project"
".local/share/PrismLauncher"
];
programs = {
obs-studio.enable = true;
thunderbird.enable = true;
thunderbird.profiles.rafiq.isDefault = true;
};
home.packages = with pkgs; [
stremio
tor-browser
prismlauncher
];
}

0
homes/x86_64-linux/rafiq/desktop/window-manager/hyprland/decoration.nix → homes/x86_64-linux/rafiq/desktop/window-manager/_hyprland/decoration.nix
View file

0
homes/x86_64-linux/rafiq/desktop/window-manager/hyprland/keybinds.nix → homes/x86_64-linux/rafiq/desktop/window-manager/_hyprland/keybinds.nix
View file

0
homes/x86_64-linux/rafiq/desktop/window-manager/hyprland/settings.nix → homes/x86_64-linux/rafiq/desktop/window-manager/_hyprland/settings.nix
View file

2
homes/x86_64-linux/rafiq/desktop/window-manager/default.nix
View file

@ -5,7 +5,7 @@
...
}:
{
wayland.windowManager.hyprland.settings = import ./hyprland/settings.nix {
wayland.windowManager.hyprland.settings = import ./_hyprland/settings.nix {
inherit pkgs osConfig lib;
};
}