mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2024-11-22 07:58:49 +01:00
Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles
This commit is contained in:
commit
aee792f4ce
2 changed files with 17 additions and 11 deletions
18
flake.lock
18
flake.lock
|
@ -93,11 +93,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714377222,
|
"lastModified": 1714679908,
|
||||||
"narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=",
|
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49",
|
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -268,11 +268,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714270547,
|
"lastModified": 1714534265,
|
||||||
"narHash": "sha256-s77XshW+9EoghBWmOf0tFVQZ+8rX4+bOCz0StL+TkvQ=",
|
"narHash": "sha256-mgjwvt9hzjGBisOx4Sn9V0Im4XEnld288F6KtmNhyM0=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "nixpkgs-update",
|
"repo": "nixpkgs-update",
|
||||||
"rev": "df23e62c3322a6471671ec8cb4ad0da36ab7f8a7",
|
"rev": "f368b504aa1d766c835c3a89ec24e86077a97272",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -283,11 +283,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714253743,
|
"lastModified": 1714635257,
|
||||||
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
|
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
|
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -54,8 +54,6 @@ in
|
||||||
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
|
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
|
||||||
(callPackage ./../pkgs/extract.nix { inherit pkgs; })
|
(callPackage ./../pkgs/extract.nix { inherit pkgs; })
|
||||||
nixpkgs-fmt
|
nixpkgs-fmt
|
||||||
toolbox
|
|
||||||
distrobox
|
|
||||||
ddev
|
ddev
|
||||||
act
|
act
|
||||||
mkcert
|
mkcert
|
||||||
|
@ -79,6 +77,14 @@ in
|
||||||
nodePackages.pnpm
|
nodePackages.pnpm
|
||||||
npm-check-updates
|
npm-check-updates
|
||||||
] ++ (
|
] ++ (
|
||||||
|
if (
|
||||||
|
!config.machine.isGeneric
|
||||||
|
) then [
|
||||||
|
toolbox
|
||||||
|
distrobox
|
||||||
|
] else
|
||||||
|
[ ]
|
||||||
|
) ++ (
|
||||||
if (
|
if (
|
||||||
config.machine.isGraphical
|
config.machine.isGraphical
|
||||||
) then [
|
) then [
|
||||||
|
|
Loading…
Reference in a new issue