Jan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Jan:74ddbc24bb5f1d20c72461829976c6027ce5cba2
Branches Tags
Jan:main
..
compare: Jan:c832f5ff72e3de99573252982c11c38b4036179a
Branches Tags
Jan:main

No commits in common. "74ddbc24bb5f1d20c72461829976c6027ce5cba2" and "c832f5ff72e3de99573252982c11c38b4036179a" have entirely different histories.
74ddbc24bb ... c832f5ff72

10 changed files with 7 additions and 168 deletions
Show Stats Expand all files Collapse all files

1
flake.nix
View File

@ -67,6 +67,5 @@
};
};
};
devenv = ./shell-modules/default.nix;
};
}

36
modules/base/default.nix
View File

@ -60,7 +60,7 @@ in
fontconfig.enable = true;
neovim.enable = true;
systemd-boot.enable = true;
tuigreet.enable = true; # TODO: Re-enable
tuigreet.enable = true;
};
# TODO: Remove everything below, it is here out of convenience and should be elsewhere
@ -99,39 +99,5 @@ in
# TODO: Move to USB module
# services.gvfs.enable = true;
services.udisks2.enable = true;
# TODO: Remove?
# Temporarily disable nvidia dgpu
# boot.extraModprobeConfig = ''
# blacklist nouveau
# options nouveau modeset=0
# '';
# services.udev.extraRules = ''
# # Remove NVIDIA USB xHCI Host Controller devices, if present
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
# # Remove NVIDIA USB Type-C UCSI devices, if present
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
# # Remove NVIDIA Audio devices, if present
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
# # Remove NVIDIA VGA/3D controller devices
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
# '';
# boot.blacklistedKernelModules = [
# "nouveau"
# "nvidia"
# ];
# TODO: Move to module
# Adds gnome as DE
# modules.greetd.enable = lib.mkForce false;
# modules.tuigreet.enable = lib.mkForce false;
# services.xserver = {
# enable = true;
# displayManager.gdm.enable = true;
# desktopManager.gnome.enable = true;
# };
};
}

35
shell-modules/default.nix
View File

@ -1,35 +0,0 @@
{ pkgs, ... }:
pkgs.mkShell {
packages = with pkgs; [
(python312.withPackages (p: [
p.numpy
p.scikit-learn
p.scipy
p.pandas
p.matplotlib
p.torch-bin
# p.torchvision
]))
libffi
openssl
stdenv.cc.cc
linuxPackages.nvidia_x11
binutils
cudatoolkit
libGLU
libGL
];
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (
with pkgs;
[
stdenv.cc.cc
linuxPackages.nvidia_x11
binutils
cudatoolkit
libGLU
libGL
]
);
CUDA_PATH = pkgs.cudatoolkit;
}

1
user-modules/desktop/default.nix
View File

@ -15,7 +15,6 @@ in
./background/glpaper/default.nix
./bar/waybar.nix
./lock-screen/waylock.nix
./window-manager/i3.nix
./window-manager/river.nix
];

27
user-modules/desktop/window-manager/i3.nix
View File

@ -1,27 +0,0 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.modules.i3;
in
{
options.modules.i3.enable = lib.mkEnableOption "i3";
config = lib.mkIf cfg.enable {
# Set desktop type to x11
# modules.desktop.x11 = true;
modules.rofi.enable = true;
modules.desktop.initScript = ''
i3
'';
xsession.windowManager.i3 = {
enable = true;
};
};
}

9
user-modules/desktop/window-manager/river.nix
View File

@ -36,10 +36,9 @@ in
river
'';
# TODO: Fix this
# modules.desktop.reloadScript = ''
# ${pkgs.river}/bin/riverctl background-color 0x${config.theming.colors.bg}
# '';
modules.desktop.reloadScript = ''
${pkgs.river}/bin/riverctl background-color 0x${config.theming.colors.bg}
'';
# Update background after rebuild
# home.activation = {
@ -61,7 +60,7 @@ in
# River setup
wayland.windowManager.river = {
enable = true;
xwayland.enable = false;
xwayland.enable = true;
settings =
let
layout = "filtile";

21
user-modules/gaming/emulators/retroarch.nix
View File

@ -15,27 +15,8 @@ in
};
config = mkIf cfg.enable {
modules.unfree.allowedPackages = [
"libretro-fbalpha2012"
"libretro-fbneo"
"libretro-fmsx"
"libretro-genesis-plus-gx"
"libretro-mame2000"
"libretro-mame2003"
"libretro-mame2003-plus"
"libretro-mame2010"
"libretro-mame2015"
"libretro-opera"
"libretro-picodrive"
"libretro-snes9x"
"libretro-snes9x2002"
"libretro-snes9x2005"
"libretro-snes9x2005-plus"
"libretro-snes9x2010"
];
home.packages = with pkgs; [
retroarch-full
retroarch-free
];
};
}

1
user-modules/systemwide/default.nix
View File

@ -4,7 +4,6 @@
imports = [
# Import systemwide configuration files.
./docker.nix
./i3.nix
./keyring.nix
./river.nix
./steam.nix

30
user-modules/systemwide/i3.nix
View File

@ -1,30 +0,0 @@
{
lib,
config,
pkgs,
...
}:
with lib;
let
enabled = any (user: user.modules.i3.enable) (attrValues config.home-manager.users);
in
{
config = mkIf enabled {
modules.tuigreet.enable = mkForce false;
services.xserver = {
layout = "us";
xkbVariant = "";
enable = true;
windowManager.i3.enable = true;
desktopManager = {
xterm.enable = true;
xfce = {
enable = true;
# noDesktop = false;
# enableXfwm = false;
};
};
};
};
}

14
users/jan.nix
View File

@ -19,9 +19,7 @@
signal-desktop
prusa-slicer
freecad-wayland
inkscape
# appflowy
ente-auth
];
# TODO: Move to gpg module
@ -41,7 +39,6 @@
theming.enable = true;
# Window manager
i3.enable = true;
river.enable = true;
waylock.enable = true;
waybar.enable = true;
@ -69,6 +66,7 @@
steam.enable = true;
modrinth.enable = true;
es-de.enable = true;
pcsx2.enable = true;
retroarch.enable = true;
ryujinx.enable = true;
@ -109,16 +107,6 @@
tex.enable = true;
jupyter.enable = true;
# python.extraPythonPackages = p: [
# p.numpy
# p.scikit-learn
# p.scipy
# p.pandas
# p.matplotlib
# p.torch
# p.torchvision
# ];
# Enable unfree
unfree.enable = true;
};