summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-12-17 12:47:26 -0500
committerFreya Murphy <freya@freyacat.org>2025-12-17 13:44:04 -0500
commit907fc4f87e44eadeaa11cf9a562216fd31630284 (patch)
tree594ac52cf3a5236d8f088cdc713c585e221e1673
parently: add animations, and fix save file in 1.3 (diff)
downloaddotfiles-nix-907fc4f87e44eadeaa11cf9a562216fd31630284.tar.gz
dotfiles-nix-907fc4f87e44eadeaa11cf9a562216fd31630284.tar.bz2
dotfiles-nix-907fc4f87e44eadeaa11cf9a562216fd31630284.zip
make unfree explicit and add more fonts
-rw-r--r--flake.nix1
-rw-r--r--home/desktops/default.nix21
-rw-r--r--hosts/shinji/default.nix2
-rw-r--r--system/default.nix3
-rw-r--r--system/gaming/steam.nix2
5 files changed, 21 insertions, 8 deletions
diff --git a/flake.nix b/flake.nix
index 57c266f..0e71c71 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,7 +82,6 @@
./options.nix
(self.lib.homeConfig hostModule.config)
{
- nixpkgs.config.allowUnfree = true;
programs.home-manager.enable = nixpkgs.lib.mkForce false;
}
];
diff --git a/home/desktops/default.nix b/home/desktops/default.nix
index 4d02984..c9353ad 100644
--- a/home/desktops/default.nix
+++ b/home/desktops/default.nix
@@ -16,6 +16,13 @@ in {
config = mkIf cfg.enable {
# desktop specific programs
+
+ nixpkgs.config.allowUnfreePredicate = pkg:
+ builtins.elem (lib.getName pkg) [
+ "corefonts"
+ "vista-fonts"
+ ];
+
home.packages = with pkgs;
[
# gtk
@@ -28,16 +35,28 @@ in {
# xdg
libnotify
# fonts
+ charis-sil
corefonts
dejavu_fonts
+ doulos-sil
fira-code
fira-code-symbols
jetbrains-mono
- material-icons
+ lmodern
+ lmmath
+ nasin-nanpa
nerd-fonts.fira-code
+ nerd-fonts.jetbrains-mono
noto-fonts
noto-fonts-cjk-sans
noto-fonts-color-emoji
+ open-sans
+ roboto
+ roboto-flex
+ roboto-mono
+ roboto-serif
+ roboto-slab
+ ttf_bitstream_vera
twemoji-color-font
vista-fonts
]
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index c6158c4..34e84ec 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -58,10 +58,8 @@
scrcpy
# misc
foliate
- #jami
solaar
qbittorrent
- unityhub
];
# modules
diff --git a/system/default.nix b/system/default.nix
index eb220ed..54abdcf 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -25,9 +25,6 @@
nix.settings.experimental-features = ["nix-command" "flakes"];
nix.settings.use-xdg-base-directories = true;
- # allow unfree packages
- nixpkgs.config.allowUnfree = true;
-
# set state version
system.stateVersion = config.stateVersion;
diff --git a/system/gaming/steam.nix b/system/gaming/steam.nix
index ada0aaf..dcdcad1 100644
--- a/system/gaming/steam.nix
+++ b/system/gaming/steam.nix
@@ -12,6 +12,7 @@ in {
"steam"
"steam-original"
"steam-runtime"
+ "steam-unwrapped"
];
programs.gamescope = {
@@ -28,7 +29,6 @@ in {
};
# controllers
- hardware.xone.enable = true;
hardware.steam-hardware.enable = true;
# cod