Compare commits

..

No commits in common. "2b77681552f07ce405c5845001198e7801158c09" and "fad2af4451d3f80eb8d4cdc93397adbbe865ab30" have entirely different histories.

2 changed files with 9 additions and 7 deletions

View file

@ -34,6 +34,7 @@ in {
if config.my.gui.isNvidia if config.my.gui.isNvidia
then ["nvidia"] then ["nvidia"]
else options.services.xserver.videoDrivers.default; else options.services.xserver.videoDrivers.default;
windowManager.i3.enable = true;
layout = "fr"; layout = "fr";
xkbVariant = "us"; xkbVariant = "us";
libinput = { libinput = {
@ -50,8 +51,10 @@ in {
environment.systemPackages = builtins.attrValues { environment.systemPackages = builtins.attrValues {
inherit inherit
(pkgs) (pkgs)
discord chrysalis
evince
feh feh
firefox
ffmpeg ffmpeg
gimp-with-plugins gimp-with-plugins
imagemagick imagemagick
@ -66,7 +69,11 @@ in {
zathura zathura
; ;
inherit (pkgs.gnome) nautilus;
inherit (pkgs.libsForQt5) okular; inherit (pkgs.libsForQt5) okular;
discord = pkgs.discord.override {nss = pkgs.nss_latest;};
}; };
networking.networkmanager = { networking.networkmanager = {

View file

@ -6,12 +6,11 @@
}: let }: let
inherit inherit
(lib) (lib)
mkEnableOption
mkIf mkIf
mkOptionDefault mkOptionDefault
; ;
isEnabled = config.my.home.x.i3.enable; isEnabled = config.my.home.x.enable;
myTerminal = myTerminal =
# FIXME: fix when terminal is setup in home # FIXME: fix when terminal is setup in home
@ -27,10 +26,6 @@
i3Theme = config.my.theme.i3Theme; i3Theme = config.my.theme.i3Theme;
in { in {
options.my.home.x.i3 = {
enable = mkEnableOption "i3wm configuration";
};
config = mkIf isEnabled { config = mkIf isEnabled {
my.home = { my.home = {
flameshot.enable = true; flameshot.enable = true;