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>
This commit is contained in:
parent
b774869b0d
commit
9c08a9e0ef
6 changed files with 3 additions and 45 deletions
|
|
@ -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 = {};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -13,8 +13,7 @@
|
||||||
./settings/locale.nix
|
./settings/locale.nix
|
||||||
./settings/audio.nix
|
./settings/audio.nix
|
||||||
./settings/users.nix
|
./settings/users.nix
|
||||||
./apps/fastfetch.nix
|
./settings/shell.nix
|
||||||
./apps/flatpaks.nix
|
|
||||||
./apps/zen.nix
|
./apps/zen.nix
|
||||||
|
|
||||||
# Services #
|
# Services #
|
||||||
|
|
|
||||||
16
flake.lock
generated
16
flake.lock
generated
|
|
@ -109,21 +109,6 @@
|
||||||
"type": "github"
|
"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": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775231746,
|
"lastModified": 1775231746,
|
||||||
|
|
@ -175,7 +160,6 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-cachyos-kernel": "nix-cachyos-kernel",
|
"nix-cachyos-kernel": "nix-cachyos-kernel",
|
||||||
"nix-flatpak": "nix-flatpak",
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,9 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-flatpak.url = "github:gmodena/nix-flatpak";
|
|
||||||
nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
|
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
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
mkHost = hostname: nixpkgs.lib.nixosSystem {
|
mkHost = hostname: nixpkgs.lib.nixosSystem {
|
||||||
|
|
@ -28,7 +27,6 @@
|
||||||
./hosts/hardware/${hostname}.nix
|
./hosts/hardware/${hostname}.nix
|
||||||
./common.nix
|
./common.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,6 @@ Flake-based NixOS configuration for three machines, built and deployed directly
|
||||||
│ └── workflows
|
│ └── workflows
|
||||||
│ └── update.yml # Auto-updates flake.lock daily
|
│ └── update.yml # Auto-updates flake.lock daily
|
||||||
├── apps
|
├── apps
|
||||||
│ ├── fastfetch.nix # Fastfetch config
|
|
||||||
│ ├── flatpaks.nix # Flatpak apps
|
|
||||||
│ └── zen.nix # Zen browser config
|
│ └── zen.nix # Zen browser config
|
||||||
├── home-manager
|
├── home-manager
|
||||||
│ ├── fred.nix # User-level Home Manager config
|
│ ├── 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
|
│ ├── audio.nix # PipeWire / audio config
|
||||||
│ ├── gnome.nix # GNOME desktop settings
|
│ ├── gnome.nix # GNOME desktop settings
|
||||||
│ ├── locale.nix # Locale, timezone, keyboard
|
│ ├── locale.nix # Locale, timezone, keyboard
|
||||||
|
│ ├── shell.nix # Fish shell, powerline prompt, fastfetch, nerd fonts
|
||||||
│ └── users.nix # User accounts
|
│ └── users.nix # User accounts
|
||||||
├── walls # Wallpapers
|
├── walls # Wallpapers
|
||||||
├── common.nix # Shared config imported by all hosts
|
├── 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` |
|
| nixpkgs | `github:NixOS/nixpkgs/nixos-unstable` |
|
||||||
| home-manager | `github:nix-community/home-manager` |
|
| home-manager | `github:nix-community/home-manager` |
|
||||||
| zen-browser | `github:0xc000022070/zen-browser-flake` |
|
| zen-browser | `github:0xc000022070/zen-browser-flake` |
|
||||||
| nix-flatpak | `github:gmodena/nix-flatpak` |
|
|
||||||
| nix-cachyos-kernel | `github:xddxdd/nix-cachyos-kernel/release` |
|
| nix-cachyos-kernel | `github:xddxdd/nix-cachyos-kernel/release` |
|
||||||
|
|
||||||
## Mediaserver secrets
|
## Mediaserver secrets
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue