From 78eaa0ccb01720bb91ffe6af1a0db93ab9408317 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 7 Jul 2024 10:44:00 +0300 Subject: [all] Renamed and reorganized modules --- configuration.nix | 19 +----- module-groups.nix | 3 +- modules/battery.nix | 10 +++ modules/cli-apps.nix | 33 ---------- modules/cli-essential.nix | 20 ++++++ modules/cli-powerful.nix | 18 +++++ modules/desktop_archiving.nix | 15 ----- modules/dev-cli.nix | 22 +++++++ modules/dev-gui.nix | 8 +++ modules/dev.nix | 25 ------- modules/general-settings.nix | 21 ------ modules/gui-apps.nix | 54 --------------- modules/gui-essential.nix | 35 ++++++++++ modules/gui-powerful.nix | 8 +++ modules/hardware-general.nix | 9 +++ modules/hardware-laptop.nix | 15 +++++ modules/keyboard.nix | 9 --- modules/keyboards-custom.nix | 9 +++ modules/laptop_control.nix | 13 ---- modules/openbox-de.nix | 2 +- modules/rtl-sdr.nix | 150 ++++++++++++++++++++++++++++++++++++++++++ modules/tex.nix | 12 ++++ modules/users-standard.nix | 16 +++++ modules/virtualization.nix | 10 +++ modules/web-server.nix | 4 +- modules/xserver.nix | 13 ++++ rtl-temp.nix | 146 ---------------------------------------- 27 files changed, 364 insertions(+), 335 deletions(-) create mode 100644 modules/battery.nix delete mode 100644 modules/cli-apps.nix create mode 100644 modules/cli-essential.nix create mode 100644 modules/cli-powerful.nix delete mode 100644 modules/desktop_archiving.nix create mode 100644 modules/dev-cli.nix create mode 100644 modules/dev-gui.nix delete mode 100644 modules/dev.nix delete mode 100644 modules/general-settings.nix delete mode 100644 modules/gui-apps.nix create mode 100644 modules/gui-essential.nix create mode 100644 modules/gui-powerful.nix create mode 100644 modules/hardware-general.nix create mode 100644 modules/hardware-laptop.nix delete mode 100644 modules/keyboard.nix create mode 100644 modules/keyboards-custom.nix delete mode 100644 modules/laptop_control.nix create mode 100644 modules/rtl-sdr.nix create mode 100644 modules/tex.nix create mode 100644 modules/users-standard.nix create mode 100644 modules/virtualization.nix create mode 100644 modules/xserver.nix delete mode 100644 rtl-temp.nix diff --git a/configuration.nix b/configuration.nix index 95ca38f..3a8aa90 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,8 +1,4 @@ { config, pkgs, ... }: { - imports = [ - ./rtl-temp.nix - ]; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It's perfectly fine and recommended to leave @@ -19,8 +15,10 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; + environment.systemPackages = with pkgs; [ - pipewire networkmanager + networkmanager ]; # @@ -71,17 +69,6 @@ # Users # - # Define a user account. Don't forget to set a password with ‘passwd’. - # Thanks https://discourse.nixos.org/t/gns3-setcap-and-ubridge-gns3-unable-to-execute-setcap-command/13485/3 - users = { - groups.ubridge = {}; - users.kamen = { - isNormalUser = true; - extraGroups = [ "wheel" "audio" "video" "input" "lpadmin" "libvirtd" "lp" "scanner" "plugdev" "docker" "ubridge" ]; # Enable ‘sudo’ for the user. - packages = [ ]; - shell = pkgs.zsh; - homeMode = "711"; # mostly done for httpd access - };}; # TODO # Enable the OpenSSH daemon. diff --git a/module-groups.nix b/module-groups.nix index 368cc1a..263c4fa 100644 --- a/module-groups.nix +++ b/module-groups.nix @@ -1,3 +1,4 @@ { - non-desktop = [ "laptop_control" ]; + non-desktop = [ "battery" "hardware-laptop" ]; + non-laptop = [ "dev-gui" "gui-powerful" ]; } diff --git a/modules/battery.nix b/modules/battery.nix new file mode 100644 index 0000000..417446e --- /dev/null +++ b/modules/battery.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + powertop upower acpid tlp + ]; + + services = { + upower.enable = true; + tlp.enable = true; + }; +} diff --git a/modules/cli-apps.nix b/modules/cli-apps.nix deleted file mode 100644 index ab6f5a9..0000000 --- a/modules/cli-apps.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - # Hardware managing apps - pipewire libinput lm_sensors lshw usbutils chrony iotop bluez efibootmgr libva-utils - parted dosfstools mtpfs ntfs3g squashfsTools - # Network - wget git rsync inetutils vnstat yt-dlp - # Working with files - neovim vim-full inotify-tools lsof tree xmlstarlet - # General usage - zsh dash htop rlwrap bc ddrescue cron - # Working with files - ffmpeg img2pdf pdftk imagemagick pngcrush jpegoptim optipng gd kid3 pandoc libisoburn mediainfo - # Archive formats - p7zip dpkg cdrtools zip unzip rar unrar rpm - # Misc - neofetch nixpkgs-2305.exa moc lazygit aspell - ]; - - # zsh - programs.zsh.enable = true; - environment.shells = with pkgs; [ zsh ]; - - # bluez - - programs = { - mtr.enable = true; - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - }; -} diff --git a/modules/cli-essential.nix b/modules/cli-essential.nix new file mode 100644 index 0000000..b3c38f5 --- /dev/null +++ b/modules/cli-essential.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + dash htop rlwrap bc + # Hardware + lm_sensors lshw + # Network + wget git rsync inetutils + # Files + vim-full + # Archive formats + gnutar p7zip zip unzip rar unrar + ]; + + programs = { + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + }; +} diff --git a/modules/cli-powerful.nix b/modules/cli-powerful.nix new file mode 100644 index 0000000..558adb5 --- /dev/null +++ b/modules/cli-powerful.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + neovim cron + # Hardware + usbutils chrony iotop efibootmgr libva-utils + # File systems + parted dosfstools mtpfs ntfs3g squashfsTools + # Network + vnstat yt-dlp + # Working with files + neovim inotify-tools lsof tree xmlstarlet + # Working with (media) files + ffmpeg img2pdf pdftk imagemagick pngcrush jpegoptim optipng gd kid3 pandoc libisoburn mediainfo + cdrtools rpm dpkg + # Misc + neofetch nixpkgs-2305.exa moc lazygit aspell ddrescue + ]; +} diff --git a/modules/desktop_archiving.nix b/modules/desktop_archiving.nix deleted file mode 100644 index f3b6de8..0000000 --- a/modules/desktop_archiving.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - timeshift - # k3s - ]; - - networking.firewall = { - allowedTCPPorts = [ 6443 ]; - }; - - services.k3s = { - enable = false; - role = "server"; - }; -} diff --git a/modules/dev-cli.nix b/modules/dev-cli.nix new file mode 100644 index 0000000..a701c2e --- /dev/null +++ b/modules/dev-cli.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + gnumake + lowdown wakatime cloc go php fontforge ruby csslint + # C/C++ + clang clang-tools glibc gcc gdb valgrind pugixml cmake libusb libusb-compat-0_1 meson + # .NET + dotnet-sdk mono + # Python + python3Minimal + # Android + android-tools heimdall + # awk + gawk mawk nawk + # DB + mysql sqlite sqlitebrowser flyway + # Functional + racket ghc sbcl + # Compilers + flex bison + ]; +} diff --git a/modules/dev-gui.nix b/modules/dev-gui.nix new file mode 100644 index 0000000..fd066f3 --- /dev/null +++ b/modules/dev-gui.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + # Networking + gns3-gui gns3-server dynamips + # Other + rstudio + ]; +} diff --git a/modules/dev.nix b/modules/dev.nix deleted file mode 100644 index b291692..0000000 --- a/modules/dev.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - gnumake - lowdown wakatime cloc go php fontforge ruby csslint - # C/C++ - clang clang-tools glibc gcc gdb valgrind pugixml cmake libusb libusb-compat-0_1 meson - # .NET - dotnet-sdk mono - # Python - python3Minimal - # Android - android-tools heimdall - # Networking - wireshark gns3-gui gns3-server dynamips - # awk - gawk mawk nawk - # DB - mysql sqlite sqlitebrowser flyway - # Functional - racket ghc sbcl - # Compilers - flex bison - rstudio - ]; -} diff --git a/modules/general-settings.nix b/modules/general-settings.nix deleted file mode 100644 index 652c55c..0000000 --- a/modules/general-settings.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, ... }: { - nixpkgs.config.allowUnfree = true; - - services.xserver = { - # xkbmap - layout = "us,bg-custom"; - xkbVariant = ",phonetic-nonstandard"; - xkbOptions = "grp:rwin_toggle,grp:alt_shift_toggle,lv3:switch,caps:escape"; - xkb.extraLayouts.bg-custom = { - description = "Non-standard variant of the traditional Bulgarian phonetic keyboard, which replaces some characters with their English counterparts"; - languages = [ "bg" ]; - symbolsFile = ../packages/bg-custom; - }; - - # touchpad support - libinput = { - enable = true; - touchpad.naturalScrolling = true; - }; - }; -} diff --git a/modules/gui-apps.nix b/modules/gui-apps.nix deleted file mode 100644 index 7817860..0000000 --- a/modules/gui-apps.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, ... }: -let - tex = (pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-medium - babel-bulgarian cyrillic cancel enumitem; - }); -in { - environment.systemPackages = with pkgs; [ - terminator - obs-studio qbittorrent speedcrunch - rtl-sdr gqrx sdrangel xed-editor - devilspie2 sxhkd - glava - # Settings and backup tools - feh xterm arandr pavucontrol blueberry piper - # Tray - copyq flameshot barrier redshift - # File openers/players - audacious mpv libreoffice - # File/image/audio editors - gimp inkscape texmaker tex krita ardour - # Web (app) clients - brave bitwarden nextcloud-client thunderbird birdtray - # System - peek gparted - # Virtualization - virt-manager libvirt qemu_kvm kvmtool qemu_full - ]; - - programs.firefox.enable = true; - - # libvirt - virtualisation.libvirtd.enable = true; - - # docker - virtualisation.docker.enable = true; - - # rtl-sdr - - systemd.user.services = { - devilspie2 = { - description = "devilspie2 runner"; - wantedBy = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${pkgs.devilspie2}/bin/devilspie2"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; - }; - }; -} diff --git a/modules/gui-essential.nix b/modules/gui-essential.nix new file mode 100644 index 0000000..09ee028 --- /dev/null +++ b/modules/gui-essential.nix @@ -0,0 +1,35 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + devilspie2 sxhkd speedcrunch peek wireshark + obs-studio qbittorrent glava + # Terminals + terminator xterm + # Settings and backup tools + feh arandr pavucontrol blueberry piper + # Tray + copyq flameshot barrier redshift + # File openers/players + audacious mpv libreoffice + # File editors + gimp xed-editor + # Web (app) clients + brave bitwarden nextcloud-client thunderbird birdtray + ]; + + programs.firefox.enable = true; + + systemd.user.services = { + devilspie2 = { + description = "devilspie2 runner"; + wantedBy = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${pkgs.devilspie2}/bin/devilspie2"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + }; +} diff --git a/modules/gui-powerful.nix b/modules/gui-powerful.nix new file mode 100644 index 0000000..469dd15 --- /dev/null +++ b/modules/gui-powerful.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + # File/image/audio editors + inkscape krita ardour + # System + gparted timeshift + ]; +} diff --git a/modules/hardware-general.nix b/modules/hardware-general.nix new file mode 100644 index 0000000..4f83454 --- /dev/null +++ b/modules/hardware-general.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + pipewire bluez + ]; + + programs = { + mtr.enable = true; + }; +} diff --git a/modules/hardware-laptop.nix b/modules/hardware-laptop.nix new file mode 100644 index 0000000..53fb737 --- /dev/null +++ b/modules/hardware-laptop.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + brightnessctl + libinput libinput-gestures + epkowa + ]; + + services.xserver = { + # touchpad support + libinput = { + enable = true; + touchpad.naturalScrolling = true; + }; + }; +} diff --git a/modules/keyboard.nix b/modules/keyboard.nix deleted file mode 100644 index 9dcc502..0000000 --- a/modules/keyboard.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - via qmk - ]; - services.udev.packages = with pkgs; [ - via qmk - ]; - hardware.keyboard.qmk.enable = true; -} diff --git a/modules/keyboards-custom.nix b/modules/keyboards-custom.nix new file mode 100644 index 0000000..9dcc502 --- /dev/null +++ b/modules/keyboards-custom.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + via qmk + ]; + services.udev.packages = with pkgs; [ + via qmk + ]; + hardware.keyboard.qmk.enable = true; +} diff --git a/modules/laptop_control.nix b/modules/laptop_control.nix deleted file mode 100644 index 95de027..0000000 --- a/modules/laptop_control.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - # Power - powertop upower acpid tlp - # Other - brightnessctl libinput-gestures epkowa - ]; - - services = { - upower.enable = true; - tlp.enable = true; - }; -} diff --git a/modules/openbox-de.nix b/modules/openbox-de.nix index 8102d6b..4d1bc2e 100644 --- a/modules/openbox-de.nix +++ b/modules/openbox-de.nix @@ -4,7 +4,7 @@ dbus cairo libnotify gtk3 yad gnome.zenity gnome.gvfs gmtp at-spi2-atk # Main apps and their config apps # window manager, compositor, taskbar, notifications, app menu, lockscreen, session manager - openbox lxappearance obconf picom nixpkgs-2305.tint2 dunst jgmenu i3lock-color lightdm lightdm-gtk-greeter + openbox lxappearance obconf picom nixpkgs-2305.tint2 dunst jgmenu i3lock-color lightdm lightdm-gtk-greeter # General X11 tools lxqt.lxqt-policykit xorg.xev xfontsel xorg.xmodmap xorg.xwininfo xorg.xprop clipnotify xdotool xautolock xcape xorg.setxkbmap xkbmon xorg.xhost xclip wmctrl menu-cache diff --git a/modules/rtl-sdr.nix b/modules/rtl-sdr.nix new file mode 100644 index 0000000..4347bf4 --- /dev/null +++ b/modules/rtl-sdr.nix @@ -0,0 +1,150 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + rtl-sdr gqrx sdrangel + ]; + + services.udev.extraRules = '' +# +# Copyright 2012-2013 Osmocom rtl-sdr project +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# original RTL2832U vid/pid (hama nano, for example) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2832", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# RTL2832U OEM vid/pid, e.g. ezcap EzTV668 (E4000), Newsky TV28T (E4000/R820T) etc. +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# DigitalNow Quad DVB-T PCI-E card (4x FC0012?) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0413", ATTRS{idProduct}=="6680", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Leadtek WinFast DTV Dongle mini D (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0413", ATTRS{idProduct}=="6f0f", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Genius TVGo DVB-T03 USB dongle (Ver. B) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0458", ATTRS{idProduct}=="707f", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec Cinergy T Stick Black (rev 1) (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00a9", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec NOXON rev 1 (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b3", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec Deutschlandradio DAB Stick (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b4", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec NOXON DAB Stick - Radio Energy (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b5", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec Media Broadcast DAB Stick (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b7", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec BR DAB Stick (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b8", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec WDR DAB Stick (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b9", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec MuellerVerlag DAB Stick (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00c0", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec Fraunhofer DAB Stick (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00c6", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec Cinergy T Stick RC (Rev.3) (E4000) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00d3", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec T Stick PLUS (E4000) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00d7", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Terratec NOXON rev 2 (E4000) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00e0", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# PixelView PV-DT235U(RN) (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1554", ATTRS{idProduct}=="5020", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Astrometa DVB-T/DVB-T2 (R828D) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="15f4", ATTRS{idProduct}=="0131", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# HanfTek DAB+FM+DVB-T +SUBSYSTEMS=="usb", ATTRS{idVendor}=="15f4", ATTRS{idProduct}=="0133", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Compro Videomate U620F (E4000) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0620", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Compro Videomate U650F (E4000) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0650", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Compro Videomate U680F (E4000) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0680", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# GIGABYTE GT-U7300 (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d393", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# DIKOM USB-DVBT HD +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d394", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Peak 102569AGPK (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d395", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# KWorld KW-UB450-T USB DVB-T Pico TV (TUA9001) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d397", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Zaapa ZT-MINDVBZP (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d398", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# SVEON STV20 DVB-T USB & FM (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d39d", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Twintech UT-40 (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3a4", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# ASUS U3100MINI_PLUS_V2 (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3a8", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# SVEON STV27 DVB-T USB & FM (FC0013) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3af", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# SVEON STV21 DVB-T USB & FM +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3b0", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Dexatek DK DVB-T Dongle (Logilink VG0002A) (FC2580) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1101", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Dexatek DK DVB-T Dongle (MSI DigiVox mini II V3.0) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1102", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Dexatek DK 5217 DVB-T Dongle (FC2580) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1103", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# MSI DigiVox Micro HD (FC2580) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1104", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Sweex DVB-T USB (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="a803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# GTek T803 (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="b803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# Lifeview LV5TDeluxe (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="c803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# MyGica TD312 (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="d286", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + +# PROlectrix DV107669 (FC0012) +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="d803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" + ''; +} diff --git a/modules/tex.nix b/modules/tex.nix new file mode 100644 index 0000000..9e45bb6 --- /dev/null +++ b/modules/tex.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +let + tex = (pkgs.texlive.combine { + inherit (pkgs.texlive) scheme-medium + babel-bulgarian cyrillic cancel enumitem; + }); +in { + environment.systemPackages = with pkgs; [ + texmaker tex + ]; +} + diff --git a/modules/users-standard.nix b/modules/users-standard.nix new file mode 100644 index 0000000..a9065d2 --- /dev/null +++ b/modules/users-standard.nix @@ -0,0 +1,16 @@ +{ config, pkgs, ... }: { + # zsh + programs.zsh.enable = true; + environment.shells = with pkgs; [ zsh ]; + # Thanks https://discourse.nixos.org/t/gns3-setcap-and-ubridge-gns3-unable-to-execute-setcap-command/13485/3 + users = { + groups.ubridge = {}; + users.kamen = { + isNormalUser = true; + extraGroups = [ "wheel" "audio" "video" "input" "lpadmin" "libvirtd" "lp" "scanner" "plugdev" "docker" "ubridge" ]; # Enable ‘sudo’ for the user. + packages = [ ]; + shell = pkgs.zsh; + homeMode = "711"; # mostly done for httpd access + }; + }; +} diff --git a/modules/virtualization.nix b/modules/virtualization.nix new file mode 100644 index 0000000..38c7536 --- /dev/null +++ b/modules/virtualization.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + virt-manager libvirt qemu_kvm kvmtool qemu_full + ]; + + virtualisation = { + libvirtd.enable = true; + docker.enable = true; + }; +} diff --git a/modules/web-server.nix b/modules/web-server.nix index f8a13b5..bb4a968 100644 --- a/modules/web-server.nix +++ b/modules/web-server.nix @@ -1,5 +1,7 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ apacheHttpd ]; + environment.systemPackages = with pkgs; [ + apacheHttpd + ]; services.httpd = { enable = true; diff --git a/modules/xserver.nix b/modules/xserver.nix new file mode 100644 index 0000000..05d50ec --- /dev/null +++ b/modules/xserver.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: { + services.xserver = { + # xkbmap + layout = "us,bg-custom"; + xkbVariant = ",phonetic-nonstandard"; + xkbOptions = "grp:rwin_toggle,grp:alt_shift_toggle,lv3:switch,caps:escape"; + xkb.extraLayouts.bg-custom = { + description = "Non-standard variant of the traditional Bulgarian phonetic keyboard, which replaces some characters with their English counterparts"; + languages = [ "bg" ]; + symbolsFile = ../packages/bg-custom; + }; + }; +} diff --git a/rtl-temp.nix b/rtl-temp.nix deleted file mode 100644 index 4f8f3c6..0000000 --- a/rtl-temp.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ pkgs, ... }: { - services.udev.extraRules = '' -# -# Copyright 2012-2013 Osmocom rtl-sdr project -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -# original RTL2832U vid/pid (hama nano, for example) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2832", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# RTL2832U OEM vid/pid, e.g. ezcap EzTV668 (E4000), Newsky TV28T (E4000/R820T) etc. -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# DigitalNow Quad DVB-T PCI-E card (4x FC0012?) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0413", ATTRS{idProduct}=="6680", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Leadtek WinFast DTV Dongle mini D (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0413", ATTRS{idProduct}=="6f0f", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Genius TVGo DVB-T03 USB dongle (Ver. B) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0458", ATTRS{idProduct}=="707f", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec Cinergy T Stick Black (rev 1) (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00a9", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec NOXON rev 1 (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b3", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec Deutschlandradio DAB Stick (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b4", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec NOXON DAB Stick - Radio Energy (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b5", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec Media Broadcast DAB Stick (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b7", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec BR DAB Stick (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b8", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec WDR DAB Stick (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b9", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec MuellerVerlag DAB Stick (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00c0", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec Fraunhofer DAB Stick (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00c6", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec Cinergy T Stick RC (Rev.3) (E4000) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00d3", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec T Stick PLUS (E4000) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00d7", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Terratec NOXON rev 2 (E4000) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00e0", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# PixelView PV-DT235U(RN) (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1554", ATTRS{idProduct}=="5020", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Astrometa DVB-T/DVB-T2 (R828D) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="15f4", ATTRS{idProduct}=="0131", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# HanfTek DAB+FM+DVB-T -SUBSYSTEMS=="usb", ATTRS{idVendor}=="15f4", ATTRS{idProduct}=="0133", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Compro Videomate U620F (E4000) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0620", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Compro Videomate U650F (E4000) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0650", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Compro Videomate U680F (E4000) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0680", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# GIGABYTE GT-U7300 (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d393", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# DIKOM USB-DVBT HD -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d394", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Peak 102569AGPK (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d395", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# KWorld KW-UB450-T USB DVB-T Pico TV (TUA9001) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d397", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Zaapa ZT-MINDVBZP (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d398", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# SVEON STV20 DVB-T USB & FM (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d39d", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Twintech UT-40 (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3a4", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# ASUS U3100MINI_PLUS_V2 (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3a8", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# SVEON STV27 DVB-T USB & FM (FC0013) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3af", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# SVEON STV21 DVB-T USB & FM -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3b0", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Dexatek DK DVB-T Dongle (Logilink VG0002A) (FC2580) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1101", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Dexatek DK DVB-T Dongle (MSI DigiVox mini II V3.0) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1102", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Dexatek DK 5217 DVB-T Dongle (FC2580) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1103", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# MSI DigiVox Micro HD (FC2580) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1104", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Sweex DVB-T USB (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="a803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# GTek T803 (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="b803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# Lifeview LV5TDeluxe (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="c803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# MyGica TD312 (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="d286", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - -# PROlectrix DV107669 (FC0012) -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="d803", ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev" - ''; -} -- cgit v1.3.1-23-gd82d