[NixOS] Various tweaks
This commit is contained in:
parent
c59da6de03
commit
f2887c9a28
@ -30,15 +30,16 @@ let
|
|||||||
sha256 = "057kqbivf4xbhakz1j1b19sxd5c6p6rqhg6pwnq2zfvvmp8nmylm";
|
sha256 = "057kqbivf4xbhakz1j1b19sxd5c6p6rqhg6pwnq2zfvvmp8nmylm";
|
||||||
};
|
};
|
||||||
lorriBinSource = pkgs.fetchFromGitHub {
|
lorriBinSource = pkgs.fetchFromGitHub {
|
||||||
owner = "target";
|
owner = "IvanMalison";
|
||||||
repo = "lorri";
|
repo = "lorri";
|
||||||
rev = "80ca3e7c12f74af035cdeff289ba2aa3c8950cb2";
|
rev = "d3e452ebc2b24ab86aec18af44c8217b2e469b2a";
|
||||||
sha256 = "05a0nrg9hp4li5nmyf4a5975p4amq19f17rqxncf7pcagyw0sax2";
|
sha256 = "07yf3gl9sixh7acxayq4q8h7z4q8a66412z0r49sr69yxb7b4q89";
|
||||||
};
|
};
|
||||||
lorri = (import (lorriBinSource.outPath + "/default.nix")) { inherit pkgs; };
|
lorri = (import (lorriBinSource.outPath + "/default.nix")) { inherit pkgs; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ lorriSource.outPath ];
|
imports = [ lorriSource.outPath ];
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(import ./overlays.nix)
|
(import ./overlays.nix)
|
||||||
(import ../dotfiles/config/xmonad/overlay.nix)
|
(import ../dotfiles/config/xmonad/overlay.nix)
|
||||||
@ -118,6 +119,7 @@ in
|
|||||||
kodi
|
kodi
|
||||||
libreoffice
|
libreoffice
|
||||||
lxappearance
|
lxappearance
|
||||||
|
okular
|
||||||
pulseeffects
|
pulseeffects
|
||||||
quassel
|
quassel
|
||||||
rxvt_unicode
|
rxvt_unicode
|
||||||
@ -136,6 +138,7 @@ in
|
|||||||
hicolor-icon-theme
|
hicolor-icon-theme
|
||||||
materia-theme
|
materia-theme
|
||||||
numix-icon-theme-circle
|
numix-icon-theme-circle
|
||||||
|
papirus-icon-theme
|
||||||
plasma5.breeze-gtk
|
plasma5.breeze-gtk
|
||||||
plasma5.breeze-qt5
|
plasma5.breeze-qt5
|
||||||
|
|
||||||
@ -266,6 +269,7 @@ in
|
|||||||
scrot
|
scrot
|
||||||
silver-searcher
|
silver-searcher
|
||||||
stow
|
stow
|
||||||
|
subversion
|
||||||
tmux
|
tmux
|
||||||
unzip
|
unzip
|
||||||
usbutils
|
usbutils
|
||||||
@ -288,7 +292,6 @@ in
|
|||||||
# GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
|
# GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
|
||||||
# };
|
# };
|
||||||
|
|
||||||
# Enabling zsh will clobber path because of the way it sets up /etc/zshenv
|
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
|
programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
|
||||||
@ -325,13 +328,22 @@ in
|
|||||||
};
|
};
|
||||||
windowManager = {
|
windowManager = {
|
||||||
default = "xmonad";
|
default = "xmonad";
|
||||||
session = [{
|
session = [
|
||||||
|
{
|
||||||
name = "xmonad";
|
name = "xmonad";
|
||||||
start = ''
|
start = ''
|
||||||
/usr/bin/env imalison-xmonad &
|
/usr/bin/env imalison-xmonad &
|
||||||
waitPID=$!
|
waitPID=$!
|
||||||
'';
|
'';
|
||||||
}];
|
}
|
||||||
|
{
|
||||||
|
name = "waymonad";
|
||||||
|
start = ''
|
||||||
|
/usr/bin/env waymonad
|
||||||
|
waitPID=$!
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
displayManager = {
|
displayManager = {
|
||||||
sddm = {
|
sddm = {
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
# (import ../../Projects/waymonad/default.nix)
|
||||||
gimp
|
gimp
|
||||||
android-studio
|
android-studio
|
||||||
texlive.combined.scheme-full
|
texlive.combined.scheme-full
|
||||||
|
@ -53,9 +53,6 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader.grub.device = "/dev/sda";
|
|
||||||
boot.loader.grub.useOSProber = true;
|
|
||||||
|
|
||||||
networking.hostName = "imalison-home";
|
networking.hostName = "imalison-home";
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
@ -17,6 +17,13 @@
|
|||||||
pmMethod = "bbswitch";
|
pmMethod = "bbswitch";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# disable card with bbswitch by default since we turn it on only on demand!
|
||||||
|
hardware.nvidiaOptimus.disable = true;
|
||||||
|
|
||||||
|
# install nvidia drivers in addition to intel one
|
||||||
|
hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
|
||||||
|
hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
Loading…
Reference in New Issue
Block a user