a grabbag of update
This commit is contained in:
parent
be8eecab9b
commit
0677189e4f
|
@ -3,6 +3,9 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../common/desktop.nix
|
../common/desktop.nix
|
||||||
|
../common/steam.nix
|
||||||
|
../common/minecraft.nix
|
||||||
|
# ../common/nvidia.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader = {
|
boot.loader = {
|
||||||
|
|
|
@ -5,6 +5,10 @@ let
|
||||||
url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
|
url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
|
||||||
sha256 = "0dfshsgj93ikfkcihf4c5z876h4dwjds998kvgv7sqbfv0z6a4bc";
|
sha256 = "0dfshsgj93ikfkcihf4c5z876h4dwjds998kvgv7sqbfv0z6a4bc";
|
||||||
};
|
};
|
||||||
|
customPolybar = pkgs.polybar.override {
|
||||||
|
alsaSupport = true;
|
||||||
|
pulseSupport = true;
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(import "${home-manager}/nixos")
|
(import "${home-manager}/nixos")
|
||||||
|
@ -16,9 +20,7 @@ in {
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
layout = "us";
|
layout = "us";
|
||||||
|
|
||||||
# we're going to be pulling a sneaky
|
displayManager.sx.enable = true;
|
||||||
# we don't actually use startx, it just gets lightdm out of the way
|
|
||||||
displayManager.startx.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
|
@ -33,10 +35,14 @@ in {
|
||||||
fzy
|
fzy
|
||||||
xclip
|
xclip
|
||||||
xcape
|
xcape
|
||||||
polybar
|
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
|
||||||
|
pciutils
|
||||||
|
xscreensaver
|
||||||
ncpamixer
|
ncpamixer
|
||||||
|
gpick
|
||||||
|
dunst
|
||||||
|
libnotify
|
||||||
tig
|
tig
|
||||||
cmus
|
cmus
|
||||||
neomutt
|
neomutt
|
||||||
|
@ -56,6 +62,7 @@ in {
|
||||||
ungoogled-chromium
|
ungoogled-chromium
|
||||||
discord
|
discord
|
||||||
|
|
||||||
|
customPolybar
|
||||||
(pkgs.callPackage ../builds/utils.nix {})
|
(pkgs.callPackage ../builds/utils.nix {})
|
||||||
(pkgs.callPackage ../builds/st.nix {})
|
(pkgs.callPackage ../builds/st.nix {})
|
||||||
(pkgs.callPackage ../builds/pash.nix {})
|
(pkgs.callPackage ../builds/pash.nix {})
|
||||||
|
@ -193,6 +200,10 @@ in {
|
||||||
source = ../wallpapers;
|
source = ../wallpapers;
|
||||||
recursive = true;
|
recursive = true;
|
||||||
};
|
};
|
||||||
|
".local/share/gnupg" = {
|
||||||
|
source = ../config/gnupg;
|
||||||
|
recursive = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
prismlauncher
|
||||||
|
];
|
||||||
|
}
|
|
@ -0,0 +1,28 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
# Make sure opengl is enabled
|
||||||
|
hardware.opengl = {
|
||||||
|
enable = true;
|
||||||
|
driSupport = true;
|
||||||
|
driSupport32Bit = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Tell Xorg to use the nvidia driver (also valid for Wayland)
|
||||||
|
services.xserver.videoDrivers = ["nvidia"];
|
||||||
|
|
||||||
|
hardware.nvidia = {
|
||||||
|
|
||||||
|
# Modesetting is needed for most Wayland compositors
|
||||||
|
modesetting.enable = true;
|
||||||
|
|
||||||
|
# Use the open source version of the kernel module
|
||||||
|
# Only available on driver 515.43.04+
|
||||||
|
open = false;
|
||||||
|
|
||||||
|
# Enable the nvidia settings menu
|
||||||
|
nvidiaSettings = true;
|
||||||
|
|
||||||
|
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||||
|
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||||
|
};
|
||||||
|
}
|
|
@ -5,6 +5,7 @@
|
||||||
wallpaper
|
wallpaper
|
||||||
disp
|
disp
|
||||||
polybar &
|
polybar &
|
||||||
|
dunst &
|
||||||
|
|
||||||
# set up the color scheme
|
# set up the color scheme
|
||||||
bspc config normal_border_color "#161510"
|
bspc config normal_border_color "#161510"
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
pinentry-program /run/current-system/sw/bin/pinentry
|
|
@ -1,25 +1,25 @@
|
||||||
[colors]
|
[colors]
|
||||||
background = #161510
|
background = #161510
|
||||||
background-alt = #161510
|
background-alt = #161510
|
||||||
foreground = #CCCCCC
|
foreground = #8D8363
|
||||||
primary = #CCCCCC
|
primary = #727A18
|
||||||
secondary = #727A18
|
secondary = #CCCCCC
|
||||||
alert = #A37720
|
alert = #A37720
|
||||||
disabled = #161510
|
disabled = #161510
|
||||||
|
|
||||||
[bar/example]
|
[bar/test]
|
||||||
width = 100%
|
width = 100%
|
||||||
height = 16pt
|
height = 14pt
|
||||||
radius = 1
|
|
||||||
|
|
||||||
|
override-redirect = false
|
||||||
; dpi = 96
|
; dpi = 96
|
||||||
|
|
||||||
background = ${colors.background}
|
background = ${colors.background}
|
||||||
foreground = ${colors.foreground}
|
foreground = ${colors.foreground}
|
||||||
|
|
||||||
line-size = 3pt
|
line-size = 5pt
|
||||||
|
|
||||||
border-size = 4pt
|
border-size = 3pt
|
||||||
border-color = #00000000
|
border-color = #00000000
|
||||||
|
|
||||||
padding-left = 0
|
padding-left = 0
|
||||||
|
@ -40,13 +40,9 @@ cursor-scroll = ns-resize
|
||||||
|
|
||||||
enable-ipc = true
|
enable-ipc = true
|
||||||
|
|
||||||
; tray-position = right
|
tray-position = right
|
||||||
|
|
||||||
; wm-restack = generic
|
wm-restack = bspwm
|
||||||
; wm-restack = bspwm
|
|
||||||
; wm-restack = i3
|
|
||||||
|
|
||||||
; override-redirect = true
|
|
||||||
|
|
||||||
[module/xworkspaces]
|
[module/xworkspaces]
|
||||||
type = internal/xworkspaces
|
type = internal/xworkspaces
|
||||||
|
@ -85,6 +81,7 @@ format-volume-prefix-foreground = ${colors.primary}
|
||||||
format-volume = <label-volume>
|
format-volume = <label-volume>
|
||||||
|
|
||||||
label-volume = %percentage%%
|
label-volume = %percentage%%
|
||||||
|
label-foreground = ${colors.foreground}
|
||||||
|
|
||||||
label-muted = muted
|
label-muted = muted
|
||||||
label-muted-foreground = ${colors.disabled}
|
label-muted-foreground = ${colors.disabled}
|
||||||
|
@ -97,7 +94,7 @@ date = %H:%M
|
||||||
date-alt = %Y-%m-%d %H:%M:%S
|
date-alt = %Y-%m-%d %H:%M:%S
|
||||||
|
|
||||||
label = %date%
|
label = %date%
|
||||||
label-foreground = ${colors.primary}
|
label-foreground = ${colors.foreground}
|
||||||
|
|
||||||
[settings]
|
[settings]
|
||||||
screenchange-reload = true
|
screenchange-reload = true
|
||||||
|
|
Loading…
Reference in New Issue