Compare commits

..

No commits in common. "e157bc90cd8820a820b7c9a08140f8087fcda7d2" and "90d41328c1893eadce16ee5f1dcc41bb43ecd393" have entirely different histories.

14 changed files with 57 additions and 62 deletions

50
flake.lock generated
View file

@ -23,24 +23,6 @@
"type": "github" "type": "github"
} }
}, },
"calibre-plugins": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1742395204,
"narHash": "sha256-RhI3wa1OCIjpkgwI8FEt1n3DlDP6w9W4jA+E3h6KdZU=",
"ref": "refs/heads/main",
"rev": "a131835a6016b8538d4e66e79eeb6393f436ee8c",
"revCount": 6,
"type": "git",
"url": "https://git.ccnlc.eu/nydragon/calibre-plugins.git"
},
"original": {
"type": "git",
"url": "https://git.ccnlc.eu/nydragon/calibre-plugins.git"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -283,26 +265,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742335908, "lastModified": 1742069588,
"narHash": "sha256-unmSiGsXmUAZ4fAcSgf1iwssLmt/FLrczhLAsosyLh8=", "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fb9a9ddebc6c9685d2b6b98b35f134573e1872c8", "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1742288794,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,7 +279,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741462378, "lastModified": 1741462378,
"narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=",
@ -328,7 +295,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1741851582, "lastModified": 1741851582,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
@ -388,7 +355,7 @@
}, },
"quasigod": { "quasigod": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"snowfall-lib": "snowfall-lib" "snowfall-lib": "snowfall-lib"
}, },
"locked": { "locked": {
@ -407,7 +374,7 @@
}, },
"quickshell": { "quickshell": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1738200090, "lastModified": 1738200090,
@ -426,14 +393,13 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"calibre-plugins": "calibre-plugins",
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"hjem": "hjem", "hjem": "hjem",
"hjem-rum": "hjem-rum", "hjem-rum": "hjem-rum",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nur": "nur", "nur": "nur",
"nysh": "nysh", "nysh": "nysh",
"wallpapers": "wallpapers" "wallpapers": "wallpapers"

View file

@ -47,8 +47,6 @@
}; };
wallpapers.url = "git+https://git.ccnlc.eu/nydragon/wallpapers.git"; wallpapers.url = "git+https://git.ccnlc.eu/nydragon/wallpapers.git";
calibre-plugins.url = "git+https://git.ccnlc.eu/nydragon/calibre-plugins.git";
}; };
outputs = outputs =

View file

@ -1,7 +1,7 @@
# This file contains default settings used across different systems # This file contains default settings used across different systems
{ {
imports = [ imports = [
./themes/vanilla.nix ./themes/catppuccin.nix
./graphical ./graphical
./terminal ./terminal
./desktop ./desktop

View file

@ -2,6 +2,7 @@
self, self,
pkgs, pkgs,
lib, lib,
osConfig,
... ...
}: }:
let let
@ -24,5 +25,9 @@ in
(mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png") (mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
(mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png") (mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
]; ];
mimeApps = {
enable = true;
defaultApplications = osConfig.xdg.mime.defaultApplications;
};
}; };
} }

View file

@ -11,7 +11,7 @@ in
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = {
name = "Adwaita-dark"; name = "Adwaita";
package = pkgs.gnome-themes-extra; package = pkgs.gnome-themes-extra;
}; };
iconTheme = rec { iconTheme = rec {

View file

@ -39,6 +39,7 @@ in
xdg = { xdg = {
portal.enable = true; portal.enable = true;
mime.enable = true;
}; };
modules = { modules = {

View file

@ -67,6 +67,7 @@ in
xdg = { xdg = {
portal.enable = true; portal.enable = true;
mime.enable = true;
}; };
specialisation = { specialisation = {

View file

@ -63,11 +63,6 @@
comment = "backup location for games"; comment = "backup location for games";
mode = "write"; mode = "write";
} }
{
name = "brontes-backup";
comment = "brontes's backup space";
mode = "write";
}
]; ];
}; };
}; };

View file

@ -48,9 +48,6 @@
"octoprint" "octoprint"
"assistant" "assistant"
"rss" "rss"
"calibre"
"prometheus"
"grafana"
]; ];
}; };
}; };

View file

@ -10,6 +10,7 @@
./system/printing.nix ./system/printing.nix
./system/audio.nix ./system/audio.nix
./system/mime.nix
./system/polkit.nix ./system/polkit.nix
./users/ny.nix ./users/ny.nix

View file

@ -1,4 +1,5 @@
{ {
inputs,
inputs', inputs',
config, config,
lib, lib,
@ -7,6 +8,21 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
# Add env vars to calibre so they may get propagated to a plugin that needs them
calibre = prev.calibre.overrideAttrs (old: {
postInstall = ''
wrapProgram $out/bin/calibre \
--set QT_QPA_PLATFORM xcb \
--set-default ACSM_LIBCRYPTO ${prev.openssl.out}/lib/libcrypto.so \
--set-default ACSM_LIBSSL ${prev.openssl.out}/lib/libssl.so
'';
});
lollypop = prev.lollypop.override {
#lastFMSupport = false;
youtubeSupport = false;
};
scripts = import ../../home/scripts { scripts = import ../../home/scripts {
inherit lib config; inherit lib config;
pkgs = prev.pkgs; pkgs = prev.pkgs;

23
modules/system/mime.nix Normal file
View file

@ -0,0 +1,23 @@
{
xdg.mime = {
defaultApplications =
let
fileManager = "org.gnome.Nautilus.desktop";
browser = "firefox-esr.desktop";
in
{
"inode/directory" = fileManager;
"application/zip" = fileManager;
"application/pdf" = browser;
"x-www-browser" = browser;
"text/html" = browser;
"application/vnd.comicbook+zip" = "com.github.johnfactotum.Foliate.desktop";
"application/epub+zip" = "com.github.johnfactotum.Foliate.desktop";
"image/*" = "org.gnome.Loupe.desktop";
"image/png" = "org.gnome.Loupe.desktop";
"image/jpeg" = "org.gnome.Loupe.desktop";
"x-scheme-handler/http" = browser;
"x-scheme-handler/https" = browser;
};
};
}

View file

@ -88,8 +88,6 @@ in
"audio/mpeg" = cfg.audio.default; "audio/mpeg" = cfg.audio.default;
# Ebooks sadly don't have a singular major type. # Ebooks sadly don't have a singular major type.
"application/epub+zip" = cfg.ebook.default; "application/epub+zip" = cfg.ebook.default;
"application/pdf" = cfg.ebook.default;
"application/vnd.comicbook+zip" = cfg.ebook.default;
}; };
}; };
}; };

View file

@ -7,7 +7,6 @@
}: }:
let let
inherit (config.modules.meta) username; inherit (config.modules.meta) username;
calibrePlugins = inputs'.calibre-plugins.packages;
in in
{ {
hjem = { hjem = {
@ -17,11 +16,6 @@ in
./programs ./programs
./misc ./misc
]; ];
files = {
".config/calibre/plugins/ACSM Input.zip".source = calibrePlugins.acsm-calibre-plugin;
".config/calibre/plugins/DeDRM.zip".source = calibrePlugins.dedrm-plugin;
};
}; };
specialArgs = { specialArgs = {
libmy = lib.my; libmy = lib.my;