chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updating a lot of config

Browse source
This commit is contained in:
Chris Cochrun 2022-05-16 06:11:47 -05:00
parent 1316e09686
commit 8bc16bd6f5
6 changed files with 307 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

53
system/kaladin/configuration.nix
View file

@ -2,10 +2,9 @@
{
imports =
[ # Include the results of the hardware scan.
[
./hardware-configuration.nix
];
nix = {
extraOptions = "experimental-features = nix-command flakes";
package = pkgs.nixFlakes;
@ -45,12 +44,15 @@
services.xserver.videoDrivers = [ "nvidia" ];
hardware.opengl.enable = true;
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the Plasma 5 Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
services.xserver = {
enable = true;
windowManager.awesome = {
enable = true;
package = pkgs.myAwesome;
};
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
};
# Configure keymap in X11
services.xserver.layout = "us";
@ -60,9 +62,6 @@
services.printing.enable = true;
services.printing.drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.hplipWithPlugin ];
# Enabel fingerprint
services.fprintd.enable = true;
# Enable sound.
security.rtkit.enable = true;
services.pipewire = {
@ -72,20 +71,17 @@
pulse.enable = true;
wireplumber.enable = true;
};
# Needed for some pipewire progs
programs.dconf.enable = true;
# Turn on flatpak
services.flatpak.enable = true;
services.usbmuxd.enable = true;
services.fstrim.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true;
#programs.fish.enable = true;
programs.fish.enable = true;
programs.zsh.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.chris = {
@ -143,6 +139,7 @@
nerdfonts
latte-dock
bat
alacritty
libsForQt5.bismuth
libnotify
rofi-wayland
@ -157,7 +154,6 @@
phinger-cursors
plasma-hud
kde-cli-tools
macchina
gzip
htop
btop
@ -172,12 +168,15 @@
pulsemixer
any-nix-shell
wtype
xdotool
qt5ct
lxappearance
spotdl
kdenlive
blender
ffmpeg
wlroots
blender
neofetch
xdotool
# Dev tools
nix-index
meson
@ -189,7 +188,7 @@
cmake
extra-cmake-modules
pkg-config
# Libraries
# LIBRARIES FOR DEV
qt5.qtbase
qt5.qtquickcontrols2
qt5.qtx11extras
@ -199,15 +198,13 @@
fennel
];
# EMACS
services.emacs.package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools ]));
nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "1pd14gigm5bznzd8k88dq9scicw1zqknm87bnqmd0z556g9ir60f";
}))
(self: super:
{
myAwesome = super.awesome.overrideAttrs (old: rec {
@ -223,7 +220,11 @@
}
)
];
services.emacs.enable = true;
services.emacs = {
enable = true;
package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools ]));
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.

47
system/syl/configuration.nix
View file

@ -2,10 +2,9 @@
{
imports =
[ # Include the results of the hardware scan.
[
./hardware-configuration.nix
];
nix = {
extraOptions = "experimental-features = nix-command flakes";
package = pkgs.nixFlakes;
@ -36,6 +35,7 @@
i18n.defaultLocale = "en_US.UTF-8";
# Set default shell to be dash for speed
# Apparently this is bad because a lot of nix relies on bash
# environment.binsh = "${pkgs.dash}/bin/dash";
environment.variables = {
EDITOR = "emacsclient -t";
@ -57,18 +57,16 @@
libvdpau-va-gl
];
};
# Enable the X11 windowing system.
services.xserver = {
enable = true;
windowManager.awesome = {
enable = true;
package = pkgs.myAwesome;
};
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
};
# Enable the Plasma 5 Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
# Configure keymap in X11
services.xserver.layout = "us";
@ -78,7 +76,7 @@
services.printing.enable = true;
services.printing.drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.hplipWithPlugin ];
# Enabel fingerprint
# Enable fingerprint
services.fprintd.enable = true;
# Enable sound.
@ -90,7 +88,7 @@
pulse.enable = true;
wireplumber.enable = true;
};
# Needed for some pipewire progs
programs.dconf.enable = true;
@ -178,6 +176,7 @@
nerdfonts
latte-dock
bat
alacritty
libsForQt5.bismuth
libnotify
rofi-wayland
@ -192,7 +191,6 @@
phinger-cursors
plasma-hud
kde-cli-tools
macchina
gzip
htop
btop
@ -207,11 +205,24 @@
pulsemixer
any-nix-shell
wtype
xdotool
qt5ct
lxappearance
spotdl
kdenlive
ffmpeg
wlroots
neofetch
xdotool
afetch
uwufetch
screenfetch
yafetch
freshfetch
disfetch
bunnyfetch
pfetch
fet-sh
macchina
# Dev tools
nix-index
meson
@ -223,7 +234,7 @@
cmake
extra-cmake-modules
pkg-config
# Libraries
# LIBRARIES FOR DEV
qt5.qtbase
qt5.qtquickcontrols2
qt5.qtx11extras
@ -233,15 +244,13 @@
fennel
];
# EMACS
services.emacs.package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools ]));
nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "1pd14gigm5bznzd8k88dq9scicw1zqknm87bnqmd0z556g9ir60f";
}))
(self: super:
{
myAwesome = super.awesome.overrideAttrs (old: rec {
@ -257,7 +266,11 @@
}
)
];
services.emacs.enable = true;
services.emacs = {
enable = true;
package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools ]));
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.