Update 01/07/21

This commit is contained in:
Filippo Berto 2021-07-10 17:35:10 +02:00
parent 632185d7f8
commit 2d6084b28a
10 changed files with 182 additions and 120 deletions

View file

@ -3,6 +3,7 @@
let
monitorPages = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X" ];
strPalette = pkgs.rice.palette.toRGBHex pkgs.rice.colorPalette;
xrandr = "${pkgs.xorg.xrandr}/bin/xrandr";
in
{
xsession.windowManager.bspwm = {
@ -19,14 +20,25 @@ in
focused_border_color = strPalette.bright.blue;
};
monitors = {
# Intel
"eDP1" = monitorPages;
"DP1" = monitorPages;
# Nvidia
"eDP-1-1" = monitorPages;
"HDMI-0" = monitorPages;
"DP-1-1" = monitorPages;
};
extraConfig = ''
${pkgs.wmname}/bin/wmname LG3D
${pkgs.polybar}/bin/polybar-msg cmd restart
if grep DP-1-1 <(${xrandr} --listactivemonitors); then
${xrandr} --output DP-1-1 --auto --above eDP-1-1
elif grep DP1 <(${xrandr} --listactivemonitors); then
${xrandr} --output DP-1-1 --auto --above eDP1;
fi
'';
startupPrograms = [];
};

View file

@ -3,4 +3,8 @@
source = ../configs/editorconfig;
target = ".editorconfig";
};
home.file.".XCompose" = {
source = ../configs/xcompose;
target = ".XCompose";
};
}

View file

@ -174,7 +174,8 @@ let
# "gama"="git am --abort";
# "gamscp"="git am --show-current-patch";
};
in{
in
{
programs.git = {
enable = true;
userName = "Filippo Berto";
@ -197,4 +198,5 @@ in{
};
programs.bash.shellAliases = shellAliases;
programs.zsh.shellAliases = shellAliases;
home.packages = with pkgs; [ git-secret ];
}

View file

@ -11,8 +11,9 @@
}
{
name = "Nvidia3screens";
outputs_connected = [ "DP1" "eDP-1-1" "HDMI-0" ];
configure_row = [ "DP1" "eDP-1-1" "HDMI-0" ];
outputs_connected = [ "DP-1-1" "eDP-1-1" "HDMI-0" ];
configure_row = [ "eDP-1-1" "HDMI-0" ];
configure_column = [ "DP-1-1" "eDP-1-1" ];
primary = "HDMI-0";
}
{
@ -27,5 +28,4 @@
}
];
};
}

33
modules/gtk_theme.nix Normal file
View file

@ -0,0 +1,33 @@
{ pkgs, ... }:
{
gtk = {
enable = true;
font = {
package = pkgs.cantarell-fonts;
name = "Cantarell";
size = 9;
};
iconTheme = {
package = pkgs.qogir-icon-theme;
name = "Qogir-dark";
};
theme = {
package = pkgs.nordic;
name = "Nordic-bluish-accent";
};
};
qt = {
enable = true;
platformTheme = "gtk";
};
xsession = {
numlock.enable = true;
pointerCursor = {
package = pkgs.qogir-icon-theme;
name = "Qogir";
size = 24;
};
};
}

View file

@ -1,11 +1,16 @@
{ pkgs, ... }:
let
nixpkgs = import nixpkgs {};
in
{
programs.obs-studio = {
enable = true;
# package = nixpkgs.obs-studio;
plugins = with pkgs.obs-studio-plugins; [
# obs-linuxbrowser
obs-gstreamer
obs-move-transition
# obs-gstreamer
# obs-move-transition
# obs-multi-rtmp
];
};
}

View file

@ -1,68 +0,0 @@
{ pkgs, ... }:
{
gtk = {
enable = true;
font = {
package = pkgs.cantarell-fonts;
# name = "Cantarell";
# size = 9;
name = "Cantarell 9";
};
iconTheme = {
package = pkgs.qogir-icon-theme;
name = "Qogir-dark";
};
theme = {
package = pkgs.qogir-theme;
name = "Qogir-dark";
};
# gtk3.extraConfig = {
# gtk-theme-name=Drakula
# gtk-icon-theme-name=Qogir-dark
# gtk-font-name=Cantarell 9
# gtk-cursor-theme-name=capitaine-cursors
# gtk-cursor-theme-size=0
# gtk-toolbar-style=GTK_TOOLBAR_ICONS
# gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
# gtk-button-images=1
# gtk-menu-images=1
# gtk-enable-event-sounds=1
# gtk-enable-input-feedback-sounds=1
# gtk-xft-antialias=1
# gtk-xft-hinting=1
# gtk-xft-hintstyle=hintfull
# gtk-xft-rgba=none
# };
# gtk2.extraConfig = {
# gtk-theme-name="Arc-Dark"
# gtk-icon-theme-name="Qogir-dark"
# gtk-font-name="Cantarell 9"
# gtk-cursor-theme-name="capitaine-cursors"
# gtk-cursor-theme-size=0
# gtk-toolbar-style=GTK_TOOLBAR_ICONS
# gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
# gtk-button-images=1
# gtk-menu-images=1
# gtk-enable-event-sounds=1
# gtk-enable-input-feedback-sounds=1
# gtk-xft-antialias=1
# gtk-xft-hinting=1
# gtk-xft-hintstyle="hintfull"
# gtk-xft-rgba="none"
# };
};
qt = {
enable = true;
platformTheme = "gtk";
};
xsession = {
numlock.enable = true;
pointerCursor = {
package = pkgs.qogir-icon-theme;
name = "Qogir";
size = 24;
};
};
}

View file

@ -3,43 +3,42 @@
enable = true;
compression = true;
matchBlocks = {
# "gitlab.com" = {
# hostname = "gitlab.com";
# identityFile = "~/.ssh/gitlab";
# identitiesOnly = true;
# };
# "github.com" = {
# hostname = "github.com";
# identityFile = "~/.ssh/github";
# identitiesOnly = true;
# };
# "bitbucket.com" = {
# hostname = "bitbucket.com";
# identityFile = "~/.ssh/bitbucket";
# identitiesOnly = true;
# };
# "aur.archlinux.org" = {
# hostname = "aur.archlinux.org";
# identityFile = "~/.ssh/aur";
# identitiesOnly = true;
# };
# "heroku.com" = {
# hostname = "heroku.com";
# identityFile = "~/.ssh/heroku";
# identitiesOnly = true;
# };
# "ngrok.io" = {
# hostname = "ngrok.io";
# identityFile = "~/.ssh/local";
# identitiesOnly = true;
# };
# "172.27.108.?" = {
# hostname = "172.27.108.?";
# identityFile = "~/.ssh/local";
# identitiesOnly = true;
# };
"gitlab.com" = {
hostname = "gitlab.com";
identityFile = "~/.ssh/gitlab";
identitiesOnly = true;
};
"github.com" = {
hostname = "github.com";
identityFile = "~/.ssh/github";
identitiesOnly = true;
};
"bitbucket.com" = {
hostname = "bitbucket.com";
identityFile = "~/.ssh/bitbucket";
identitiesOnly = true;
};
"aur.archlinux.org" = {
hostname = "aur.archlinux.org";
identityFile = "~/.ssh/aur";
identitiesOnly = true;
};
"heroku.com" = {
hostname = "heroku.com";
identityFile = "~/.ssh/heroku";
identitiesOnly = true;
};
"ngrok.io" = {
hostname = "ngrok.io";
identityFile = "~/.ssh/local";
identitiesOnly = true;
};
"*.local 172.27.108.*" = {
identityFile = "~/.ssh/local";
identitiesOnly = true;
};
"*" = {
identityFile = "~/.ssh/id_ed25519";
identityFile = "~/.ssh/id_ed25519";
};
};
};