Compare commits
2 Commits
99aea69128
...
7eb32cfabc
| Author | SHA1 | Date | |
|---|---|---|---|
|
7eb32cfabc
|
|||
|
f9308dda9e
|
@@ -1,28 +1,29 @@
|
||||
root := `pwd`
|
||||
NH := "IMPURE_ROOT=" + root + " nh"
|
||||
|
||||
all: fmt switch
|
||||
|
||||
switch:
|
||||
@echo "Rebuilding NixOS..."
|
||||
@nh os switch .
|
||||
@{{NH}} os switch . --impure
|
||||
|
||||
switch-offline:
|
||||
@echo "Rebuilding NixOS without net..."
|
||||
@nh os switch . --no-net
|
||||
@{{NH}} os switch . --impure --no-net
|
||||
|
||||
offline:
|
||||
@echo "Rebuilding NixOS without net..."
|
||||
@nh os switch . --no-net
|
||||
alias offline := switch-offline
|
||||
|
||||
boot:
|
||||
@echo "Rebuilding NixOS..."
|
||||
@nh os boot .
|
||||
@{{NH}} os boot . --impure
|
||||
|
||||
test:
|
||||
@echo "Rebuilding NixOS..."
|
||||
@nh os test .
|
||||
@{{NH}} os test . --impure
|
||||
|
||||
vm:
|
||||
@echo "Building NixOS VM..."
|
||||
@nh os build-vm .
|
||||
@{{NH}} os build-vm . --impure
|
||||
|
||||
update:
|
||||
@echo "Updating flakes..."
|
||||
@@ -47,5 +48,3 @@ gc:
|
||||
fmt:
|
||||
@echo "Formatting nix files..."
|
||||
@nix fmt
|
||||
|
||||
.PHONY: all switch switch-offline boot test vm update repl cleandry clean gc fmt
|
||||
23
README.md
23
README.md
@@ -10,7 +10,7 @@ Currently, this repository contains the nix code that builds:
|
||||
2. NixOS home server
|
||||
3. NixOS WSL
|
||||
|
||||
See [./config/hosts](./config/hosts) for details of each host.
|
||||
See [./hosts](./hosts) for details of each host.
|
||||
|
||||
## Why NixOS & Flakes?
|
||||
|
||||
@@ -25,23 +25,6 @@ As for Flakes, refer to
|
||||
This configuration uses [flake-parts](https://flake.parts/) for better flake organization and modularity,
|
||||
enabling declarative host definitions and cleaner separation of concerns.
|
||||
|
||||
## Components
|
||||
|
||||
| | NixOS(Wayland) |
|
||||
| ----------------------------- | :------------------------------------------- |
|
||||
| **Window Manager** | Niri |
|
||||
| **Desktop Shell** | Noctalia Shell |
|
||||
| **Terminal Emulator** | Kitty |
|
||||
| **Input method framework** | Fcitx5 |
|
||||
| **Shell** | Zsh |
|
||||
| **Netease Cloudmusic Player** | go-musicfox |
|
||||
| **Media Player** | mpv |
|
||||
| **Text Editor** | Neovim |
|
||||
| **Fonts** | Noto Sans CJK & Jetbrains Mono & Nerd Font |
|
||||
| **Filesystem** | Btrfs |
|
||||
|
||||
And more...
|
||||
|
||||
## Folder Structure
|
||||
|
||||
- `modules/` - custom NixOS modules
|
||||
@@ -55,7 +38,7 @@ And more...
|
||||
- `profiles/desktop.nix` - desktop environment configuration
|
||||
- `profiles/server.nix` - server-specific configuration
|
||||
- `profiles/wsl.nix` - WSL-specific configuration
|
||||
- `config/hosts/<name>/` - host-specific configs
|
||||
- `hosts/<name>/` - host-specific configs
|
||||
- `flake/` - flake-parts modules
|
||||
- `flake/hosts.nix` - declarative host definitions
|
||||
- `lib/` - custom nix library
|
||||
@@ -63,4 +46,4 @@ And more...
|
||||
- `overlays/` - nixpkgs overlays
|
||||
- `vars.nix` - my variables
|
||||
- `secrets/` - secrets managed by sops-nix. see [./secrets](./secrets) for details
|
||||
- `flake.nix` - flake entry
|
||||
- `flake.nix` - flake entry
|
||||
|
||||
@@ -51,7 +51,7 @@ in
|
||||
type = lib.types.listOf lib.types.deferredModule;
|
||||
default = (
|
||||
lib.umport {
|
||||
paths = [ ../config/hosts/${name} ];
|
||||
paths = [ ../hosts/${name} ];
|
||||
extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
|
||||
recursive = true;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, inputs }:
|
||||
lib.extend (
|
||||
self: super: {
|
||||
umport = import ./umport.nix { lib = self; };
|
||||
inherit (inputs.home-manager.lib) hm;
|
||||
umport = import ./umport.nix { lib = self; };
|
||||
haumea = inputs.haumea.lib;
|
||||
infuse = (import inputs.infuse { inherit lib; }).v1.infuse;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
impure,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@@ -14,11 +15,8 @@ in
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
my.hm = {
|
||||
xdg.configFile."nvim/init.lua".source = ./nvim/init.lua;
|
||||
xdg.configFile."nvim/lua" = {
|
||||
source = ./nvim/lua;
|
||||
recursive = true;
|
||||
};
|
||||
xdg.configFile."nvim/init.lua".source = impure.mkImpureLink ./nvim/init.lua;
|
||||
xdg.configFile."nvim/lua".source = impure.mkImpureLink ./nvim/lua;
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
|
||||
@@ -15,6 +15,7 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
my.hm = {
|
||||
home.packages = with pkgs; [
|
||||
just
|
||||
gnumake
|
||||
github-cli # gh
|
||||
];
|
||||
|
||||
26
modules/impure.nix
Normal file
26
modules/impure.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
self,
|
||||
...
|
||||
}:
|
||||
let
|
||||
relativePath =
|
||||
path:
|
||||
assert lib.types.path.check path;
|
||||
lib.strings.removePrefix (toString self) (toString path);
|
||||
mkImpureLink =
|
||||
path:
|
||||
let
|
||||
relative = relativePath path;
|
||||
in
|
||||
pkgs.runCommandLocal relative { } "ln -s ${lib.escapeShellArg (impureRoot + relative)} $out";
|
||||
impureRoot =
|
||||
let
|
||||
impureRoot = builtins.getEnv "IMPURE_ROOT";
|
||||
in
|
||||
if impureRoot == "" then throw "IMPURE_ROOT is not set" else impureRoot;
|
||||
in
|
||||
{
|
||||
_module.args.impure = { inherit mkImpureLink; };
|
||||
}
|
||||
Reference in New Issue
Block a user