mirror of
https://github.com/ryanccn/flake.git
synced 2025-12-06 08:10:43 +01:00
feat: lix, morlana, spdx-gen
This commit is contained in:
parent
b9832c59cf
commit
9cd5e745cd
GPG key ID:
48C96B2057D71CB1
6 changed files with 206 additions and 71 deletions
204
flake.lock
generated
204
flake.lock
generated
|
|
@ -2,16 +2,19 @@
|
|||
"nodes": {
|
||||
"am": {
|
||||
"inputs": {
|
||||
"nix-filter": [
|
||||
"nix-filter"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725406948,
|
||||
"narHash": "sha256-HsSvwWqJ5nETVuLomBx6AvL39NSBXf/b/oCQ2IMYcCY=",
|
||||
"lastModified": 1726126496,
|
||||
"narHash": "sha256-HJiUol162f37QXVVRLdkleT79K0UXKzXjZdc/WRKJHs=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "am",
|
||||
"rev": "8ba77d7600e56a71536b1d92863f8ac0df86783a",
|
||||
"rev": "9ae1b880aa0a67503bc34aebbd908e718acd1ca3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -22,11 +25,11 @@
|
|||
},
|
||||
"catppuccin": {
|
||||
"locked": {
|
||||
"lastModified": 1724469296,
|
||||
"narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=",
|
||||
"lastModified": 1725509983,
|
||||
"narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb",
|
||||
"rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -50,6 +53,39 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -57,11 +93,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725180166,
|
||||
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
|
||||
"lastModified": 1726785354,
|
||||
"narHash": "sha256-SLorVhoorZwjM1aS04bBX4fufEXIfkMdAGkj9bu2QAQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
|
||||
"rev": "1786e2afdbc48e9038f7cff585069736e1d0ed44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -70,23 +106,61 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nish": {
|
||||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723503926,
|
||||
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
|
||||
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": "lix",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694420535,
|
||||
"narHash": "sha256-dbFegxUbjyfgqE7WLU/ixPfNszov0cGjxqIA1wlatXI=",
|
||||
"lastModified": 1723510904,
|
||||
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
|
||||
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"morlana": {
|
||||
"inputs": {
|
||||
"nix-filter": [
|
||||
"nix-filter"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726541181,
|
||||
"narHash": "sha256-JnEtDtMj3hajOfmWbcXyiKbkorFIFRMsYvWnPNj3y58=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "nish",
|
||||
"rev": "cd74ffc6ded40715af06ee4aa72d4810e0d38d5e",
|
||||
"repo": "morlana",
|
||||
"rev": "6b508d33b4b72a0fb0d2ec09af4cf3094e20d070",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ryanccn",
|
||||
"repo": "nish",
|
||||
"repo": "morlana",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -97,11 +171,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725189302,
|
||||
"narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=",
|
||||
"lastModified": 1726742753,
|
||||
"narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda",
|
||||
"rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -132,11 +206,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725161148,
|
||||
"narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
|
||||
"lastModified": 1726449931,
|
||||
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "32058e9138248874773630c846563b1a78ee7a5b",
|
||||
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -147,11 +221,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1725194671,
|
||||
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
|
||||
"lastModified": 1726583932,
|
||||
"narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
|
||||
"rev": "658e7223191d2598641d50ee4e898126768fe847",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -163,17 +237,19 @@
|
|||
},
|
||||
"nrr": {
|
||||
"inputs": {
|
||||
"nix-filter": "nix-filter",
|
||||
"nix-filter": [
|
||||
"nix-filter"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725325795,
|
||||
"narHash": "sha256-UJLBuGfqrrjBSueCLKsncYDVl3yRfctH7qxPrPJs6eU=",
|
||||
"lastModified": 1726542944,
|
||||
"narHash": "sha256-nciuxw8aWKEJV/bI6FE0sfWBcrzrqDKKjXUrYcvBPOA=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "nrr",
|
||||
"rev": "959431ce40b8ea23e608bccf94ea4781fb0955a0",
|
||||
"rev": "a30318ebcd6cd74ee1e87edc3c92772db83dd1d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -189,26 +265,27 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722051904,
|
||||
"narHash": "sha256-gypsHQRmSH+SvmOh/swhiX0gES+EznnbTzroVWB3dyQ=",
|
||||
"rev": "854c3be2c22bd492d2b0f356d69ed079f2ca2878",
|
||||
"revCount": 172,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.6/0190f24b-8743-7f04-94aa-81d334f7326d/source.tar.gz"
|
||||
"lastModified": 1725406938,
|
||||
"narHash": "sha256-jOUqvLEO0SxUhBiGNq0J1lrLdkqfrngIpsiXZUM8R/c=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "nyoom",
|
||||
"rev": "63e9c00ebc4d838303d6398970c3dc1407c1fc28",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/ryanccn/nyoom/0.%2A.tar.gz"
|
||||
"owner": "ryanccn",
|
||||
"repo": "nyoom",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ohmyzsh": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1725399322,
|
||||
"narHash": "sha256-WR4Z/0PwbLFle4OHBol5BJCeHi4mE02XyF4VmV1l8ys=",
|
||||
"lastModified": 1726739091,
|
||||
"narHash": "sha256-F/SvOTDxfNI4ekdjXCmMlwiJyy8lzQH6Q27oApfHQe4=",
|
||||
"owner": "ohmyzsh",
|
||||
"repo": "ohmyzsh",
|
||||
"rev": "ab3d42a34cd0600b723de0accc248632f2dcf4e3",
|
||||
"rev": "1514145a09140425b914e9cd98fc1d638a8c4003",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -223,14 +300,17 @@
|
|||
"catppuccin": "catppuccin",
|
||||
"darwin-custom-icons": "darwin-custom-icons",
|
||||
"home-manager": "home-manager",
|
||||
"nish": "nish",
|
||||
"lix-module": "lix-module",
|
||||
"morlana": "morlana",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nix-filter": "nix-filter",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nrr": "nrr",
|
||||
"nyoom": "nyoom",
|
||||
"ohmyzsh": "ohmyzsh",
|
||||
"rust-overlay": "rust-overlay",
|
||||
"spdx-gen": "spdx-gen",
|
||||
"vivid-zsh": "vivid-zsh"
|
||||
}
|
||||
},
|
||||
|
|
@ -241,11 +321,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725416653,
|
||||
"narHash": "sha256-iNBv7ILlZI6ubhW0ExYy8YgiLKUerudxY7n8R5UQK2E=",
|
||||
"lastModified": 1726799228,
|
||||
"narHash": "sha256-wn1leQyMAc/TrLRKcPc0GX6YtoziKQpc/MtZjPNiJ2Q=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "e5d3f9c2f24d852cddc79716daf0f65ce8468b28",
|
||||
"rev": "ab150c7412db7bea5879ce2776718f53fba37aa2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -254,6 +334,44 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"spdx-gen": {
|
||||
"inputs": {
|
||||
"nix-filter": [
|
||||
"nix-filter"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726313584,
|
||||
"narHash": "sha256-R0DjdtepVaXVnEudrfGADjUzugxGeqxorF1LFjBb98U=",
|
||||
"owner": "ryanccn",
|
||||
"repo": "spdx-gen",
|
||||
"rev": "c890f777c211a8fbe30777f8f4ab6434b6106cac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ryanccn",
|
||||
"repo": "spdx-gen",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vivid-zsh": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
|||
36
flake.nix
36
flake.nix
|
|
@ -16,6 +16,11 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
catppuccin = {
|
||||
url = "github:catppuccin/nix";
|
||||
};
|
||||
|
|
@ -28,23 +33,32 @@
|
|||
am = {
|
||||
url = "github:ryanccn/am";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nish = {
|
||||
url = "github:ryanccn/nish";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nix-filter.follows = "nix-filter";
|
||||
};
|
||||
|
||||
nrr = {
|
||||
url = "github:ryanccn/nrr";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nix-filter.follows = "nix-filter";
|
||||
};
|
||||
|
||||
nyoom = {
|
||||
url = "https://flakehub.com/f/ryanccn/nyoom/0.*.tar.gz";
|
||||
url = "github:ryanccn/nyoom";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
morlana = {
|
||||
url = "github:ryanccn/morlana";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nix-filter.follows = "nix-filter";
|
||||
};
|
||||
|
||||
spdx-gen = {
|
||||
url = "github:ryanccn/spdx-gen";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nix-filter.follows = "nix-filter";
|
||||
};
|
||||
|
||||
rust-overlay = {
|
||||
url = "github:oxalica/rust-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -54,6 +68,10 @@
|
|||
url = "github:ryanccn/nix-darwin-custom-icons";
|
||||
};
|
||||
|
||||
nix-filter = {
|
||||
url = "github:numtide/nix-filter";
|
||||
};
|
||||
|
||||
ohmyzsh = {
|
||||
url = "github:ohmyzsh/ohmyzsh";
|
||||
flake = false;
|
||||
|
|
@ -69,17 +87,19 @@
|
|||
{
|
||||
self,
|
||||
nix-darwin,
|
||||
lix-module,
|
||||
home-manager,
|
||||
darwin-custom-icons,
|
||||
nix-index-database,
|
||||
darwin-custom-icons,
|
||||
...
|
||||
}@inputs:
|
||||
{
|
||||
darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem {
|
||||
modules = [
|
||||
lix-module.nixosModules.default
|
||||
home-manager.darwinModules.home-manager
|
||||
darwin-custom-icons.darwinModules.default
|
||||
nix-index-database.darwinModules.nix-index
|
||||
darwin-custom-icons.darwinModules.default
|
||||
./system.nix
|
||||
];
|
||||
|
||||
|
|
|
|||
10
justfile
10
justfile
|
|
@ -1,8 +1,12 @@
|
|||
switch *args:
|
||||
darwin-rebuild switch --flake . --verbose --show-trace {{args}}
|
||||
morlana switch {{args}}
|
||||
|
||||
delete-old:
|
||||
sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old && home-manager expire-generations now
|
||||
wipe-history:
|
||||
sudo -H nix profile wipe-history --profile "/nix/var/nix/profiles/default"
|
||||
sudo -H nix profile wipe-history --profile "/nix/var/nix/profiles/system"
|
||||
sudo -H nix profile wipe-history --profile "/nix/var/nix/profiles/per-user/root/profile"
|
||||
nix profile wipe-history --profile "${XDG_STATE_HOME-$HOME/.local/state}/nix/profiles/profile"
|
||||
nix profile wipe-history --profile "${XDG_STATE_HOME-$HOME/.local/state}/nix/profiles/home-manager"
|
||||
|
||||
update:
|
||||
nix flake update
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
{
|
||||
services.nix-daemon.enable = true;
|
||||
nix.package = pkgs.nixVersions.latest;
|
||||
# nix.package = pkgs.nixVersions.latest;
|
||||
|
||||
nix.registry = {
|
||||
n.flake = inputs.nixpkgs;
|
||||
|
|
@ -43,10 +43,13 @@
|
|||
nixpkgs = {
|
||||
overlays = [
|
||||
inputs.rust-overlay.overlays.default
|
||||
inputs.am.overlays.default
|
||||
inputs.nish.overlays.default
|
||||
|
||||
inputs.nrr.overlays.default
|
||||
inputs.am.overlays.default
|
||||
inputs.nyoom.overlays.default
|
||||
inputs.morlana.overlays.default
|
||||
inputs.spdx-gen.overlays.default
|
||||
|
||||
self.overlays.ryan-mono-bin
|
||||
self.overlays.ibm-plex
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
inputs.home-manager.packages.${pkgs.system}.home-manager
|
||||
|
||||
nixfmt-rfc-style
|
||||
alejandra
|
||||
nixpkgs-fmt
|
||||
|
|
@ -37,7 +35,6 @@
|
|||
dust
|
||||
fd
|
||||
ffmpeg
|
||||
gen-license
|
||||
gum
|
||||
hyperfine
|
||||
jq
|
||||
|
|
@ -52,12 +49,13 @@
|
|||
|
||||
typst
|
||||
packwiz
|
||||
spicetify-cli
|
||||
# spicetify-cli
|
||||
exiftool
|
||||
|
||||
nrr
|
||||
am
|
||||
# nish
|
||||
nyoom
|
||||
morlana
|
||||
spdx-gen
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
self,
|
||||
...
|
||||
|
|
@ -12,13 +11,6 @@
|
|||
./modules/fish.nix
|
||||
];
|
||||
|
||||
system.activationScripts.extraActivation = {
|
||||
text = ''
|
||||
set -eo pipefail
|
||||
HOME="/var/root" ${pkgs.lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
|
||||
'';
|
||||
};
|
||||
|
||||
security.pam.enableSudoTouchIdAuth = true;
|
||||
|
||||
environment.customIcons = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue