diff options
| -rw-r--r-- | desktop.nix | 72 | ||||
| -rw-r--r-- | pc_t14.nix | 11 |
2 files changed, 47 insertions, 36 deletions
diff --git a/desktop.nix b/desktop.nix index 740cab7..7aa65f1 100644 --- a/desktop.nix +++ b/desktop.nix @@ -101,39 +101,39 @@ ]; environment.systemPackages = with pkgs; [ - # General stuff - gopass stow pass gnupg imagemagick acpi gdb sox - - # Nixos stuff - nox nix-index patchelf - - # Network stuff - networkmanagerapplet networkmanager-openconnect iw - wirelesstools - - # Developing - rustup gcc go clang-tools python38Packages.ipython - - # X stuff - feh rofi xorg.xmodmap xss-lock xclip xorg.xkill - acpilight xdotool dunst xcompmgr scrot libnotify i3lock - xbindkeys - - # Gui applications - firefox pavucontrol evince leafpad inkscape gimp - meld pinentry gnome3.gnome-system-monitor - termite quasselClient wireshark spotify - gnome3.file-roller gnome3.gnome-calculator - gnome3.simple-scan vlc mpv xorg.xev - gnome3.evolution evolution-data-server vimHugeX - (mumble.override { pulseSupport = true; }) - libreoffice-fresh liferea qutebrowser mate.caja - audacity - - # Other stuff - texlive.combined.scheme-medium biber - youtube-dl sshpass python38Packages.pynvim - aspell aspellDicts.da aspellDicts.en - ffmpegthumbnailer tio - ]; - } + # General stuff + gopass stow pass gnupg imagemagick acpi gdb sox + + # Nixos stuff + nox nix-index patchelf + + # Network stuff + networkmanagerapplet networkmanager-openconnect iw + wirelesstools + + # Developing + rustup gcc go clang-tools python38Packages.ipython + + # X stuff + feh rofi xorg.xmodmap xss-lock xclip xorg.xkill + acpilight xdotool dunst xcompmgr scrot libnotify i3lock + xbindkeys + + # Gui applications + firefox pavucontrol evince leafpad inkscape gimp + meld pinentry gnome3.gnome-system-monitor + termite quasselClient wireshark spotify + gnome3.file-roller gnome3.gnome-calculator + gnome3.simple-scan vlc mpv xorg.xev + gnome3.evolution evolution-data-server vimHugeX + (mumble.override { pulseSupport = true; }) + libreoffice-fresh liferea qutebrowser mate.caja + audacity + + # Other stuff + texlive.combined.scheme-medium biber + youtube-dl sshpass python38Packages.pynvim + aspell aspellDicts.da aspellDicts.en + ffmpegthumbnailer tio + ]; +} @@ -8,6 +8,15 @@ interfaces.wlp3s0.useDHCP = true; }; + networking = { + # We want to NAT container traffic + nat = { + enable = true; + internalInterfaces = [ "ve-test" ]; + externalInterface = "wlp3s0"; + }; + }; + boot = { kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.8") pkgs.linuxPackages_5_10; loader = { @@ -50,6 +59,8 @@ environment.systemPackages = with pkgs; [ linuxPackages.acpi_call + + acpilight ]; } |