From 3884eb2f82b93ebd9112f6a04c62a8a7d26662dd Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Sat, 29 Oct 2022 20:38:12 +0200 Subject: yolo --- modules/devtools.nix | 7 +++ modules/gnome.nix | 116 ++++++++++++++++++++++++++++++++++ modules/graphical.nix | 153 --------------------------------------------- modules/sway.nix | 153 +++++++++++++++++++++++++++++++++++++++++++++ modules/virtualization.nix | 1 + 5 files changed, 277 insertions(+), 153 deletions(-) create mode 100644 modules/gnome.nix delete mode 100644 modules/graphical.nix create mode 100644 modules/sway.nix (limited to 'modules') diff --git a/modules/devtools.nix b/modules/devtools.nix index 4f0bc50..d3ad897 100644 --- a/modules/devtools.nix +++ b/modules/devtools.nix @@ -14,8 +14,15 @@ # nix rnix-lsp nixpkgs-fmt + # julia + julia-bin ]; + ## Julia + environment.variables = { + JULIA_NUM_THREADS = "8"; + }; + ## direnv programs.bash.interactiveShellInit = '' eval "$(direnv hook bash)" diff --git a/modules/gnome.nix b/modules/gnome.nix new file mode 100644 index 0000000..5254353 --- /dev/null +++ b/modules/gnome.nix @@ -0,0 +1,116 @@ +{ config, pkgs, ... }: { + + environment.systemPackages = with pkgs; [ + celluloid + gnome.gnome-boxes + gnome.gnome-tweaks + nextcloud-client + amberol + firefox-wayland + element-desktop + wl-clipboard + pulseaudioFull + screen-message + qbittorrent + dino + gnome.gnome-terminal + #gnome-console + ]; + + environment.gnome.excludePackages = with pkgs; [ + gnome.totem + gnome.geary + gnome.gnome-music + gnome-console + ]; + + + services.gnome = { + evolution-data-server.enable = true; + gnome-keyring.enable = true; + gnome-online-accounts.enable = true; + }; + + programs = { + seahorse.enable = true; + gnupg.agent.pinentryFlavor = "gnome3"; + evolution = { + enable = true; + plugins = [ pkgs.evolution-ews ]; + }; + }; + + qt5 = { + enable = true; + platformTheme = "gnome"; + style = "adwaita-dark"; + }; + + services.xserver = { + enable = true; + desktopManager.gnome.enable = true; + displayManager.gdm = { + enable = true; + wayland = true; + }; + }; + + # Enable sound. + security.rtkit.enable = true; + hardware.pulseaudio = { + enable = false; + zeroconf.discovery.enable = true; + extraClientConf = '' + autospawn=yes + ''; + }; + services.pipewire = { + enable = true; + alsa.enable = true; + pulse.enable = true; + }; + + programs.zsh.vteIntegration = true; + programs.bash.vteIntegration = true; + + fonts.fonts = with pkgs; [ + monoid + font-awesome + dejavu_fonts + julia-mono + uw-ttyp0 + gohufont + spleen + terminus_font + creep + corefonts + dina-font + fira + fira-mono + hack-font + liberation_ttf + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + noto-fonts-extra + proggyfonts + symbola + open-sans + twemoji-color-font + twitter-color-emoji + ]; + + fonts.enableDefaultFonts = true; + fonts.fontconfig = { + enable = true; + allowBitmaps = true; + useEmbeddedBitmaps = true; + defaultFonts.emoji = [ + "Twitter Color Emoji" + "Noto Color Emoji" + ]; + }; + + hardware.bluetooth.enable = true; + +} diff --git a/modules/graphical.nix b/modules/graphical.nix deleted file mode 100644 index 550b01e..0000000 --- a/modules/graphical.nix +++ /dev/null @@ -1,153 +0,0 @@ -# General Desktop-related config -{ config, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - firefox-wayland - wl-clipboard - pulseaudioFull - screen-message - qbittorrent - dino - gajim - imv - mpv - zathura - brightnessctl - pulsemixer - cmus - termusic - gsettings-desktop-schemas - xdg-utils - nextcloud-client - foot - qt5.qtwayland - bashmount - ]; - - #on the desktop, we need nice fonts ^^ - fonts.fonts = with pkgs; [ - monoid - font-awesome - dejavu_fonts - julia-mono - uw-ttyp0 - gohufont - spleen - terminus_font - creep - corefonts - dina-font - fira - fira-mono - hack-font - liberation_ttf - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - noto-fonts-extra - proggyfonts - symbola - open-sans - twemoji-color-font - twitter-color-emoji - ]; - - fonts.enableDefaultFonts = true; - fonts.fontconfig = { - enable = true; - allowBitmaps = true; - useEmbeddedBitmaps = true; - defaultFonts.emoji = [ - "Noto Color Emoji" - "Twitter Color Emoji" - ]; - }; - - # Enable sound. - security.rtkit.enable = true; - hardware.pulseaudio = { - enable = false; - zeroconf.discovery.enable = true; - extraClientConf = '' - autospawn=yes - ''; - }; - - services.pipewire = { - enable = true; - alsa.enable = true; - pulse.enable = true; - }; - - hardware.bluetooth = { - enable = true; - package = pkgs.bluez; - }; - - programs.zsh.vteIntegration = true; - programs.bash.vteIntegration = true; - services.upower.enable = true; - - services.acpid.enable = true; - programs.light.enable = true; - - services.blueman.enable = true; - - programs.xwayland.enable = true; - programs.sway = { - enable = true; - wrapperFeatures.gtk = true; - extraSessionCommands = '' - export SDL_VIDEODRIVER=wayland - export QT_QPA_PLATFORM=wayland-egl - export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - export QT_QPA_PLATFORMTHEME="gnome" - export QT_STYLE_OVERRIDE="adwaita-dark" - ''; - extraPackages = with pkgs; [ - pamixer - swaylock - swayidle - wl-clipboard - mako - foot - rofi-wayland - grim - slurp - gnome.adwaita-icon-theme - i3status-rust - ]; - }; - environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; }; - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - }; - - services.udisks2.enable = true; - environment.shellAliases = { - mnt = "udisksctl mount -b"; - umnt = "udisksctl unmount -b"; - unlock = "udisksctl unlock -b"; - lock = "udisksctl lock -b"; - }; - - qt5 = { - enable = true; - platformTheme = "gnome"; - style = "adwaita-dark"; - }; - - services.gnome.gnome-keyring.enable = true; - - # required to autounlock gnome-keyring - services.xserver = { - enable = true; - displayManager.gdm = { - enable = true; - wayland = true; - }; - }; - programs.gnupg.agent.pinentryFlavor = "curses"; -} diff --git a/modules/sway.nix b/modules/sway.nix new file mode 100644 index 0000000..550b01e --- /dev/null +++ b/modules/sway.nix @@ -0,0 +1,153 @@ +# General Desktop-related config +{ config, pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + firefox-wayland + wl-clipboard + pulseaudioFull + screen-message + qbittorrent + dino + gajim + imv + mpv + zathura + brightnessctl + pulsemixer + cmus + termusic + gsettings-desktop-schemas + xdg-utils + nextcloud-client + foot + qt5.qtwayland + bashmount + ]; + + #on the desktop, we need nice fonts ^^ + fonts.fonts = with pkgs; [ + monoid + font-awesome + dejavu_fonts + julia-mono + uw-ttyp0 + gohufont + spleen + terminus_font + creep + corefonts + dina-font + fira + fira-mono + hack-font + liberation_ttf + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + noto-fonts-extra + proggyfonts + symbola + open-sans + twemoji-color-font + twitter-color-emoji + ]; + + fonts.enableDefaultFonts = true; + fonts.fontconfig = { + enable = true; + allowBitmaps = true; + useEmbeddedBitmaps = true; + defaultFonts.emoji = [ + "Noto Color Emoji" + "Twitter Color Emoji" + ]; + }; + + # Enable sound. + security.rtkit.enable = true; + hardware.pulseaudio = { + enable = false; + zeroconf.discovery.enable = true; + extraClientConf = '' + autospawn=yes + ''; + }; + + services.pipewire = { + enable = true; + alsa.enable = true; + pulse.enable = true; + }; + + hardware.bluetooth = { + enable = true; + package = pkgs.bluez; + }; + + programs.zsh.vteIntegration = true; + programs.bash.vteIntegration = true; + services.upower.enable = true; + + services.acpid.enable = true; + programs.light.enable = true; + + services.blueman.enable = true; + + programs.xwayland.enable = true; + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + extraSessionCommands = '' + export SDL_VIDEODRIVER=wayland + export QT_QPA_PLATFORM=wayland-egl + export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + export QT_QPA_PLATFORMTHEME="gnome" + export QT_STYLE_OVERRIDE="adwaita-dark" + ''; + extraPackages = with pkgs; [ + pamixer + swaylock + swayidle + wl-clipboard + mako + foot + rofi-wayland + grim + slurp + gnome.adwaita-icon-theme + i3status-rust + ]; + }; + environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; }; + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + }; + + services.udisks2.enable = true; + environment.shellAliases = { + mnt = "udisksctl mount -b"; + umnt = "udisksctl unmount -b"; + unlock = "udisksctl unlock -b"; + lock = "udisksctl lock -b"; + }; + + qt5 = { + enable = true; + platformTheme = "gnome"; + style = "adwaita-dark"; + }; + + services.gnome.gnome-keyring.enable = true; + + # required to autounlock gnome-keyring + services.xserver = { + enable = true; + displayManager.gdm = { + enable = true; + wayland = true; + }; + }; + programs.gnupg.agent.pinentryFlavor = "curses"; +} diff --git a/modules/virtualization.nix b/modules/virtualization.nix index bf33cc9..745451c 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -3,6 +3,7 @@ { environment.systemPackages = with pkgs; [ virt-manager + bridge-utils ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; -- cgit v1.3.1