ryanccn/flake
1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2026-01-26 19:56:29 +01:00
Code Activity

feat: lix

Browse source
This commit is contained in:
Ryan Cao 2024-05-26 14:56:58 +08:00
parent 46cf265a54
commit e9455b9098
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
7 changed files with 116 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

107
flake.lock generated
View file

@ -22,11 +22,11 @@
}, },
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1713895615, "lastModified": 1716337435,
"narHash": "sha256-SVkxhcL0/IN5fNI2dqr702wXOnzktsm0LCEVGRAJQcY=", "narHash": "sha256-eZqH1vLI9eKL/N5toXxOrQO80G0y4pWZrYCp472YBVQ=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "a48e70a31616cb63e4794fd3465bff1835cc4246", "rev": "fea5242c0eacc5efa81be0e36206a62e889dbd82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,6 +88,21 @@
"type": "github" "type": "github"
} }
}, },
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -95,11 +110,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713992342, "lastModified": 1716457508,
"narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=", "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f072c127c041eec36621b8e38a531fe0fe07961", "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,6 +123,50 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1714955862,
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
"ref": "refs/tags/2.90-beta.1",
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
"revCount": 15501,
"type": "git",
"url": "https://git.lix.systems/lix-project/lix"
},
"original": {
"ref": "refs/tags/2.90-beta.1",
"type": "git",
"url": "https://git.lix.systems/lix-project/lix"
}
},
"lix-module": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flakey-profile": "flakey-profile",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1716506851,
"narHash": "sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM=",
"ref": "refs/heads/main",
"rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
"revCount": 83,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"nish": { "nish": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -135,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713946171, "lastModified": 1716511055,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +209,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713805509, "lastModified": 1716451822,
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "rev": "3305b2b25e4ae4baee872346eae133cf6f611783",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -177,11 +236,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713944914, "lastModified": 1716625548,
"narHash": "sha256-QxuqKjmgea6WKjHDjw1i7rm1Jo+bM2fRlxXb8foWxTk=", "narHash": "sha256-FuBUgaOepw3ewxDC8Ik1XDloit8raOqDK+fqG+QPT10=",
"owner": "ryanccn", "owner": "ryanccn",
"repo": "nrr", "repo": "nrr",
"rev": "3aaedaa3b3ef79f28d9eebbb5414313f83eebb1e", "rev": "ca529deed726d53168f0c310ecd13638cdaa3542",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,10 +258,8 @@
"locked": { "locked": {
"lastModified": 1705150397, "lastModified": 1705150397,
"narHash": "sha256-vanzV4QLle7AbXywX7x50YWYZZhtWzKa4IZl4u1CRis=", "narHash": "sha256-vanzV4QLle7AbXywX7x50YWYZZhtWzKa4IZl4u1CRis=",
"rev": "0a0d471e476bda2c6b031e291c4192712d9fbe31",
"revCount": 159,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.4/018d02e2-e4be-79a2-9e02-33bd5e483d6c/source.tar.gz" "url": "https://flakehub.com/f/ryanccn/nyoom/0.%2A.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -212,11 +269,11 @@
"ohmyzsh": { "ohmyzsh": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714025058, "lastModified": 1716461462,
"narHash": "sha256-spfi3Jdd9yjZ+1l4uz6QX7HF996VvbHwgtlTaHSrAXM=", "narHash": "sha256-XpEFBnIlv/plkCSHf8qSzeFDXGpFu8R/PYt7rj830iM=",
"owner": "ohmyzsh", "owner": "ohmyzsh",
"repo": "ohmyzsh", "repo": "ohmyzsh",
"rev": "803e1a784cd520f101d126b47deea3297e6a82fc", "rev": "1b29fd3a460e43d4a7581d6a6a7e5a1877a39068",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,6 +290,8 @@
"darwin-custom-icons": "darwin-custom-icons", "darwin-custom-icons": "darwin-custom-icons",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix": "lix",
"lix-module": "lix-module",
"nish": "nish", "nish": "nish",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@ -253,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714011248, "lastModified": 1716603336,
"narHash": "sha256-vKk9IOxZJ52Ao3uIRIjHRYYe+IpVOY6NzwToSxaO1J0=", "narHash": "sha256-81u/zd7V+XRTq88zwRLxw5GnwZyEiAvGA2BvAXUe864=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "9a2a11479b94afaf1ecc46384b27abda0d3d5f9d", "rev": "4d0f1e4d5d65c23cdbb77e4b0d91940be7309bd4",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -16,6 +16,18 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lix = {
url = "git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.nixpkgs.follows = "nixpkgs";
inputs.lix.follows = "lix";
inputs.flake-utils.follows = "flake-utils";
};
catppuccin = { catppuccin = {
url = "github:catppuccin/nix"; url = "github:catppuccin/nix";
}; };
@ -76,6 +88,7 @@
self, self,
nix-darwin, nix-darwin,
home-manager, home-manager,
lix-module,
darwin-custom-icons, darwin-custom-icons,
... ...
} @ inputs: { } @ inputs: {
@ -83,6 +96,7 @@
modules = [ modules = [
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
darwin-custom-icons.darwinModules.default darwin-custom-icons.darwinModules.default
lix-module.nixosModules.default
./system.nix ./system.nix
]; ];

4
home/apps/vscode.nix
View file

@ -53,9 +53,9 @@
in { in {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.stdenv.mkDerivation { package = pkgs.stdenvNoCC.mkDerivation {
pname = "vscode"; pname = "vscode";
version = "1.87.2"; version = "1.89.1";
dontUnpack = true; dontUnpack = true;
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out

3
home/default.nix
View file

@ -38,7 +38,8 @@
logFile = "${config.home.homeDirectory}/Library/Logs/am-discord-rich-presence.log"; logFile = "${config.home.homeDirectory}/Library/Logs/am-discord-rich-presence.log";
}; };
catppuccin.flavour = "frappe"; catppuccin.flavor = "frappe";
catppuccin.accent = "sapphire";
home.stateVersion = "23.05"; home.stateVersion = "23.05";
} }

2
home/programs/zsh.nix
View file

@ -20,7 +20,7 @@ in {
inherit shellAliases; inherit shellAliases;
localVariables = { localVariables = {
vivid_theme = "catppuccin-${config.catppuccin.flavour}"; vivid_theme = "catppuccin-${config.catppuccin.flavor}";
}; };
plugins = [ plugins = [

12
modules/nix.nix
View file

@ -1,12 +1,12 @@
{ {
self, self,
pkgs, # pkgs,
inputs, inputs,
config, config,
... ...
}: { }: {
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
nix.package = pkgs.nixVersions.unstable; # nix.package = pkgs.nixVersions.latest;
nix.registry = { nix.registry = {
n.flake = inputs.nixpkgs; n.flake = inputs.nixpkgs;
@ -26,6 +26,14 @@
sandbox = true; sandbox = true;
use-xdg-base-directories = true; use-xdg-base-directories = true;
extra-substituters = [
"https://cache.lix.systems"
];
extra-trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
];
nix-path = config.nix.nixPath; nix-path = config.nix.nixPath;
}; };

8
modules/packages.nix
View file

@ -40,7 +40,7 @@
# btop # btop
doggo doggo
doppler doppler
du-dust dust
fd fd
ffmpeg ffmpeg
gen-license gen-license
@ -48,7 +48,7 @@
hyperfine hyperfine
jq jq
just just
minica # minica
nerdfix nerdfix
ripgrep ripgrep
tokei tokei
@ -62,9 +62,9 @@
packwiz packwiz
catppuccin-catwalk catppuccin-catwalk
am
nish
nrr nrr
am
# nish
choirpack choirpack
nyoom nyoom