punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: punkfairie:4dd208ca1bb8e4428fa60c0deb206fc208d0a9d4
Branches Tags
punkfairie:main
..
compare: punkfairie:adacfc47c4c7d2421add89877797eb97c6a69a6b
Branches Tags
punkfairie:main

No commits in common. "4dd208ca1bb8e4428fa60c0deb206fc208d0a9d4" and "adacfc47c4c7d2421add89877797eb97c6a69a6b" have entirely different histories.
4dd208ca1b ... adacfc47c4

9 changed files with 92 additions and 142 deletions
Show stats Expand all files Collapse all files

18
homes/x86_64-linux/marley@nyx/default.nix
View file

@ -1,20 +1,4 @@
{ lib, namespace, ... }:
let
inherit (lib.${namespace}) enabled;
in
{ _ }:
{
home.keyboard.options = [ "apple:alupckeys" ];
${namespace} = {
appearance = {
base = enabled;
gtk = enabled;
qt = enabled;
};
xorg = {
xsession = enabled;
};
};
home.stateVersion = "24.05";
}

4
modules/home/appearance/base/default.nix
View file

@ -9,11 +9,11 @@ let
inherit (lib) mkIf;
inherit (lib.${namespace}) mkEnableModule enabled;
cfg = config.${namespace}.appearance.base;
cfg = config.${namespace}.appearance;
inherit (config.${namespace}) theme;
in
{
options.appearance = mkEnableModule "base";
options = mkEnableModule "appearance";
config = mkIf cfg.enable {
home.packages = with pkgs; [

75
modules/home/base/xdg/default.nix
View file

@ -1,75 +0,0 @@
{
config,
namespace,
lib,
pkgs,
...
}:
let
inherit (lib) mkMerge mkIf;
inherit (config.${namespace}) isDesktop;
in
{
config = {
home.preferXdgDirectories = true;
xdg =
let
homeDir = config.home.homeDirectory;
in
mkMerge [
{
enable = true;
cacheHome = "${homeDir}/.cache";
configHome = "${homeDir}/.config";
dataHome = "${homeDir}/.local/share";
stateHome = "${homeDir}/.local/state";
}
(mkIf isDesktop {
userDirs = {
enable = true;
createDirectories = true;
desktop = "${homeDir}/desktop";
documents = null;
download = "${homeDir}/downloads";
music = null;
pictures = "${homeDir}/pictures";
templates = null;
videos = "${homeDir}/videos";
};
portal = {
enable = true;
xdgOpenUsePortal = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
config.common.default = [ "gtk" ];
};
mimeApps = rec {
enable = true;
associations.added = {
"application/json" = [ "nvim.desktop" ];
"application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
"application/xhtml+xml" = [ "zen-alpha.desktop" ];
"application/x-extension-htm" = [ "zen-alpha.desktop" ];
"application/x-extension-html" = [ "zen-alpha.desktop" ];
"application/x-extension-shtml" = [ "zen-alpha.desktop" ];
"application/x-extension-xhtml" = [ "zen-alpha.desktop" ];
"application/x-extension-xht" = [ "zen-alpha.desktop" ];
"image/png" = [ "feh.desktop" ];
"text/html" = [ "zen-alpha.desktop" ];
"text/plain" = [ "nvim.desktop" ];
"x-scheme-handler/chrome" = [ "zen-alpha.desktop" ];
"x-scheme-handler/http" = [ "zen-alpha.desktop" ];
"x-scheme-handler/https" = [ "zen-alpha.desktop" ];
};
defaultApplications = associations.added;
};
})
];
};
}

11
modules/home/options/isDesktop/default.nix
View file

@ -1,11 +0,0 @@
{ lib, namespace, ... }:
let
inherit (lib) mkOption types;
in
{
options.${namespace}.isDesktop = mkOption {
type = with types; bool;
default = false;
description = "Whether this machine is used as a graphical desktop.";
};
}

36
modules/home/xorg/xsession/default.nix
View file

@ -1,36 +0,0 @@
{
lib,
config,
namespace,
...
}:
let
inherit (lib) mkIf;
inherit (lib.${namespace}) mkEnableModule;
cfg = config.${namespace}.xorg.xsession;
in
{
options.xorg = mkEnableModule "xsession";
config = mkIf cfg.enable {
xsession = {
enable = true;
numlock.enable = true;
# TODO: Switch to autorandr.
profileEtra = # sh
''
sudo mount -a
"${config.home.homeDirectory}/.config/xrandr/desktop.sh"
'';
initExtra = # sh
''
mpd &
pidgin &
'';
};
};
}

6
modules/home/base/profile/default.nix → old/home/profile/default.nix
View file

@ -1,6 +1,6 @@
{ config, ... }:
{
config.home = {
home = {
sessionPath = [
"${config.home.homeDirectory}/.local/bin"
];
@ -20,4 +20,8 @@
v = "${config.home.sessionVariables.EDITOR}";
};
};
imports = [
./xdg.nix
];
}

60
old/home/profile/xdg.nix Normal file
View file

@ -0,0 +1,60 @@
{ config, pkgs, ... }:
{
home.preferXdgDirectories = true;
xdg =
let
homeDir = config.home.homeDirectory;
in
{
enable = true;
cacheHome = "${homeDir}/.cache";
configHome = "${homeDir}/.config";
dataHome = "${homeDir}/.local/share";
stateHome = "${homeDir}/.local/state";
userDirs = {
enable = true;
createDirectories = true;
desktop = "${homeDir}/desktop";
documents = null;
download = "${homeDir}/downloads";
music = null;
pictures = "${homeDir}/pictures";
templates = null;
videos = "${homeDir}/videos";
};
portal = {
enable = true;
xdgOpenUsePortal = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
config.common.default = [ "gtk" ];
};
mimeApps = rec {
enable = true;
associations.added = {
"application/json" = [ "nvim.desktop" ];
"application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
"application/xhtml+xml" = [ "zen-alpha.desktop" ];
"application/x-extension-htm" = [ "zen-alpha.desktop" ];
"application/x-extension-html" = [ "zen-alpha.desktop" ];
"application/x-extension-shtml" = [ "zen-alpha.desktop" ];
"application/x-extension-xhtml" = [ "zen-alpha.desktop" ];
"application/x-extension-xht" = [ "zen-alpha.desktop" ];
"image/png" = [ "feh.desktop" ];
"text/html" = [ "zen-alpha.desktop" ];
"text/plain" = [ "nvim.desktop" ];
"x-scheme-handler/chrome" = [ "zen-alpha.desktop" ];
"x-scheme-handler/http" = [ "zen-alpha.desktop" ];
"x-scheme-handler/https" = [ "zen-alpha.desktop" ];
};
defaultApplications = associations.added;
};
};
}

6
old/home/xorg/default.nix Normal file
View file

@ -0,0 +1,6 @@
{ ... }:
{
imports = [
./xsession.nix
];
}

18
old/home/xorg/xsession.nix Normal file
View file

@ -0,0 +1,18 @@
{ ... }:
{
home.keyboard.options = [ "apple:alupckeys" ];
xsession = {
enable = true;
numlock.enable = true;
# TODO: Switch to autorandr
profileExtra = # sh
''
sudo mount -a
"$HOME/.config/xrandr/desktop.sh"
mpd &
pidgin &
'';
};
}