Compare commits

..

5 commits

Author SHA1 Message Date
d773e3e00e
flake: switch back to upstream nixos-apple-silicon 2024-09-03 22:10:35 -07:00
46db1307aa
flake.lock: Update
Flake lock file updates:

• Updated input 'apple-silicon':
    'github:rowanG077/nixos-apple-silicon/fc4503fa956c4f07b5cb0b7d446a04be25786402' (2024-09-01)
  → 'github:tpwrules/nixos-apple-silicon/c5f944f49a052232015bb3c03524b69e3fdd2aa4' (2024-09-04)
• Updated input 'homebrew-core':
    'github:homebrew/homebrew-core/d9a29bbb79fbfd7b8beb12b4fe85ce2e45313686' (2024-09-04)
  → 'github:homebrew/homebrew-core/835e3c4a685aaa3a486f3b1a7650bdb45a909ee3' (2024-09-04)
2024-09-03 22:10:17 -07:00
d8ca796ca6
flake: cleanup and optimize 2024-09-03 22:07:28 -07:00
a9a0c541c2
flake.lock: Update
Flake lock file updates:

• Updated input 'bleedingpkgs':
    'github:nixos/nixpkgs/3926acdb812e54a8ebbc302096bfff57702d5ae4' (2024-09-03)
  → 'github:nixos/nixpkgs/da61b0d477d44ffcee7ba9e94f1bdb187ad07f51' (2024-09-04)
• Updated input 'homebrew-cask':
    'github:homebrew/homebrew-cask/6b2f8cfb4d42254bb5140469b2ccd1dafda6fc4e' (2024-09-03)
  → 'github:homebrew/homebrew-cask/038345617b1398a7d039d87f757948a4ab34a86c' (2024-09-04)
• Updated input 'homebrew-core':
    'github:homebrew/homebrew-core/e25f8891d66c87360a5e3fc7350715f1b092b4cf' (2024-09-03)
  → 'github:homebrew/homebrew-core/d9a29bbb79fbfd7b8beb12b4fe85ce2e45313686' (2024-09-04)
• Updated input 'nixpkgs-unstable-small':
    'github:nixos/nixpkgs/66a352a3f27a2eb2f27e42a13c6fe245d3be2b98' (2024-09-02)
  → 'github:nixos/nixpkgs/2830c7c930311397d94c0b86a359c865c081c875' (2024-09-03)
• Updated input 'spicetify':
    'github:Gerg-L/spicetify-nix/0f66eb16c0cb63406b8477740ffd41e4e0c301a1' (2024-09-02)
  → 'github:Gerg-L/spicetify-nix/16d0e7b426971032c7d6b5f7f008a573b84a56c6' (2024-09-04)
• Updated input 'zen-browser':
    'github:youwen5/zen-browser-flake/cfc894abb631e3ea61ff590b7520d79d35a26366' (2024-08-31)
  → 'github:youwen5/zen-browser-flake/9c9a6a8073f800d949ffd68a6f4a1531998082ce' (2024-09-04)
2024-09-03 21:54:04 -07:00
fa3207315a
chore: remove nix_auto_run 2024-09-03 15:19:23 -07:00
6 changed files with 65 additions and 264 deletions

View file

@ -9,36 +9,19 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1725213692,
"narHash": "sha256-owQBVWS05OKLjDrPkQW5+gGz/SNgIF7/9nZLkZ0bkFw=",
"owner": "rowanG077",
"lastModified": 1725418254,
"narHash": "sha256-2zPzPP9Eu5NxgJxTVcuCCX5xh7CWy7rYaLHfaAZS6H8=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "fc4503fa956c4f07b5cb0b7d446a04be25786402",
"rev": "c5f944f49a052232015bb3c03524b69e3fdd2aa4",
"type": "github"
},
"original": {
"owner": "rowanG077",
"ref": "fix-mesa",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"type": "github"
}
},
"bleedingpkgs": {
"locked": {
"lastModified": 1725326305,
"narHash": "sha256-trzG3WG13pOfHywgdvMBZYR16TOGfBbznPb3isymDfM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3926acdb812e54a8ebbc302096bfff57702d5ae4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"brew-src": {
"flake": false,
"locked": {
@ -92,27 +75,6 @@
"type": "github"
}
},
"crane_2": {
"inputs": {
"nixpkgs": [
"manga-tui",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724006180,
"narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=",
"owner": "ipetkov",
"repo": "crane",
"rev": "7ce92819802bc583b7e82ebc08013a530f22209f",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"devshell": {
"inputs": {
"nixpkgs": [
@ -347,24 +309,6 @@
"type": "github"
}
},
"flake-utils_6": {
"inputs": {
"systems": "systems_6"
},
"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,
@ -503,11 +447,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1725325813,
"narHash": "sha256-lQkDBXLX/db6HY+udVhT7x4tZFvXKdsTrOT/Aj0WeMI=",
"lastModified": 1725425401,
"narHash": "sha256-tyyX5kyab6HbRj2Yy0TMidlnvTk4Sm2rLGF36rFhP7g=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "6b2f8cfb4d42254bb5140469b2ccd1dafda6fc4e",
"rev": "038345617b1398a7d039d87f757948a4ab34a86c",
"type": "github"
},
"original": {
@ -519,11 +463,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1725326300,
"narHash": "sha256-kQusLJaCJhEBGLCRg2DRCz+dU1HqKekW9xpGF9hMOh8=",
"lastModified": 1725426272,
"narHash": "sha256-D99zdyyWCq6ZM895Qq369Fg+2c/WcEHtZWx31cPWtkw=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "e25f8891d66c87360a5e3fc7350715f1b092b4cf",
"rev": "835e3c4a685aaa3a486f3b1a7650bdb45a909ee3",
"type": "github"
},
"original": {
@ -594,27 +538,6 @@
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
}
},
"manga-tui": {
"inputs": {
"crane": "crane_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1725296113,
"narHash": "sha256-efc0PIjDxo/RkrvfPBYfrcvGpqVhcaSnJ1HNFCLxIiM=",
"owner": "josueBarretogit",
"repo": "manga-tui",
"rev": "5c9129a3406a62378685a57de40ee5ba2ced3cc5",
"type": "github"
},
"original": {
"owner": "josueBarretogit",
"repo": "manga-tui",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
@ -637,7 +560,7 @@
},
"nix-darwin_2": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1716329735,
@ -678,9 +601,11 @@
"nix-homebrew": {
"inputs": {
"brew-src": "brew-src",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs_3"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719720211,
@ -698,18 +623,15 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs-lib": {
@ -742,11 +664,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1725274606,
"narHash": "sha256-xXINAjCR8eTmp3AxZTk/PIH9nNoFNN0OM7MUw6eB7oQ=",
"lastModified": 1725361206,
"narHash": "sha256-/HTUg+kMaqBPGrcQBYboAMsQHIWIkuKRDldss/035Hc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "66a352a3f27a2eb2f27e42a13c6fe245d3be2b98",
"rev": "2830c7c930311397d94c0b86a359c865c081c875",
"type": "github"
},
"original": {
@ -757,35 +679,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
@ -801,54 +694,6 @@
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
@ -880,7 +725,7 @@
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"personal-neovim",
"nixvim",
@ -904,7 +749,9 @@
"personal-neovim": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5",
"nixpkgs": [
"nixpkgs"
],
"nixvim": "nixvim"
},
"locked": {
@ -951,21 +798,18 @@
"root": {
"inputs": {
"apple-silicon": "apple-silicon",
"bleedingpkgs": "bleedingpkgs",
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core",
"lanzaboote": "lanzaboote",
"lix-module": "lix-module",
"manga-tui": "manga-tui",
"nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"personal-neovim": "personal-neovim",
"spicetify": "spicetify",
"stablepkgs": "stablepkgs",
"vesktop-bin": "vesktop-bin",
"wallpapers": "wallpapers",
"zen-browser": "zen-browser"
@ -1012,27 +856,6 @@
"type": "github"
}
},
"rust-overlay_3": {
"inputs": {
"nixpkgs": [
"manga-tui",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724206841,
"narHash": "sha256-L8dKaX4T3k+TR2fEHCfGbH4UXdspovz/pj87iai9qmc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "45e98fbd62c32e5927e952d2833fa1ba4fb35a61",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"spicetify": {
"inputs": {
"flake-compat": "flake-compat_4",
@ -1041,11 +864,11 @@
]
},
"locked": {
"lastModified": 1725250580,
"narHash": "sha256-OJ123JRnfuTYp0FYcQuFGvSB9uxw41sIJS6ojStUEkI=",
"lastModified": 1725423405,
"narHash": "sha256-h+2PmbkeB6cITOitcDuakWjgPDTeYnIfQifBvpUYnIY=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "0f66eb16c0cb63406b8477740ffd41e4e0c301a1",
"rev": "16d0e7b426971032c7d6b5f7f008a573b84a56c6",
"type": "github"
},
"original": {
@ -1054,22 +877,6 @@
"type": "github"
}
},
"stablepkgs": {
"locked": {
"lastModified": 1725001927,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@ -1145,21 +952,6 @@
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -1184,8 +976,10 @@
},
"vesktop-bin": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_6"
"flake-utils": "flake-utils_5",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1724592759,
@ -1219,14 +1013,16 @@
},
"zen-browser": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1725096998,
"narHash": "sha256-ylP5YehroiFnf1AIT5yq1mcc8HUVlj9ItsWCtY6J6ck=",
"lastModified": 1725425585,
"narHash": "sha256-yAQIw1wZlhdZaIt9VjiiMhWCx3hndVk1ZV9Boq0CIXs=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "cfc894abb631e3ea61ff590b7520d79d35a26366",
"rev": "9c9a6a8073f800d949ffd68a6f4a1531998082ce",
"type": "github"
},
"original": {

View file

@ -3,8 +3,8 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
bleedingpkgs.url = "github:nixos/nixpkgs/master";
# stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# bleedingpkgs.url = "github:nixos/nixpkgs/master";
nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
home-manager = {
@ -17,7 +17,10 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
nix-homebrew = {
url = "github:zhaofengli-wip/nix-homebrew";
inputs.nixpkgs.follows = "nixpkgs";
};
homebrew-core = {
url = "github:homebrew/homebrew-core";
@ -38,8 +41,6 @@
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.1";
# Optional but recommended to limit the size of your system closure.
inputs.nixpkgs.follows = "nixpkgs";
};
@ -49,7 +50,7 @@
};
apple-silicon = {
url = "github:rowanG077/nixos-apple-silicon/fix-mesa";
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -58,18 +59,25 @@
inputs.nixpkgs.follows = "nixpkgs";
};
personal-neovim.url = "github:youwen5/neovim-flake";
personal-neovim = {
url = "github:youwen5/neovim-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
vesktop-bin.url = "github:youwen5/vesktop-bin-flake";
vesktop-bin = {
url = "github:youwen5/vesktop-bin-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
wallpapers = {
url = "git+https://code.youwen.dev/youwen5/wallpapers";
flake = false;
};
zen-browser.url = "github:youwen5/zen-browser-flake";
manga-tui.url = "github:josueBarretogit/manga-tui";
zen-browser = {
url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =

View file

@ -172,7 +172,6 @@
environment.variables = {
EDITOR = "nvim";
NIX_AUTO_RUN = 1;
};
# tells electron apps to use Wayland

View file

@ -135,7 +135,6 @@
environment.variables = {
EDITOR = "nvim";
NIX_AUTO_RUN = 1;
};
services.keyd = {
enable = true;

View file

@ -155,7 +155,6 @@
environment.variables = {
EDITOR = "nvim";
NIX_AUTO_RUN = 1;
};
# tells electron apps to use Wayland

View file

@ -4,8 +4,8 @@
...
}:
let
stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
# stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
# bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
in
{