formatted everything, things are looking nice now.
This commit is contained in:
parent
5dbe5ff071
commit
d2d4054aa5
57 changed files with 2269 additions and 2311 deletions
|
@ -1,8 +1,2 @@
|
|||
_: {
|
||||
imports = [
|
||||
./home-manager.nix
|
||||
./system.nix
|
||||
./xdg.nix
|
||||
];
|
||||
}
|
||||
_: { imports = [ ./home-manager.nix ./system.nix ./xdg.nix ]; }
|
||||
|
||||
|
|
|
@ -1,38 +1,34 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
self,
|
||||
...
|
||||
}: with lib; let
|
||||
cfg = config.modules.other.home-manager;
|
||||
username = config.modules.other.system.username;
|
||||
{ config, inputs, lib, self, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.other.home-manager;
|
||||
username = config.modules.other.system.username;
|
||||
in {
|
||||
options.modules.other.home-manager = {
|
||||
enable = mkEnableOption "home-manager";
|
||||
enableDirenv = mkEnableOption "direnv";
|
||||
};
|
||||
options.modules.other.home-manager = {
|
||||
enable = mkEnableOption "home-manager";
|
||||
enableDirenv = mkEnableOption "direnv";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
extraSpecialArgs = {inherit inputs self;};
|
||||
users.${username} = {
|
||||
programs = {
|
||||
home-manager.enable = true;
|
||||
direnv = mkIf cfg.enableDirenv {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
home = {
|
||||
inherit username;
|
||||
homeDirectory = "/home/${username}";
|
||||
stateVersion = lib.mkDefault "23.11";
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
extraSpecialArgs = { inherit inputs self; };
|
||||
users.${username} = {
|
||||
programs = {
|
||||
home-manager.enable = true;
|
||||
direnv = mkIf cfg.enableDirenv {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
home = {
|
||||
inherit username;
|
||||
homeDirectory = "/home/${username}";
|
||||
stateVersion = lib.mkDefault "23.11";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,33 +1,30 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: with lib; let
|
||||
cfg = config.modules.other.system;
|
||||
{ config, lib, ... }:
|
||||
with lib;
|
||||
let cfg = config.modules.other.system;
|
||||
in {
|
||||
options.modules.other.system = {
|
||||
hostname = mkOption {
|
||||
description = "hostname for this system";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
username = mkOption {
|
||||
description = "username for this system";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
gitPath = mkOption {
|
||||
description = "path to the flake directory";
|
||||
type = types.str;
|
||||
};
|
||||
options.modules.other.system = {
|
||||
hostname = mkOption {
|
||||
description = "hostname for this system";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
config = {
|
||||
networking.hostName = cfg.hostname;
|
||||
|
||||
users.users.${cfg.username} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
};
|
||||
username = mkOption {
|
||||
description = "username for this system";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
gitPath = mkOption {
|
||||
description = "path to the flake directory";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
networking.hostName = cfg.hostname;
|
||||
|
||||
users.users.${cfg.username} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,68 +1,66 @@
|
|||
{ pkgs, config, ... }:
|
||||
let
|
||||
username = config.modules.other.system.username;
|
||||
hmCfg = config.home-manager.users.${username};
|
||||
username = config.modules.other.system.username;
|
||||
hmCfg = config.home-manager.users.${username};
|
||||
|
||||
primary_browser = "librewolf.desktop";
|
||||
mail_client = "thunderbird.desktop";
|
||||
file_manager = "pcmanfm.desktop";
|
||||
media_player = "mpv.desktop";
|
||||
image_viewer = "imv.desktop";
|
||||
text_editor = "helix.desktop";
|
||||
terminal = "kitty.desktop";
|
||||
primary_browser = "librewolf.desktop";
|
||||
mail_client = "thunderbird.desktop";
|
||||
file_manager = "pcmanfm.desktop";
|
||||
media_player = "mpv.desktop";
|
||||
image_viewer = "imv.desktop";
|
||||
text_editor = "helix.desktop";
|
||||
terminal = "kitty.desktop";
|
||||
in {
|
||||
|
||||
environment.sessionVariables = {
|
||||
TERMINAL = "${terminal}";
|
||||
};
|
||||
|
||||
home-manager.users.${username} = {
|
||||
xdg = {
|
||||
cacheHome = "${hmCfg.home.homeDirectory}/.cache";
|
||||
configHome = "${hmCfg.home.homeDirectory}/.config";
|
||||
dataHome = "${hmCfg.home.homeDirectory}/.local/share";
|
||||
stateHome = "${hmCfg.home.homeDirectory}/.local/state";
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"text/html" = [ primary_browser ];
|
||||
"x-scheme-handler/http" = [ primary_browser ];
|
||||
"x-scheme-handler/https" = [ primary_browser ];
|
||||
"x-scheme-handler/about" = [ primary_browser ];
|
||||
"x-scheme-handler/unknown" = [ primary_browser ];
|
||||
"x-scheme-handler/mailto" = [ mail_client ];
|
||||
"message/rfc822" = [ mail_client ];
|
||||
"x-scheme-handler/mid" = [ mail_client ];
|
||||
"inode/directory" = [ file_manager ];
|
||||
"audio/mp3" = [ media_player ];
|
||||
"audio/ogg" = [ media_player ];
|
||||
"audio/mpeg" = [ media_player ];
|
||||
"audio/aac" = [ media_player ];
|
||||
"audio/opus" = [ media_player ];
|
||||
"audio/wav" = [ media_player ];
|
||||
"audio/webm" = [ media_player ];
|
||||
"audio/3gpp" = [ media_player ];
|
||||
"audio/3gpp2" = [ media_player ];
|
||||
"video/mp4" = [ media_player ];
|
||||
"video/x-msvideo" = [ media_player ];
|
||||
"video/mpeg" = [ media_player ];
|
||||
"video/ogg" = [ media_player ];
|
||||
"video/mp2t" = [ media_player ];
|
||||
"video/webm" = [ media_player ];
|
||||
"video/3gpp" = [ media_player ];
|
||||
"video/3gpp2" = [ media_player ];
|
||||
"image/png" = [ image_viewer ];
|
||||
"image/jpeg" = [ image_viewer ];
|
||||
"image/gif" = [ image_viewer ];
|
||||
"image/avif" = [ image_viewer ];
|
||||
"image/bmp" = [ image_viewer ];
|
||||
"image/vnd.microsoft.icon" = [ image_viewer ];
|
||||
"image/svg+xml" = [ image_viewer ];
|
||||
"image/tiff" = [ image_viewer ];
|
||||
"image/webp" = [ image_viewer ];
|
||||
"text/plain" = [ text_editor ];
|
||||
};
|
||||
};
|
||||
environment.sessionVariables = { TERMINAL = "${terminal}"; };
|
||||
|
||||
home-manager.users.${username} = {
|
||||
xdg = {
|
||||
cacheHome = "${hmCfg.home.homeDirectory}/.cache";
|
||||
configHome = "${hmCfg.home.homeDirectory}/.config";
|
||||
dataHome = "${hmCfg.home.homeDirectory}/.local/share";
|
||||
stateHome = "${hmCfg.home.homeDirectory}/.local/state";
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"text/html" = [ primary_browser ];
|
||||
"x-scheme-handler/http" = [ primary_browser ];
|
||||
"x-scheme-handler/https" = [ primary_browser ];
|
||||
"x-scheme-handler/about" = [ primary_browser ];
|
||||
"x-scheme-handler/unknown" = [ primary_browser ];
|
||||
"x-scheme-handler/mailto" = [ mail_client ];
|
||||
"message/rfc822" = [ mail_client ];
|
||||
"x-scheme-handler/mid" = [ mail_client ];
|
||||
"inode/directory" = [ file_manager ];
|
||||
"audio/mp3" = [ media_player ];
|
||||
"audio/ogg" = [ media_player ];
|
||||
"audio/mpeg" = [ media_player ];
|
||||
"audio/aac" = [ media_player ];
|
||||
"audio/opus" = [ media_player ];
|
||||
"audio/wav" = [ media_player ];
|
||||
"audio/webm" = [ media_player ];
|
||||
"audio/3gpp" = [ media_player ];
|
||||
"audio/3gpp2" = [ media_player ];
|
||||
"video/mp4" = [ media_player ];
|
||||
"video/x-msvideo" = [ media_player ];
|
||||
"video/mpeg" = [ media_player ];
|
||||
"video/ogg" = [ media_player ];
|
||||
"video/mp2t" = [ media_player ];
|
||||
"video/webm" = [ media_player ];
|
||||
"video/3gpp" = [ media_player ];
|
||||
"video/3gpp2" = [ media_player ];
|
||||
"image/png" = [ image_viewer ];
|
||||
"image/jpeg" = [ image_viewer ];
|
||||
"image/gif" = [ image_viewer ];
|
||||
"image/avif" = [ image_viewer ];
|
||||
"image/bmp" = [ image_viewer ];
|
||||
"image/vnd.microsoft.icon" = [ image_viewer ];
|
||||
"image/svg+xml" = [ image_viewer ];
|
||||
"image/tiff" = [ image_viewer ];
|
||||
"image/webp" = [ image_viewer ];
|
||||
"text/plain" = [ text_editor ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue