hosts/seven-red-suns/default.nix

@@ -16,13 +16,13 @@
     # debug
     strace ltrace lsof
     # apps
-    vivaldi telegram-desktop onlyoffice-bin mpv qalculate-gtk krita
+    vivaldi telegram-desktop onlyoffice-bin mpv qalculate-gtk
     # compatilibility
     wineWowPackages.waylandFull winetricks
     # misc
     cowsay file which tree gnused yt-dlp prismlauncher
   ] ++ (with pkgs.my; [
-    olympus iterator-icons
+    olympus
   ]);
 
   # usually you don't need to do this, but this is a workaround for https://github.com/flameshot-org/flameshot/issues/3328
@@ -30,10 +30,6 @@
 
   modules = {
     security.useDoas = true;
-    os-release = {
-      enable = true;
-      logo = "seven-red-suns";
-    };
 
     hardware = {
       pipewire.enable = true;

modules/desktop/fonts.nix

@@ -87,12 +87,6 @@ in {
     hm.gtk.font = {
       inherit (cfg.fonts.sans) package name size;
     };
-
-    hm.dconf.settings = {
-      "org/gnome/desktop/interface".font-name = with cfg.fonts.sans; "${family} ${toString size}";
-      "org/gnome/desktop/interface".document-font-name = with cfg.fonts.sansSerif; "${family} ${toString size}";
-      "org/gnome/desktop/interface".monospace-font-name = with cfg.fonts.monospace; "${family} ${toString size}";
-    };
   } // (mkIf cfg.baseFonts {
     fonts.packages = with pkgs; [
       fira-code

modules/desktop/themes/default.nix

@@ -41,11 +41,6 @@ in {
     hm.dconf = {
       enable = true;
       settings."org/gnome/desktop/interface".color-scheme = mkIf cfg.dark "prefer-dark";
-      settings."org/gnome/desktop/interface".gtk-theme = cfg.gtkTheme.name;
-      settings."org/gnome/desktop/interface".icon-theme = cfg.iconTheme.name;
-      settings."org/gnome/desktop/interface".cursor-theme = cfg.cursor.name;
-
-      settings."org/gnome/shell/extensions/user-theme".name = cfg.gtkTheme.name;
     };
 
     hm.gtk = {
@@ -54,6 +49,8 @@ in {
       iconTheme = cfg.iconTheme;
       theme = cfg.gtkTheme;
     };
+    hm.dconf.settings."org/gnome/desktop/interface/gtk-theme".name = cfg.gtkTheme.name;
+    hm.dconf.settings."org/gnome/shell/extensions/user-theme".name = cfg.gtkTheme.name;
 
     hm.programs.vscode = {
       extensions = [ cfg.editor.vscode.extension ];

modules/os-release.nix

@@ -1,20 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.modules.os-release;
-in {
-  options.modules.os-release = {
-    enable = mkEnableOption "Modify /etc/os-release. Highly cursed";
-    logo = mkOption { type = types.str; };
-  };
-
-  config = mkIf cfg.enable {
-    environment.etc."os-release" = let
-      orig = config.environment.etc."os-release".text; # help
-      replaced = replaceStrings [ "nix-snowflake" ] [ cfg.logo ] orig;
-    in {
-      source = mkForce (pkgs.writeText "os-release" replaced);
-    };
-  };
-}

modules/software/distractions/steam.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, ... }:
 
 with lib;
 let
@@ -16,6 +16,5 @@ in {
       enableRenice = true;
       settings = {};
     };
-    user.packages = [ pkgs.protontricks pkgs.steam-run ];
   };
 }

packages/iterator-icons/default.nix

@@ -1,17 +0,0 @@
-{ stdenv, ... }:
-
-stdenv.mkDerivation {
-  pname = "iterator-icons";
-  version = "0.0.0";
-
-  src = ./.;
-
-  dontDropIconThemeCache = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/icons/hicolor/256x256/apps/
-    cp -a ./icons/* $out/share/icons/hicolor/256x256/apps/
-    runHook postInstall
-  '';
-}