Compare commits

...

5 commits

View file

@ -7,7 +7,10 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
<framework/16-inch/common>
./hardware-configuration.nix ./hardware-configuration.nix
./framework-lid-workaround.nix
# Presumably need to re-add the Nix home-manager channel before adding this back.
# <home-manager/nixos> # <home-manager/nixos>
]; ];
@ -26,7 +29,7 @@
btop btop
calibre calibre
contrast contrast
cruft # cruft
curl curl
ddev ddev
diffr diffr
@ -43,13 +46,12 @@
floorp floorp
fsearch fsearch
getxbook getxbook
# gimp-with-plugins # Currently breaks bulid # gimp-with-plugins # Currently breaks build, but works if in nix shell solo
git git
git-open git-open
gnucash gnucash
gnumake gnumake
dig # handbrake # converting video, https://handbrake.fr/
handbrake # converting video, https://handbrake.fr/
htop htop
hunspell hunspell
hunspellDicts.en_US-large hunspellDicts.en_US-large
@ -73,12 +75,12 @@
kdePackages.krecorder kdePackages.krecorder
kdePackages.kruler kdePackages.kruler
kdePackages.kweather kdePackages.kweather
kdePackages.neochat # For matrix but relying on insecure olm-3.2.16 # kdePackages.neochat # For matrix but relying on insecure olm-3.2.16
kdePackages.partitionmanager kdePackages.partitionmanager
keepassxc keepassxc
kirc kirc
kiwix # kiwix
kiwix-tools # kiwix-tools
kupfer # a nice launcher, installed because my main desktop screen is broken and i needed a way to see what apps i was picking kupfer # a nice launcher, installed because my main desktop screen is broken and i needed a way to see what apps i was picking
libinput libinput
libreoffice-qt6-still # this is basically unusable, graphics all mis-aligned libreoffice-qt6-still # this is basically unusable, graphics all mis-aligned
@ -91,9 +93,10 @@
meld meld
mkcert mkcert
mmv mmv
ncdu
neovim # aka nvim neovim # aka nvim
nextcloud-client nextcloud-client
nheko # For matrix but relying on insecure olm-3.2.16 # nheko # For matrix but relying on insecure olm-3.2.16
# nfs-utils # nfs-utils
nix-search-cli nix-search-cli
onlyoffice-desktopeditors onlyoffice-desktopeditors
@ -145,6 +148,7 @@
xorg.xkill xorg.xkill
# xpdf # Simple PDF viewer - currently marked insecure # xpdf # Simple PDF viewer - currently marked insecure
yt-dlp yt-dlp
zed-editor
zoxide zoxide
zulip zulip
zulip-term zulip-term
@ -307,10 +311,9 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# TODO remove this when Logseq gets its act together # TODO remove this when Logseq gets its act together
nixpkgs.config.permittedInsecurePackages = [ # nixpkgs.config.permittedInsecurePackages = [
"electron-27.3.11" # "olm-3.2.16"
"olm-3.2.16" # ];
];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.