jopejoe1/nix-conf
1
0
Fork 0
mirror of https://codeberg.org/jopejoe1/nix-conf.git synced 2025-06-07 21:39:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up

Browse source
This commit is contained in:
jopejoe1 2023-12-30 23:39:33 +01:00
parent 673524b947
commit 9ad1975f72
33 changed files with 358 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/users/default.nix
View file

@ -1,8 +1,5 @@
{ ... }:
{
imports = [
./root
./jopejoe1
];
imports = [ ./root ./jopejoe1 ];
}

22
modules/users/jopejoe1/default.nix
View file

@ -1,9 +1,7 @@
{ config, lib, pkgs, ... }:
let
cfg = config.jopejoe1.jopejoe1;
in
{
let cfg = config.jopejoe1.jopejoe1;
in {
options.jopejoe1.jopejoe1 = {
enable = lib.mkEnableOption "Enable jopejoe1 user";
};
@ -15,15 +13,13 @@ in
initialPassword = "passwor";
extraGroups = [ "wheel" "networkmanager" "pipewire" "audio" ];
uid = 1000;
packages = with pkgs; [
libsForQt5.kate
libsForQt5.ark
texlive.combined.scheme-full
] ++ lib.optionals (config.system == "x86_64-linux") [
discord
lutris
bottles
];
packages = with pkgs;
[ libsForQt5.kate libsForQt5.ark texlive.combined.scheme-full ]
++ lib.optionals (config.system == "x86_64-linux") [
discord
lutris
bottles
];
};
};

21
modules/users/jopejoe1/home.nix
View file

@ -20,7 +20,8 @@ in
CUDA_CACHE_PATH = "${hcfg.xdg.cacheHome}/nv";
GRADLE_USER_HOME = "${hcfg.xdg.dataHome}/gradle";
KODI_DATA = "${hcfg.xdg.dataHome}/kodi";
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${hcfg.xdg.configHome}/java";
_JAVA_OPTIONS =
"-Djava.util.prefs.userRoot=${hcfg.xdg.configHome}/java";
WINEPREFIX = "${hcfg.xdg.dataHome}/wine";
};
@ -79,11 +80,7 @@ in
userName = "jopejoe1";
extraConfig = {
core = {
whitespace = [
"blank-at-eol"
"blank-at-eof"
"space-before-tab"
];
whitespace = [ "blank-at-eol" "blank-at-eof" "space-before-tab" ];
};
};
};
@ -332,13 +329,15 @@ in
};
"Warframe Wiki" = {
urls = [{
template = "https://warframe.fandom.com/wiki/Special:Search";
template =
"https://warframe.fandom.com/wiki/Special:Search";
params = [{
name = "query";
value = "{searchTerms}";
}];
}];
iconUpdateURL = "https://static.wikia.nocookie.net/warframe/images/e/e6/Site-logo.png";
iconUpdateURL =
"https://static.wikia.nocookie.net/warframe/images/e/e6/Site-logo.png";
updateInterval = 24 * 60 * 60 * 1000;
definedAliases = [ "@wf" ];
};
@ -363,12 +362,14 @@ in
"config.trim_on_minimize" = true;
"pdfjs.annotationEditorMode" = 0;
"pdfjs.annotationMode" = 2;
"font.name-list.emoji" = lib.strings.concatStringsSep ", " config.fonts.fontconfig.defaultFonts.emoji;
"font.name-list.emoji" = lib.strings.concatStringsSep ", "
config.fonts.fontconfig.defaultFonts.emoji;
## Arkenfox Stuff
"browser.aboutConfig.showWarning" = false;
"browser.newtabpage.activity-stream.showSponsored" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" =
false;
"extensions.getAddons.showPane" = false;
"extensions.htmlaboutaddons.recommendations.enabled" = false;
"browser.discovery.enabled" = false;

20
modules/users/root/default.nix
View file

@ -1,20 +1,12 @@
{ config, lib, pkgs, ... }:
{ config, lib, ... }:
let
cfg = config.jopejoe1.root;
in
{
options.jopejoe1.root = {
enable = lib.mkEnableOption "Enable root user";
};
let cfg = config.jopejoe1.root;
in {
options.jopejoe1.root = { enable = lib.mkEnableOption "Enable root user"; };
config = lib.mkIf cfg.enable {
users.users.root = {
initialPassword = "password";
};
users.users.root = { initialPassword = "password"; };
};
imports = [
./home.nix
];
imports = [ ./home.nix ];
}

6
modules/users/root/home.nix
View file

@ -20,7 +20,8 @@ in
CUDA_CACHE_PATH = "${hcfg.xdg.cacheHome}/nv";
GRADLE_USER_HOME = "${hcfg.xdg.dataHome}/gradle";
KODI_DATA = "${hcfg.xdg.dataHome}/kodi";
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${hcfg.xdg.configHome}/java";
_JAVA_OPTIONS =
"-Djava.util.prefs.userRoot=${hcfg.xdg.configHome}/java";
WINEPREFIX = "${hcfg.xdg.dataHome}/wine";
};
@ -76,7 +77,8 @@ in
historyFile = "${hcfg.xdg.stateHome}/bash/history";
shellAliases = {
gc = "nix store gc";
rb = "git -C /etc/nixos pull && nix flake update /etc/nixos/ && sudo nixos-rebuild switch --impure && git -C /etc/nixos add . && git -C /etc/nixos commit -m 'Updated flake.lock' && git -C /etc/nixos push";
rb =
"git -C /etc/nixos pull && nix flake update /etc/nixos/ && sudo nixos-rebuild switch --impure && git -C /etc/nixos add . && git -C /etc/nixos commit -m 'Updated flake.lock' && git -C /etc/nixos push";
};
};
zsh.shellAliases = hcfg.programs.bash.shellAliases;