Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restructure

Browse Source
This commit is contained in:
Nathan
2026-04-22 13:53:13 -05:00
parent e950b4c162
commit 2fd2e5f2aa
16 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/users/nathan/home-manager/default.nix
View File

@@ -1,9 +1,15 @@
{ inputs, ... }: {
{ self, inputs, ... }: {
flake.homeModules.nathan = { config, lib, pkgs, ... }: {
imports = [
imports = with self.homeModules; [
inputs.sops-nix.homeManagerModules.sops
nathan-terminal
nathan-mpd
nathan-nh
nathan-pywal
];
config = {

2
modules/users/nathan/home-manager/features/bash.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-bash = { config, lib, pkgs, ... }: {
flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
home.packages = with pkgs; [ oh-my-posh ];

2
modules/users/nathan/home-manager/features/bat.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-bat = { config, lib, pkgs, ... }: {
flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
programs.bat = {

2
modules/users/nathan/home-manager/features/calcurse.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-calcurse = { config, lib, pkgs, ... }: {
flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
config = {
home.packages = with pkgs; [

2
modules/users/nathan/home-manager/features/eza.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-eza = { config, lib, pkgs, ... }: {
flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
programs.eza = {

2
modules/users/nathan/home-manager/features/fzf.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-fzf = { config, lib, pkgs, ... }: {
flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
programs.fzf = {

2
modules/users/nathan/home-manager/features/git.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-git = { config, lib, ... }: {
flake.homeModules.nathan-terminal = { config, lib, ... }: {
config = {

2
modules/users/nathan/home-manager/features/ohmyposh.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-ohmyposh = { config, lib, pkgs, ... }: {
flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
home.packages = with pkgs; [
oh-my-posh

2
modules/users/nathan/home-manager/features/opencode.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-opencode = { config, lib, ... }: {
flake.homeModules.nathan-terminal = { config, lib, ... }: {
config = {

2
modules/users/nathan/home-manager/features/ripgrep.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-ripgrep = { ... }: {
flake.homeModules.nathan-terminal = { ... }: {
programs.ripgrep = {
enable = true;

2
modules/users/nathan/home-manager/features/ssh.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-ssh = { ... }: {
flake.homeModules.nathan-terminal = { ... }: {
programs.ssh = {

2
modules/users/nathan/home-manager/features/tmux.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-tmux = { config, lib, pkgs, ... }: {
flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
programs.tmux = {

2
modules/users/nathan/home-manager/features/yazi.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-yazi = { ... }: {
flake.homeModules.nathan-terminal = { ... }: {
config = {
programs.yazi = {
enable = true;

2
modules/users/nathan/home-manager/features/zoxide.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-zoxide = { ... }: {
flake.homeModules.nathan-terminal = { ... }: {
programs.zoxide = {

2
modules/users/nathan/home-manager/features/zsh.nix
View File

@@ -1,6 +1,6 @@
{ ... }: {
flake.homeModules.nathan-zsh = { lib, ... }: {
flake.homeModules.nathan-terminal = { lib, ... }: {
programs.zsh = {

17
modules/users/nathan/nathan.nix
View File

@@ -21,10 +21,21 @@
};
home-manager.users.nathan = lib.mkMerge [
home-manager.users.nathan = with self.homeModules; let
laptop = [ "laptop" ];
#homebox = [ "homebox" ];
#both = laptop ++ homebox;
useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y);
in lib.mkMerge [
self.homeModules.nathan
(useWith laptop nathan-aurora)
(useWith laptop nathan-firefox)
(useWith laptop nathan-rofi)
(useWith laptop nathan-hypridle)
(useWith laptop nathan-hyprland)
(useWith laptop nathan-kitty)
(lib.mkIf (config.networking.hostName == "laptop") {
(useWith laptop {
wayland.windowManager.hyprland.extraConfig = ''
monitor=eDP-1,1920x1080@60,0x0,1
bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
@@ -35,7 +46,7 @@
};
};
flake.homeModules.nathan = { lib, ... }:
flake.homeModules.nathan-standalone = { lib, ... }:
{