Compare commits

..

No commits in common. "3dbc1a527bfb5678e55bb46c1b1a1aae4d3d2387" and "c0eb9c6edc54a6b37e6e731e68994de52c5a114d" have entirely different histories.

View file

@ -9,8 +9,6 @@
[
# Include the results of the hardware scan.
./hardware-configuration.nix
# Support Brother scanner
<nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix>
# Include Framework-specific tweaks supported by the NixOS community
<nixos-hardware/framework/16-inch/common>
# This amazing script seems to cause the computer to not have a properly functioning screen
@ -36,7 +34,6 @@
calibre
contrast
# cruft
cups-brother-hll2375dw
curl
ddev
diffr
@ -57,17 +54,14 @@
# gimp-with-plugins # Currently breaks build, but works if in nix shell solo
git
git-open
gtk3 # for Pomodoro Prompt
gnucash
gnumake
gobject-introspection # for Pomodoro Prompt
# handbrake # converting video, https://handbrake.fr/
htop
hunspell
hunspellDicts.en_US-large
hunspellDicts.es_MX
inetutils # telnet among other things
# jitsi # - this is unusuable with a regular Jitsi Meet server like May First?
# jitsi - this is unusuable with a regular Jitsi Meet server like May First?
# jitsi-meet-electron # currently breaks build
jq
just
@ -88,8 +82,6 @@
kdePackages.kweather
# kdePackages.neochat # For matrix but relying on insecure olm-3.2.16
kdePackages.partitionmanager
kdePackages.print-manager
kdePackages.xdg-desktop-portal-kde
keepassxc
kirc
# kiwix
@ -120,17 +112,7 @@
php # does PHP 8.2 currently and there's php81, php83, and php84 alternatives
php82Packages.composer
# php84Packages.composer ansible_2_16
pinta # simple image editing
(python3.withPackages(ps: with ps; [
numpy
pandas
playsound
pycairo
pygobject3
python-dotenv
pytz
tzlocal
])) # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/python.section.md#environment-defined-in-etcnixosconfigurationnix-environment-defined-in-etcnixosconfigurationnix (note this is literally the last thing they wanted me to do, would rather it not be global) but i want Pomodoro Prompt and Parse Timelogs to be able to run directly.
(python3.withPackages(ps: with ps; [ numpy pandas python-dotenv ])) # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/python.section.md#environment-defined-in-etcnixosconfigurationnix-environment-defined-in-etcnixosconfigurationnix (note this is literally the last thing they wanted me to do, would rather it not be global)
poppins
postgresql
qrscan
@ -149,10 +131,8 @@
sioyek # Science-document-focused PDF viewer
slack
sly # simple image editing
spideroak # backups
starship # fancy command line prompt
strawberry-qt6
system-config-printer
tdf # Terminal PDF viewer
textpieces
tldr
@ -172,14 +152,13 @@
vscodium
# wcalc - command-line calculator but rink does that plus unit conversion!
wl-clipboard-rs
wrapGAppsHook # for Pomodoro Prompt
xorg.xkill
# xpdf # Simple PDF viewer - currently marked insecure
yt-dlp
zed-editor
zoxide
zulip
# zulip-term
zulip-term
];
environment.pathsToLink = [ "/share/fish" ];
@ -211,20 +190,6 @@
options = "--delete-older-than 60d";
};
# Hardware
# hardware.sane.enable = true; # enables support for SANE scanners per https://wiki.nixos.org/wiki/Scanners
hardware = {
sane = {
enable = true;
brscan4 = {
enable = true;
netDevices = {
home = { model = "HL-L2380DW"; ip = "192.168.178.23"; };
};
};
};
};
networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -281,14 +246,7 @@
console.keyMap = "dvorak";
# Enable CUPS to print documents.
services.printing.enable = true;
# Add Brother printer drivers, per https://nixos.wiki/wiki/Hardware/Brother
services.printing.drivers = [
pkgs.brlaser
pkgs.brgenml1lpr
pkgs.brgenml1cupswrapper
];
# services.printing.enable = true;
# Enable sound with pipewire.
services.pulseaudio.enable = false;
@ -324,7 +282,7 @@
users.users.mlncn = {
isNormalUser = true;
description = "mlncn";
extraGroups = [ "networkmanager" "wheel" "docker" "scanner" "lp" ];
extraGroups = [ "networkmanager" "wheel" "docker" ];
packages = with pkgs; [
discord
kdePackages.kate