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

56
configs/xcompose Normal file
View file

@ -0,0 +1,56 @@
# GREEK CAPITAL LETTERS
<Multi_key> <G> <A> : "Α" U0391 # GREEK CAPITAL LETTER ALPHA
<Multi_key> <G> <B> : "Β" U0392 # GREEK CAPITAL LETTER BETA
<Multi_key> <G> <G> : "Γ" U0393 # GREEK CAPITAL LETTER GAMMA
<Multi_key> <G> <D> : "Δ" U0394 # GREEK CAPITAL LETTER DELTA
<Multi_key> <G> <E> : "Ε" U0395 # GREEK CAPITAL LETTER EPSILON
<Multi_key> <G> <Z> : "Ζ" U0396 # GREEK CAPITAL LETTER ZETA
<Multi_key> <G> <H> : "Η" U0397 # GREEK CAPITAL LETTER ETA
<Multi_key> <G> <I> : "Ι" U0399 # GREEK CAPITAL LETTER IOTA
<Multi_key> <G> <K> : "Κ" U039A # GREEK CAPITAL LETTER KAPPA
<Multi_key> <G> <L> : "Λ" U039B # GREEK CAPITAL LETTER LAMDA
<Multi_key> <G> <M> : "Μ" U039C # GREEK CAPITAL LETTER MU
<Multi_key> <G> <N> : "Ν" U039D # GREEK CAPITAL LETTER NU
<Multi_key> <G> <P> : "Π" U03A0 # GREEK CAPITAL LETTER PI
<Multi_key> <G> <R> : "Ρ" U03A1 # GREEK CAPITAL LETTER RHO
<Multi_key> <G> <S> : "Σ" U03A3 # GREEK CAPITAL LETTER SIGMA
<Multi_key> <G> <T> : "Τ" U03A4 # GREEK CAPITAL LETTER TAU
<Multi_key> <G> <U> : "Υ" U03A5 # GREEK CAPITAL LETTER UPSILON
<Multi_key> <G> <F> : "Φ" U03A6 # GREEK CAPITAL LETTER PHI
<Multi_key> <G> <X> : "Χ" U03A7 # GREEK CAPITAL LETTER CHI
<Multi_key> <G> <O> : "Ω" U03A9 # GREEK CAPITAL LETTER OMEGA
# DOUBLES (additional stroke <Q>)
<Multi_key> <G> <Q> <T> : "Θ" U0398 # GREEK CAPITAL LETTER THETA
<Multi_key> <G> <Q> <O> : "Ο" U039F # GREEK CAPITAL LETTER OMICRON
<Multi_key> <G> <Q> <X> : "Ξ" U039E # GREEK CAPITAL LETTER XI
<Multi_key> <G> <Q> <P> : "Ψ" U03A8 # GREEK CAPITAL LETTER PSI
# greek small letters
<Multi_key> <g> <a> : "α" U03B1 # GREEK SMALL LETTER ALPHA
<Multi_key> <g> <b> : "β" U03B2 # GREEK SMALL LETTER BETA
<Multi_key> <g> <g> : "γ" U03B3 # GREEK SMALL LETTER GAMMA
<Multi_key> <g> <d> : "δ" U03B4 # GREEK SMALL LETTER DELTA
<Multi_key> <g> <e> : "ε" U03B5 # GREEK SMALL LETTER EPSILON
<Multi_key> <g> <z> : "ζ" U03B6 # GREEK SMALL LETTER ZETA
<Multi_key> <g> <h> : "η" U03B7 # GREEK SMALL LETTER ETA
<Multi_key> <g> <i> : "ι" U03B9 # GREEK SMALL LETTER IOTA
<Multi_key> <g> <k> : "κ" U03BA # GREEK SMALL LETTER KAPPA
<Multi_key> <g> <l> : "λ" U03BB # GREEK SMALL LETTER LAMDA
<Multi_key> <g> <m> : "μ" U03BC # GREEK SMALL LETTER MU
<Multi_key> <g> <n> : "ν" U03BD # GREEK SMALL LETTER NU
<Multi_key> <g> <p> : "π" U03C0 # GREEK SMALL LETTER PI
<Multi_key> <g> <r> : "ρ" U03C1 # GREEK SMALL LETTER RHO
<Multi_key> <g> <s> : "σ" U03C3 # GREEK SMALL LETTER SIGMA
<Multi_key> <g> <t> : "τ" U03C4 # GREEK SMALL LETTER TAU
<Multi_key> <g> <u> : "υ" U03C5 # GREEK SMALL LETTER UPSILON
<Multi_key> <g> <f> : "φ" U03C6 # GREEK SMALL LETTER PHI
<Multi_key> <g> <x> : "χ" U03C7 # GREEK SMALL LETTER CHI
<Multi_key> <g> <o> : "ω" U03C9 # GREEK SMALL LETTER OMEGA
# doubles (additional stroke <q>)
<Multi_key> <g> <q> <t> : "θ" U03B8 # GREEK SMALL LETTER THETA
<Multi_key> <g> <q> <o> : "ο" U03BF # GREEK SMALL LETTER OMICRON
<Multi_key> <g> <q> <p> : "ψ" U03C8 # GREEK SMALL LETTER PSI
<Multi_key> <g> <q> <s> : "ς" U03C2 # GREEK SMALL LETTER FINAL SIGMA
<Multi_key> <g> <q> <x> : "ξ" U03BE # GREEK SMALL LETTER XI

View file

@ -62,23 +62,27 @@ in
keyboard.layout = "it"; keyboard.layout = "it";
keyboard.options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; keyboard.options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
packages = with pkgs; [ packages = with pkgs; [
audacity arandr
# audacity
authy authy
# blender # blender
ckan
discord discord
evolution evolution
firefox firefox
gallery-dl gallery-dl
gnome.dconf-editor gnome.dconf-editor
gnome.easytag
gnome.eog gnome.eog
gnome.evince gnome.evince
gnomeExtensions.appindicator gnomeExtensions.appindicator
gnomeExtensions.dash-to-dock gnomeExtensions.dash-to-dock
gnomeExtensions.topicons-plus
gnome.file-roller gnome.file-roller
gnome.ghex gnome.ghex
gnome.gitg gnome.gitg
gnome.gnome-screenshot gnome.gnome-screenshot
gnome.gnome-sound-recorder
gnome.gnome-sudoku
gnome.gnome-system-monitor gnome.gnome-system-monitor
gnome.gnome-tweaks gnome.gnome-tweaks
gnome.nautilus gnome.nautilus
@ -109,10 +113,10 @@ in
skypeforlinux skypeforlinux
slack slack
spotify spotify
tdesktop
teams teams
transmission-gtk transmission-gtk
virt-manager virt-manager
wget
wineFull wineFull
wireguard wireguard
xclip xclip
@ -120,17 +124,32 @@ in
zoom-us zoom-us
zotero zotero
] ++ [ hunspellDicts.it_IT
hunspellDicts.en_GB-large
hunspellDicts.en_US-large
blender
( (
pkgs.dwarf-fortress-packages.dwarf-fortress-full.override { dwarf-fortress-packages.dwarf-fortress-full.override {
enableLegendsBrowser = false; enableLegendsBrowser = false;
enableTextMode = true; enableTextMode = true;
theme = "cla"; theme = "phoebus";
}
)
(
retroarch.override {
cores = with pkgs.libretro; [
mgba
pcsx_rearmed
ppsspp
];
} }
) )
] ++ ( ] ++ (
with nixos; [ with nixos; [
blender tdesktop
] ]
); );
}; };
@ -166,11 +185,11 @@ in
./modules/man.nix ./modules/man.nix
# ./modules/nix-index.nix # ./modules/nix-index.nix
./modules/noti.nix ./modules/noti.nix
# ./modules/obs-studio.nix ./modules/obs-studio.nix
# ./modules/pazi.nix # ./modules/pazi.nix
./modules/picom.nix ./modules/picom.nix
./modules/polybar.nix ./modules/polybar.nix
./modules/qogir_theme.nix ./modules/gtk_theme.nix
./modules/rofi.nix ./modules/rofi.nix
./modules/screen_locker.nix ./modules/screen_locker.nix
./modules/ssh.nix ./modules/ssh.nix
@ -180,7 +199,7 @@ in
./modules/tmux.nix ./modules/tmux.nix
./modules/update_background.nix ./modules/update_background.nix
# ./modules/xidelhook.nix # ./modules/xidelhook.nix
./modules/zathura.nix # ./modules/zathura.nix
./modules/zoxide.nix ./modules/zoxide.nix
./modules/zsh.nix ./modules/zsh.nix

View file

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

View file

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

View file

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

View file

@ -11,8 +11,9 @@
} }
{ {
name = "Nvidia3screens"; name = "Nvidia3screens";
outputs_connected = [ "DP1" "eDP-1-1" "HDMI-0" ]; outputs_connected = [ "DP-1-1" "eDP-1-1" "HDMI-0" ];
configure_row = [ "DP1" "eDP-1-1" "HDMI-0" ]; configure_row = [ "eDP-1-1" "HDMI-0" ];
configure_column = [ "DP-1-1" "eDP-1-1" ];
primary = "HDMI-0"; 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, ... }: { pkgs, ... }:
let
nixpkgs = import nixpkgs {};
in
{ {
programs.obs-studio = { programs.obs-studio = {
enable = true; enable = true;
# package = nixpkgs.obs-studio;
plugins = with pkgs.obs-studio-plugins; [ plugins = with pkgs.obs-studio-plugins; [
# obs-linuxbrowser # obs-linuxbrowser
obs-gstreamer # obs-gstreamer
obs-move-transition # 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; enable = true;
compression = true; compression = true;
matchBlocks = { matchBlocks = {
# "gitlab.com" = { "gitlab.com" = {
# hostname = "gitlab.com"; hostname = "gitlab.com";
# identityFile = "~/.ssh/gitlab"; identityFile = "~/.ssh/gitlab";
# identitiesOnly = true; identitiesOnly = true;
# }; };
# "github.com" = { "github.com" = {
# hostname = "github.com"; hostname = "github.com";
# identityFile = "~/.ssh/github"; identityFile = "~/.ssh/github";
# identitiesOnly = true; identitiesOnly = true;
# }; };
# "bitbucket.com" = { "bitbucket.com" = {
# hostname = "bitbucket.com"; hostname = "bitbucket.com";
# identityFile = "~/.ssh/bitbucket"; identityFile = "~/.ssh/bitbucket";
# identitiesOnly = true; identitiesOnly = true;
# }; };
# "aur.archlinux.org" = { "aur.archlinux.org" = {
# hostname = "aur.archlinux.org"; hostname = "aur.archlinux.org";
# identityFile = "~/.ssh/aur"; identityFile = "~/.ssh/aur";
# identitiesOnly = true; identitiesOnly = true;
# }; };
# "heroku.com" = { "heroku.com" = {
# hostname = "heroku.com"; hostname = "heroku.com";
# identityFile = "~/.ssh/heroku"; identityFile = "~/.ssh/heroku";
# identitiesOnly = true; identitiesOnly = true;
# }; };
# "ngrok.io" = { "ngrok.io" = {
# hostname = "ngrok.io"; hostname = "ngrok.io";
# identityFile = "~/.ssh/local"; identityFile = "~/.ssh/local";
# identitiesOnly = true; identitiesOnly = true;
# }; };
# "172.27.108.?" = { "*.local 172.27.108.*" = {
# hostname = "172.27.108.?"; identityFile = "~/.ssh/local";
# identityFile = "~/.ssh/local"; identitiesOnly = true;
# identitiesOnly = true; };
# };
"*" = { "*" = {
identityFile = "~/.ssh/id_ed25519"; identityFile = "~/.ssh/id_ed25519";
}; };
}; };
}; };