winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

chore(flake): rework flake inputs, upgrade

Browse source
This commit is contained in:
winston 2023-06-12 05:52:11 +02:00
parent ba48867642
commit a3a7d73503
Signed by: winston
GPG key ID: 3786770EDBC2B481
3 changed files with 98 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

216
flake.lock
View file

@ -2,7 +2,9 @@
"nodes": {
"caarlos0-nur": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1685836117,
@ -23,20 +25,23 @@
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2",
"nixpkgs": [
"nekowinston-nur",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1676846788,
"narHash": "sha256-XLsHLgXyMdliMeAXuzdGP+TXBaV44kG1RPTUHNOs6Jk=",
"lastModified": 1686108916,
"narHash": "sha256-looLH5MdY4erLiJw0XwQohGdr0fJL9y6TJY3898RA2U=",
"owner": "ipetkov",
"repo": "crane",
"rev": "953b70da2813fb882c39890f2514e7db76fc8843",
"rev": "8ab1a49432695bd80ff4b7f6c6515da0e926d922",
"type": "github"
},
"original": {
"owner": "ipetkov",
"ref": "v0.11.3",
"ref": "v0.12.2",
"repo": "crane",
"type": "github"
}
@ -48,11 +53,11 @@
]
},
"locked": {
"lastModified": 1685559570,
"narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=",
"lastModified": 1686307493,
"narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4338bc869e9874d54a4c89539af72f16666b2abe",
"rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f",
"type": "github"
},
"original": {
@ -128,12 +133,15 @@
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
@ -144,7 +152,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_2"
"systems": "systems_3"
},
"locked": {
"lastModified": 1685518550,
@ -188,11 +196,11 @@
]
},
"locked": {
"lastModified": 1685885003,
"narHash": "sha256-+OB0EvZBfGvnlTGg6mtyUCqkMnUp9DkmRUU4d7BZBVE=",
"lastModified": 1686391840,
"narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "607d8fad96436b134424b9935166a7cd0884003e",
"rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f",
"type": "github"
},
"original": {
@ -204,15 +212,15 @@
"nekowinston-nur": {
"inputs": {
"crane": "crane",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs",
"wezterm-src": "wezterm-src"
},
"locked": {
"lastModified": 1685997467,
"narHash": "sha256-LS4IdZKOI08mTEitGpKHiUHse1RnfZT1s6NoMP1S7nc=",
"lastModified": 1686467098,
"narHash": "sha256-M3QFKrqJNrr0Y9+/Oc4K0tbmohn/c/0n0btzEukaqjc=",
"owner": "nekowinston",
"repo": "nur",
"rev": "f271dc66af80f6b2e38bb5511930fd2210d255cc",
"rev": "60418c2cae799fdae71daf3dfaf746b94d43393f",
"type": "github"
},
"original": {
@ -243,11 +251,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1685677062,
"narHash": "sha256-zoHF7+HNwNwne2XEomphbdc4Y8tdWT16EUxUTXpOKpQ=",
"lastModified": 1686398752,
"narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "95be94370d09f97f6af6a1df1eb9649b5260724e",
"rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6",
"type": "github"
},
"original": {
@ -259,75 +267,27 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
"owner": "NixOS",
"lastModified": 1686536960,
"narHash": "sha256-P5VTmM/lOI2DXjn54eoTE322rhCQfxHy/twHNypV8PE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
"rev": "63e752bbac363c48481fe054339e35d636dc2694",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1685758009,
"narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.11",
"owner": "nixos",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1676426280,
"narHash": "sha256-7DltKPrvCP0A9Iemv2ts1vnBYn5xQKScK/sb1VALlao=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6d33e5e14fd12f99ba621683ae90cebadda753ca",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1685894048,
"narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2e56a850786211972d99d2bb39665a9b5a1801d6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1685938391,
"narHash": "sha256-96Jw6TbWDLSopt5jqCW8w1Fc1cjQyZlhfBnJ3OZGpME=",
"lastModified": 1686488075,
"narHash": "sha256-2otSBt2hbeD+5yY25NF3RhWx7l5SDt1aeU3cJ/9My4M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "31cd1b4afbaf0b1e81272ee9c31d1ab606503aed",
"rev": "9401a0c780b49faf6c28adf55764f230301d0dce",
"type": "github"
},
"original": {
@ -337,45 +297,13 @@
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1685866647,
"narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1685833905,
"narHash": "sha256-dKM4Wfb4PMorBGzB3WntleHDN3rz/AiWmbqyFkj9Qzs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ed7bbf16855a9ec919e5c6372ba3a297ec1df550",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1685994311,
"narHash": "sha256-Jun6nq/l8VIbD4YKHyvfEK/Z46UwzgEZJj4CFKloocI=",
"lastModified": 1686541497,
"narHash": "sha256-6ijjY+jNP53F0iVZZ6QesLJ6ic6rGC93FgBUA46Qbm8=",
"owner": "nix-community",
"repo": "nur",
"rev": "79c58f8e4cfd78a798eddbd2496e181f2a482e90",
"rev": "bf20fd39704e093378009777fa4f90041b4fe1cc",
"type": "github"
},
"original": {
@ -389,15 +317,19 @@
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable"
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": [
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1685970613,
"narHash": "sha256-sMbR4zPciUfQ6YHt6GNVxT/yhWJKngvZo8qHzYkaU6E=",
"lastModified": 1686213770,
"narHash": "sha256-Re6xXLEqQ/HRnThryumyGzEf3Uv0Pl4cuG50MrDofP8=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "a117a1cd2c280bf8d499f26370fddfe1923e75e6",
"rev": "182af51202998af5b64ddecaa7ff9be06425399b",
"type": "github"
},
"original": {
@ -414,7 +346,8 @@
"home-manager": "home-manager",
"nekowinston-nur": "nekowinston-nur",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable",
"nur": "nur",
"pre-commit-hooks": "pre-commit-hooks",
"sops": "sops",
@ -435,11 +368,11 @@
]
},
"locked": {
"lastModified": 1676437770,
"narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=",
"lastModified": 1685759304,
"narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e",
"rev": "c535b4f3327910c96dcf21851bbdd074d0760290",
"type": "github"
},
"original": {
@ -450,15 +383,19 @@
},
"sops": {
"inputs": {
"nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": [
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1685848844,
"narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=",
"lastModified": 1686453485,
"narHash": "sha256-75iPAcS6xuw4SNfqLmFCi9wWG1JmDNKaC8l3WJUkmDk=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b",
"rev": "cb85e297937af1bd1434cf5f85a3f86a21dc8207",
"type": "github"
},
"original": {
@ -475,11 +412,11 @@
]
},
"locked": {
"lastModified": 1685908099,
"narHash": "sha256-8+frzClBRjRln2sNz6h7k3scz46RWVLIa0+Ybc6mPT8=",
"lastModified": 1686111766,
"narHash": "sha256-aXkCN/pmWFZQZAGTwq/4jtUK+wp283cNAa/leq8yNbc=",
"owner": "willpower3309",
"repo": "swayfx",
"rev": "3e6626d6c3c876cd043c8589a59c448016bff377",
"rev": "edd7aa72bc4ea8766d6a82325d7c9b36fe9a2025",
"type": "github"
},
"original": {
@ -518,6 +455,21 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wezterm-src": {
"flake": false,
"locked": {

18
flake.nix
View file

@ -3,21 +3,21 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
darwin = {
url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.05";
darwin.url = "github:lnl7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# NUR
nur.url = "github:nix-community/nur";
nekowinston-nur.url = "github:nekowinston/nur";
caarlos0-nur.url = "github:nekowinston/caarlos0-nur/feat/add-apple-music-discord-module";
caarlos0-nur.inputs.nixpkgs.follows = "nixpkgs";
sops.url = "github:Mic92/sops-nix";
sops.inputs.nixpkgs.follows = "nixpkgs";
sops.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
@ -25,6 +25,8 @@
swayfx.inputs.nixpkgs.follows = "nixpkgs";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
pre-commit-hooks.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
flake-utils.url = "github:numtide/flake-utils";
};

5
home/apps/i3.nix
View file

@ -492,7 +492,6 @@ in {
layer_effects "swaync-notification-window" blur enable; shadows enable; corner_radius 5;
'';
systemdIntegration = true;
wrapperFeatures = {
base = true;
gtk = true;
@ -509,5 +508,9 @@ in {
export SDL_VIDEODRIVER=wayland
export _JAVA_AWT_WM_NONREPARENTING=1
'';
systemd = {
enable = true;
xdgAutostart = true;
};
};
}