nixos-dots

commit bc1737501f02c8b2e108ec94c2774001d8ec2f35
parent be59d5c16f8dffc180c29d9979fac2c1a2735e9d
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Sat,  7 Mar 2026 17:44:27 +0100

remove darwin unsupported packages

Diffstat:
M
modules/packages.nix
 | 
23
++++++++++++++---------
M
system/host/mac.nix
 | 
3
+--
M
users/mika.nix
 | 
44
+++++++++++++++++++++++---------------------

3 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, isDarwin }:
 let
   fetchSucklessRepo = repo: hash: pkgs.fetchgit {
     url = "git://popovic.xyz/${repo}.git";
@@ -68,6 +68,7 @@ with pkgs; {
     whois
     nmap
     wireguard-tools
+  ] ++ lib.optionals (!isDarwin) [
     nextcloud-client
     tigervnc
   ];
@@ -86,23 +87,25 @@ with pkgs; {
     power-profiles-daemon
     pavucontrol
     pamixer
+  ] ++ (with suckless; [ dwm st dmenu slock dwmblocks ]);
 
-    #fonts
+  fonts = [
     noto-fonts-color-emoji
     font-awesome
     noto-fonts
-  ] ++ (with suckless; [ dwm st dmenu slock dwmblocks ]);
+  ];
 
   media = [
     mpv
-    vlc
     spotify
-    gimp
-    sxiv
     inkscape
     imagemagick
     mediainfo
     transmission_4
+  ] ++ lib.optionals (!isDarwin) [
+    vlc
+    sxiv
+    gimp
   ];
 
   communication = [
@@ -111,11 +114,9 @@ with pkgs; {
   ];
 
   fileManagement = [
-    nautilus
     lf
     file
     poppler-utils
-    gnome-epub-thumbnailer
     atool
     odt2txt
     djvulibre
@@ -125,13 +126,18 @@ with pkgs; {
     zathuraPkgs.zathura_cb
     zathuraPkgs.zathura_djvu
     zathuraPkgs.zathura_pdf_mupdf
+  ] ++ lib.optionals (!isDarwin) [
+    nautilus
+    gnome-epub-thumbnailer
   ];
 
   office = [
     groff
+  ] ++ lib.optionals (!isDarwin) [
     libreoffice-fresh
   ];
 
+
   email = [
     neomutt
     msmtp
@@ -166,7 +172,6 @@ with pkgs; {
     lua5_1
     go
     ruby
-    gem
     php
     julia-bin
     python3
diff --git a/system/host/mac.nix b/system/host/mac.nix
@@ -46,6 +46,7 @@
 
   system.primaryUser = "mika";
 
+  nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs; [
     neovim
     wget
@@ -55,12 +56,10 @@
     tree
     coreutils
     stdenv
-    dbus-broker
     pciutils
     util-linux
     pstree
     wireguard-tools
-    kitty
   ];
 
 
diff --git a/users/mika.nix b/users/mika.nix
@@ -8,28 +8,37 @@
 }:
 let
 
-  packageSets = import ../modules/packages.nix { inherit pkgs; };
+  packageSets = import ../modules/packages.nix { inherit pkgs isDarwin; };
 
   link = config.lib.file.mkOutOfStoreSymlink;
   inherit (import ../lib/dotfiles.nix) dotfiles;
   configDirs = builtins.attrNames (builtins.readDir "${dotfiles}/.config");
 in
 {
+  nixpkgs = if standalone
+  then {
+    config.allowUnfree = true;
+  } else
+    {};
+
   home = {
     username = "mika";
     stateVersion = if isDarwin then "25.05" else "25.11";
-    packages = with packageSets; lib.flatten [
-      system
-      shell
-      cli
-      xorg
-      media
-      fileManagement
-      network
-      office
-      email
-      development
-    ];
+    packages = lib.flatten (
+      with packageSets; [
+        system
+        shell
+        cli
+        media
+        fileManagement
+        network
+        office
+        fonts
+        email
+        development
+      ]  ++ lib.optionals (!isDarwin) [ xorg ]
+    );
+
     file = {
       ".zshenv".source = link "${dotfiles}/.zshenv";
       ".local" = {
@@ -52,6 +61,7 @@ in
       size = 18;
     };
     settings = {
+      background_opacity = 0.93;
       confirm_os_window_close = 0;
     };
   };
@@ -67,14 +77,6 @@ in
     ]
     ++ lib.optional (!isDarwin) [ ../modules/theme.nix ];
 
-  nixpkgs = if standalone
-  then {
-    config.allowUnfree = true;
-  } else
-    {};
-
-
-
   xdg.configFile = let
     filteredDirs = builtins.filter (dir: dir != "systemd") configDirs;
   in