From 9c08a9e0ef8b37de83f75100f1b94cdd1fb368d8 Mon Sep 17 00:00:00 2001
From: ediblerope <fredrik@nordhammer.it>
Date: Wed, 8 Apr 2026 14:03:34 +0100
Subject: [PATCH] Rename fastfetch.nix -> settings/shell.nix, remove flatpaks

- Move shell/prompt/font config from apps/fastfetch.nix to settings/shell.nix
- Remove flatpaks.nix and nix-flatpak flake input (no flatpak packages in use)
- Update readme structure and flake inputs table

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/flatpaks.nix                        | 21 ---------------------
 common.nix                               |  3 +--
 flake.lock                               | 16 ----------------
 flake.nix                                |  4 +---
 readme.md                                |  4 +---
 apps/fastfetch.nix => settings/shell.nix |  0
 6 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 apps/flatpaks.nix
 rename apps/fastfetch.nix => settings/shell.nix (100%)

diff --git a/apps/flatpaks.nix b/apps/flatpaks.nix
deleted file mode 100644
index 6b7a271..0000000
--- a/apps/flatpaks.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  config = lib.mkIf (lib.elem config.networking.hostName [ "FredOS-Gaming" "FredOS-Macbook" ]) {
-    services.flatpak = {
-      enable = true;
-
-      remotes = [
-        {
-          name = "flathub";
-          location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-        }
-      ];
-
-      packages = [
-        # zen now installed via flake, no longer needed here
-      ];
-
-      overrides = {};
-    };
-  };
-}
\ No newline at end of file
diff --git a/common.nix b/common.nix
index 7ab991b..7e093d2 100644
--- a/common.nix
+++ b/common.nix
@@ -13,8 +13,7 @@
     ./settings/locale.nix
     ./settings/audio.nix
     ./settings/users.nix
-    ./apps/fastfetch.nix
-    ./apps/flatpaks.nix
+    ./settings/shell.nix
     ./apps/zen.nix
 
     # Services #
diff --git a/flake.lock b/flake.lock
index 9c4206b..cb4588f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -109,21 +109,6 @@
         "type": "github"
       }
     },
-    "nix-flatpak": {
-      "locked": {
-        "lastModified": 1768656715,
-        "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1775231746,
@@ -175,7 +160,6 @@
       "inputs": {
         "home-manager": "home-manager",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
-        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_2",
         "zen-browser": "zen-browser"
       }
diff --git a/flake.nix b/flake.nix
index ac8e5c8..bb65a86 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,10 +14,9 @@
       };
     };
   
-    nix-flatpak.url = "github:gmodena/nix-flatpak";
     nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
   };
-  outputs = { self, nixpkgs, home-manager, zen-browser, nix-flatpak, nix-cachyos-kernel, ... } @ inputs:
+  outputs = { self, nixpkgs, home-manager, zen-browser, nix-cachyos-kernel, ... } @ inputs:
   let
     system = "x86_64-linux";
     mkHost = hostname: nixpkgs.lib.nixosSystem {
@@ -28,7 +27,6 @@
         ./hosts/hardware/${hostname}.nix 
         ./common.nix
         home-manager.nixosModules.home-manager
-        nix-flatpak.nixosModules.nix-flatpak
       ];
     };
   in {
diff --git a/readme.md b/readme.md
index 2c870bc..6ceed3a 100644
--- a/readme.md
+++ b/readme.md
@@ -17,8 +17,6 @@ Flake-based NixOS configuration for three machines, built and deployed directly
 │   └── workflows
 │       └── update.yml               # Auto-updates flake.lock daily
 ├── apps
-│   ├── fastfetch.nix                # Fastfetch config
-│   ├── flatpaks.nix                 # Flatpak apps
 │   └── zen.nix                      # Zen browser config
 ├── home-manager
 │   ├── fred.nix                     # User-level Home Manager config
@@ -51,6 +49,7 @@ Flake-based NixOS configuration for three machines, built and deployed directly
 │   ├── audio.nix                    # PipeWire / audio config
 │   ├── gnome.nix                    # GNOME desktop settings
 │   ├── locale.nix                   # Locale, timezone, keyboard
+│   ├── shell.nix                    # Fish shell, powerline prompt, fastfetch, nerd fonts
 │   └── users.nix                    # User accounts
 ├── walls                            # Wallpapers
 ├── common.nix                       # Shared config imported by all hosts
@@ -162,7 +161,6 @@ After this succeeds, the plain `update` alias works from then on.
 | nixpkgs | `github:NixOS/nixpkgs/nixos-unstable` |
 | home-manager | `github:nix-community/home-manager` |
 | zen-browser | `github:0xc000022070/zen-browser-flake` |
-| nix-flatpak | `github:gmodena/nix-flatpak` |
 | nix-cachyos-kernel | `github:xddxdd/nix-cachyos-kernel/release` |
 
 ## Mediaserver secrets
diff --git a/apps/fastfetch.nix b/settings/shell.nix
similarity index 100%
rename from apps/fastfetch.nix
rename to settings/shell.nix