From 2d6084b28aa241465b53eca24b35595352ff0933 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sat, 10 Jul 2021 17:35:10 +0200 Subject: [PATCH] Update 01/07/21 --- configs/xcompose | 56 ++++++++++++++++++++++++++++++ home.nix | 39 +++++++++++++++------ modules/bspwm.nix | 12 +++++++ modules/configurations.nix | 4 +++ modules/git.nix | 4 ++- modules/grobi.nix | 6 ++-- modules/gtk_theme.nix | 33 ++++++++++++++++++ modules/obs-studio.nix | 9 +++-- modules/qogir_theme.nix | 68 ------------------------------------ modules/ssh.nix | 71 +++++++++++++++++++------------------- 10 files changed, 182 insertions(+), 120 deletions(-) create mode 100644 configs/xcompose create mode 100644 modules/gtk_theme.nix delete mode 100644 modules/qogir_theme.nix diff --git a/configs/xcompose b/configs/xcompose new file mode 100644 index 0000000..fff88e6 --- /dev/null +++ b/configs/xcompose @@ -0,0 +1,56 @@ +# GREEK CAPITAL LETTERS + : "Α" U0391 # GREEK CAPITAL LETTER ALPHA + : "Β" U0392 # GREEK CAPITAL LETTER BETA + : "Γ" U0393 # GREEK CAPITAL LETTER GAMMA + : "Δ" U0394 # GREEK CAPITAL LETTER DELTA + : "Ε" U0395 # GREEK CAPITAL LETTER EPSILON + : "Ζ" U0396 # GREEK CAPITAL LETTER ZETA + : "Η" U0397 # GREEK CAPITAL LETTER ETA + : "Ι" U0399 # GREEK CAPITAL LETTER IOTA + : "Κ" U039A # GREEK CAPITAL LETTER KAPPA + : "Λ" U039B # GREEK CAPITAL LETTER LAMDA + : "Μ" U039C # GREEK CAPITAL LETTER MU + : "Ν" U039D # GREEK CAPITAL LETTER NU +

: "Π" U03A0 # GREEK CAPITAL LETTER PI + : "Ρ" U03A1 # GREEK CAPITAL LETTER RHO + : "Σ" U03A3 # GREEK CAPITAL LETTER SIGMA + : "Τ" U03A4 # GREEK CAPITAL LETTER TAU + : "Υ" U03A5 # GREEK CAPITAL LETTER UPSILON + : "Φ" U03A6 # GREEK CAPITAL LETTER PHI + : "Χ" U03A7 # GREEK CAPITAL LETTER CHI + : "Ω" U03A9 # GREEK CAPITAL LETTER OMEGA + +# DOUBLES (additional stroke ) + : "Θ" U0398 # GREEK CAPITAL LETTER THETA + : "Ο" U039F # GREEK CAPITAL LETTER OMICRON + : "Ξ" U039E # GREEK CAPITAL LETTER XI +

: "π" U03C0 # GREEK SMALL LETTER PI + : "ρ" U03C1 # GREEK SMALL LETTER RHO + : "σ" U03C3 # GREEK SMALL LETTER SIGMA + : "τ" U03C4 # GREEK SMALL LETTER TAU + : "υ" U03C5 # GREEK SMALL LETTER UPSILON + : "φ" U03C6 # GREEK SMALL LETTER PHI + : "χ" U03C7 # GREEK SMALL LETTER CHI + : "ω" U03C9 # GREEK SMALL LETTER OMEGA + +# doubles (additional stroke ) + : "θ" U03B8 # GREEK SMALL LETTER THETA + : "ο" U03BF # GREEK SMALL LETTER OMICRON +

: "ψ" U03C8 # GREEK SMALL LETTER PSI + : "ς" U03C2 # GREEK SMALL LETTER FINAL SIGMA + : "ξ" U03BE # GREEK SMALL LETTER XI diff --git a/home.nix b/home.nix index d5a7be6..9a36638 100644 --- a/home.nix +++ b/home.nix @@ -62,23 +62,27 @@ in keyboard.layout = "it"; keyboard.options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; packages = with pkgs; [ - audacity + arandr + # audacity authy # blender + ckan discord evolution firefox gallery-dl gnome.dconf-editor - gnome.easytag gnome.eog gnome.evince gnomeExtensions.appindicator gnomeExtensions.dash-to-dock + gnomeExtensions.topicons-plus gnome.file-roller gnome.ghex gnome.gitg gnome.gnome-screenshot + gnome.gnome-sound-recorder + gnome.gnome-sudoku gnome.gnome-system-monitor gnome.gnome-tweaks gnome.nautilus @@ -109,10 +113,10 @@ in skypeforlinux slack spotify - tdesktop teams transmission-gtk virt-manager + wget wineFull wireguard xclip @@ -120,17 +124,32 @@ in zoom-us 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; enableTextMode = true; - theme = "cla"; + theme = "phoebus"; + } + ) + + ( + retroarch.override { + cores = with pkgs.libretro; [ + mgba + pcsx_rearmed + ppsspp + ]; } ) ] ++ ( with nixos; [ - blender + tdesktop ] ); }; @@ -166,11 +185,11 @@ in ./modules/man.nix # ./modules/nix-index.nix ./modules/noti.nix - # ./modules/obs-studio.nix + ./modules/obs-studio.nix # ./modules/pazi.nix ./modules/picom.nix ./modules/polybar.nix - ./modules/qogir_theme.nix + ./modules/gtk_theme.nix ./modules/rofi.nix ./modules/screen_locker.nix ./modules/ssh.nix @@ -180,7 +199,7 @@ in ./modules/tmux.nix ./modules/update_background.nix # ./modules/xidelhook.nix - ./modules/zathura.nix + # ./modules/zathura.nix ./modules/zoxide.nix ./modules/zsh.nix diff --git a/modules/bspwm.nix b/modules/bspwm.nix index f92dc9b..16f4b82 100644 --- a/modules/bspwm.nix +++ b/modules/bspwm.nix @@ -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 = []; }; diff --git a/modules/configurations.nix b/modules/configurations.nix index 5dee611..b2f8916 100644 --- a/modules/configurations.nix +++ b/modules/configurations.nix @@ -3,4 +3,8 @@ source = ../configs/editorconfig; target = ".editorconfig"; }; + home.file.".XCompose" = { + source = ../configs/xcompose; + target = ".XCompose"; + }; } diff --git a/modules/git.nix b/modules/git.nix index 2ad0971..d4642a5 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -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 ]; } diff --git a/modules/grobi.nix b/modules/grobi.nix index a1eef01..7e222fd 100644 --- a/modules/grobi.nix +++ b/modules/grobi.nix @@ -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 @@ } ]; }; - } diff --git a/modules/gtk_theme.nix b/modules/gtk_theme.nix new file mode 100644 index 0000000..01d9416 --- /dev/null +++ b/modules/gtk_theme.nix @@ -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; + }; + }; +} diff --git a/modules/obs-studio.nix b/modules/obs-studio.nix index 69bf3d8..d59117c 100644 --- a/modules/obs-studio.nix +++ b/modules/obs-studio.nix @@ -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 ]; }; } diff --git a/modules/qogir_theme.nix b/modules/qogir_theme.nix deleted file mode 100644 index 2e7f15c..0000000 --- a/modules/qogir_theme.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/modules/ssh.nix b/modules/ssh.nix index 124c5f9..f4c801c 100644 --- a/modules/ssh.nix +++ b/modules/ssh.nix @@ -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"; }; }; };

: "Ψ" U03A8 # GREEK CAPITAL LETTER PSI + +# greek small letters + : "α" U03B1 # GREEK SMALL LETTER ALPHA + : "β" U03B2 # GREEK SMALL LETTER BETA + : "γ" U03B3 # GREEK SMALL LETTER GAMMA + : "δ" U03B4 # GREEK SMALL LETTER DELTA + : "ε" U03B5 # GREEK SMALL LETTER EPSILON + : "ζ" U03B6 # GREEK SMALL LETTER ZETA + : "η" U03B7 # GREEK SMALL LETTER ETA + : "ι" U03B9 # GREEK SMALL LETTER IOTA + : "κ" U03BA # GREEK SMALL LETTER KAPPA + : "λ" U03BB # GREEK SMALL LETTER LAMDA + : "μ" U03BC # GREEK SMALL LETTER MU + : "ν" U03BD # GREEK SMALL LETTER NU +